枚举冲突

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/codemaker/SnowflakeIdMaker.java

@@ -37,8 +37,8 @@ public class SnowflakeIdMaker {
 
     private long workerIdBits = 5L;
     private long datacenterIdBits = 5L;
-    private long maxWorkerId = -1L ^ (-1L << workerIdBits);
+    private long maxWorkerId = -1L ^ (-1L << workerIdBits); //30
-    private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+    private long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);  //30
     private long sequenceBits = 12L;
 
     private long workerIdShift = sequenceBits;

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

@@ -962,15 +962,13 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SN_QUALITY_STATUS {
-        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
+        NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离");
 
         private int value;
-        private String code;
         private String description;
 
-        SN_QUALITY_STATUS(int value, String code, String description) {
+        SN_QUALITY_STATUS(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
@@ -982,10 +980,6 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public String getCode() {
-            return code;
-        }
-
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -995,26 +989,6 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-
-        public static int descOf(String desc) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].description.equals(desc)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-
-        public static SN_QUALITY_STATUS codeOf(Integer value) {
-            int tmp = 1;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == value) {
-                    return values()[i];
-                }
-            }
-            return null;
-        }
     }
 
     /**
@@ -1074,15 +1048,15 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        QUALIFIED(10, "合格"),
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离");
-        UNQUALIFIED(20, "不合格"),
-        QUAEANTINE(30, "隔离");
 
         private int value;
+        private String code;
         private String description;
 
-        STOCK_SN_QC_STATUS(int value, String description) {
+        STOCK_SN_QC_STATUS(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -1094,6 +1068,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1113,7 +1091,15 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-
+        public static STOCK_SN_QC_STATUS codeOf(Integer value) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
     }
 
     /**

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

@@ -56,6 +56,11 @@ public class WmsActionGroup extends BaseBean {
     @ApiParam(value = "结束组件编号", example = "0")
     private Long endAmId;
 
+    // 1=true, 2 = false
+    @Column(name="AUTO_INIT")
+    @ApiParam(value = "任务自动初始化", example = "0")
+    private Integer autoInit;
+
     public Long getInitAmId() {
         if (initAmId != null) {
             return initAmId.longValue();

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

@@ -89,4 +89,12 @@ public class WmsDocMovementMaster extends BaseBean {
     @Column(name = "PRIORITY")
     @ApiParam(value = "优先级", example = "1")
     public Integer priority;
+
+    @Column(name = "CAR_NO")
+    @ApiParam(value = "车牌号")
+    private String carNo;
+
+    @Column(name = "CUST_ORDER_NO")
+    @ApiParam(value = "客户单号")
+    private String custOrderNo;
 }

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

@@ -802,6 +802,7 @@ public class WmsHqlPack {
         HqlPack.getStringEqualPack(wmsStockQuan.getZoneNo(), "zoneNo", result);
         HqlPack.getStringEqualPack(wmsStockQuan.getLocateNo(), "locateNo", result);
         HqlPack.getStringEqualPack(wmsStockQuan.getPartNo(), "partNo", result);
+        HqlPack.getStringEqualPack(wmsStockQuan.getCustNo(), "custNo", result);
 
         getStringBuilderPack(wmsStockQuan, result);
 
@@ -1409,9 +1410,6 @@ public class WmsHqlPack {
      */
     public static String packHqlWmsDataAuthFind(WmsDataAuth wmsDataAuth) {
         StringBuffer result = new StringBuffer();
-        if (!Strings.isNullOrEmpty(wmsDataAuth.getOrganizeCode())){
-            HqlPack.getStringEqualPack(wmsDataAuth.getOrganizeCode(),"organizeCode",result);
-        }
         if (!Strings.isNullOrEmpty(wmsDataAuth.getRoleCode())){
             HqlPack.getStringEqualPack(wmsDataAuth.getRoleCode(),"roleCode",result);
         }
@@ -1424,4 +1422,16 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsDataAuth, result);
         return result.toString();
     }
+
+    /**
+     * 根据条件查询任务明细信息
+     * @param taskDetails
+     * @return
+     */
+    public static String packHqlWmsTaskDetails(WmsTaskDetails taskDetails) {
+        StringBuffer result = new StringBuffer();
+        HqlPack.getStringEqualPack(taskDetails.getOrderNo(), "orderNo", result);
+        getStringBuilderPack(taskDetails, result);
+        return result.toString();
+    }
 }