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

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

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

@@ -348,6 +348,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 产品入库的产品状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PRODUCT_INSTOCK_STATUS {
+        CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错");
+
+        private int value;
+        private String description;
+
+        PRODUCT_INSTOCK_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;
+        }
+    }
+
+    /**
      * 库位类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -487,10 +487,7 @@ public class WmsHqlPack {
         //客户全称
         HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result);
 
-        HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result);
+        getStringBuilderPack(basCustomer, result);
-        HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(),
-                "isDeleted", result);
         return result.toString();
     }
 
@@ -503,15 +500,14 @@ public class WmsHqlPack {
     public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) {
         StringBuffer result = new StringBuffer();
 
-        //有效性,删除标记
-        HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         //供应商编号
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result);
         //供应商简称
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result);
         //供应商全称
         HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result);
+        getStringBuilderPack(wmsShippingFlag, result);
+
         return result.toString();
     }
 
@@ -526,7 +522,9 @@ public class WmsHqlPack {
 
         HqlPack.getStringLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getAsnType(), "type", result);
+        if (wmsASNMaster.getAsnStatus() != null) {
             HqlPack.getStringLikerPack(wmsASNMaster.getAsnStatus().toString(), "status", result);
+        }
         HqlPack.getStringLikerPack(wmsASNMaster.getVendorNo(), "vendorNo", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getVersion(), "version", result);
         HqlPack.getStringLikerPack(wmsASNMaster.getSrc(), "src", result);
@@ -535,6 +533,7 @@ public class WmsHqlPack {
         HqlPack.getNumEqualPack(wmsASNMaster.getIsValid(), "isValid", result);
         HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
         HqlPack.getStringEqualPack(wmsASNMaster.getOrganizeCode(), "organizeCode", result);
+//        getStringBuilderPack(wmsASNMaster,result);
         return result.toString();
     }
 
@@ -655,8 +654,8 @@ public class WmsHqlPack {
         HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result);
         HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result);
-        HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result);
+        getStringBuilderPack(wmsFGInStock, result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
         return result.toString();
     }
 
@@ -668,13 +667,14 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) {
         StringBuffer result = new StringBuffer();
+
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result);
         HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result);
-        HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result);
+        getStringBuilderPack(wmsTaskInfo, result);
-        HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result);
+
         return result.toString();
     }
 }