Merge branch 'dev' of i3-IMPP/i3plus-pojo into test

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

@@ -4229,4 +4229,51 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 拉动方式维护
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PULL_WAY_STATUS {
+        SAFETY_STOCK_PULL(10, "安全库存拉动"),
+        ELECTRONIC_KANBAN_PULL(20, "电子看板拉动"),
+        LINE_PULL(30, "巡线拉动"),
+        PLANNED_PULL(40, "计划拉动");
+
+        private int value;
+        private String description;
+
+        PULL_WAY_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static PULL_WAY_STATUS codeOf(int value) {
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    return values()[i];
+                }
+            }
+            return null;
+        }
+
+        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;
+        }
+    }
+
 }

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

@@ -52,4 +52,22 @@ public class WmsActionModule extends BaseBean {
     @Column(name = "IS_SHOW_INFO")
     @ApiParam(value = "是否实现回显", example = "0")
     public Integer isShowInfo;
+
+    @ApiParam(value = "作业类型名称", example = "0")
+    public String opTypeName;
+
+    public WmsActionModule() {
+    }
+
+    public WmsActionModule(Long id, String amName, String amDesc, String callClass,
+                           Integer amType, String opTypeCode, Integer isShowInfo, String opTypeName) {
+        this.id = id;
+        this.amName = amName;
+        this.amDesc = amDesc;
+        this.callClass = callClass;
+        this.amType = amType;
+        this.opTypeCode = opTypeCode;
+        this.isShowInfo = isShowInfo;
+        this.opTypeName = opTypeName;
+    }
 }

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

@@ -187,6 +187,10 @@ public class WmsPart extends BaseBean {
     @ApiParam(value = "是否录入生产批次", example = "1")
     private Integer isProdLot = 2;
 
+    @Column(name = "PULL_WAY")
+    @ApiParam(value = "拉动方式", example = "0")
+    private Integer pullWay = 0;
+
     public int getIqcValue(){
         return this.iqc == null ? 0 : this.iqc.intValue();
     }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsMoveUnfinishedOrderModel.java

@@ -36,6 +36,9 @@ public class WmsMoveUnfinishedOrderModel extends  BaseBean{
     @ApiParam("关联单号")
     private String refSrc;
 
+    public WmsMoveUnfinishedOrderModel(){
+    }
+
     public WmsMoveUnfinishedOrderModel(String organizeCode, String partNo, String partNameRdd, Double destQty, String transTypeCode, String transTypeName, String refSrc) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;