Merge remote-tracking branch 'origin/dev' into dev

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 maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+    private long maxWorkerId = -1L ^ (-1L << workerIdBits); //30
+    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

@@ -969,9 +969,8 @@ public class WmsEnumUtil {
         INSTOCKED(30, "入库"),
         PICKED(40, "配料"),
         OUT_STOCK(50, "出库"),
-        FRAZE(60, "冻结"),
-        SCRAPED(70, "报废"),
-        COMMING(80, "在途");
+        FRAZE(60, "报废"),
+        COMMING(70, "在途");
 
         private int value;
         private String description;
@@ -1980,4 +1979,49 @@ public class WmsEnumUtil {
             return null;
         }
     }
+
+    /**
+     * 数据状态
+     *  1 启用
+     *  2 禁用
+     *  3 全部
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum DATA_STATUS {
+        ENABLE(1, "启用", "fa fa-success cell-fa fa-check"),
+        DISABLE(2, "禁用", "fa fa-disabled cell-fa fa-times-circle"),
+        LOCKING(3, "全部", "fa cell-fa fa-lock");
+
+        private int value;
+        private String code;
+        private String description;
+
+        DATA_STATUS(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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].getCode();
+                }
+            }
+            return tmp;
+        }
+    }
 }

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

@@ -82,18 +82,6 @@ public class WmsDocMovementMaster extends BaseBean {
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
-    @Column(name = "PART_NO")
-    @ApiParam(value = "物料编码")
-    private String partNo;
-
-    @Column(name = "PART_NAME")
-    @ApiParam(value = "物料名称")
-    private String partNameRdd;
-
-    @Column(name = "QTY")
-    @ApiParam(value = "数量", example = "1")
-    private Double qty;
-
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
     public Integer isTask;
@@ -101,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

@@ -1423,4 +1423,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();
+    }
 }