Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java

@@ -377,6 +377,44 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 条码打印状态  （库存条码打印字段使用）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRINT_STATUS {
+        PRINTED(1, "已打印"), NOPRINT(2, "未打印"), GENERATE(3, "退料生成条码");
+
+        private int value;
+        private String description;
+
+        PRINT_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
+
+    /**
      * 库位类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/tool/DdlPreparedPack.java

@@ -504,6 +504,19 @@ public class DdlPreparedPack {
     }
 
     /**
+     * 封装not in String查询语句
+     *
+     * @param data
+     * @param columnName
+     * @param packBean
+     */
+    public static void getNotInPackArray(Object[] data, String columnName, DdlPackBean packBean) {
+        if (data != null && data.length > 0) {
+            packBean.addColumnQuery(columnName," and model." + columnName + " not in (:m_" + columnName + ")", Arrays.asList(data));
+        }
+    }
+
+    /**
      * 封装in String查询语句
      *
      * @param data
@@ -559,9 +572,9 @@ public class DdlPreparedPack {
             data = "";
             for (int i = 0; i < dataArray.length; i++) {
                 if (i == dataArray.length - 1) {
-                    data += "'" + dataArray[i] + "'";
+                    data += "" + dataArray[i] + "";
                 } else {
-                    data += "'" + dataArray[i] + "',";
+                    data += "" + dataArray[i] + ",";
                 }
             }
             packBean.addColumnQuery(columnName," and " + columnName + " not in (:m_" + columnName + ")", data);

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java

@@ -128,11 +128,11 @@ public class WmsStockSn extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.STOCK_SN_STATUS.class, refForeignKey = "value", value = "description")
     private Integer snStatus;
     /**
-     * 1:已打印；2：未打印
+     * 1:已打印；2：未打印；3：退料生成条码
      */
     @Column(name = "PRINTED")
     @ApiParam(value = "是否打印", example = "0")
-    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class, refForeignKey = "value", value = "description")
     private Integer printed;
 
     @Column(name = "PDATE")

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -208,6 +208,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getVendorNo(), "vendorNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result);
+
+        //  查询计划时间在指定范围的单号，查询这些单号的数据
+        if (StringUtils.isNotBlank(wmsPOMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsPOMaster.getPlanDateEnd())) {
+            DdlPreparedPack.getInPackList(wmsPOMaster.getOrderNoList(), "orderNo", result);
+        }
+
         getStringBuilderPack(wmsPOMaster, result);
 
         return result;
@@ -593,6 +599,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getPoNo(), "poNo", result);
 
+        //  查询计划时间在指定范围的单号，查询这些单号的数据
+        if (StringUtils.isNotBlank(wmsASNMaster.getPlanDateStart()) && StringUtils.isNotBlank(wmsASNMaster.getPlanDateEnd())) {
+            DdlPreparedPack.getInPackList(wmsASNMaster.getOrderNoList(), "orderNo", result);
+        }
+
         getStringBuilderPack(wmsASNMaster, result);
 
         return result;
@@ -1529,6 +1540,12 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
         result.setOrderByStr(wmsStockSn.orderBy());
 
+        if(wmsStockSn.getPrinted()!= null){
+            if(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue() == wmsStockSn.getPrinted()){
+                DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.PRINT_STATUS.GENERATE.getValue(),"printed",result);
+            }
+        }
+
         getStringBuilderPack(wmsStockSn, result);
         return result;
     }