Merge branch 'test' into dev

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

@@ -1144,6 +1144,16 @@ public class MesEnumUtil {
             return tmp;
         }
 
+        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 Integer descriptionOfValue(String description) {
             Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -6372,4 +6382,39 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 条码生成模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum GENERATE_TYPE {
+        RELEASE_GENERATION(10, "下达生成"),
+        STATION_GENERATION(20, "工位生成");
+
+        private Integer value;
+        private String description;
+
+        GENERATE_TYPE(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(value)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 }

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCenter.java

@@ -62,6 +62,10 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("产能")
     private Integer productionCapacity;
 
+    @Column(name = "GENERATE_TYPE")
+    @ApiParam("条码生成模式")
+    private Integer generateType;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StationRequestBean.java

@@ -153,6 +153,9 @@ public class StationRequestBean implements Serializable {
     @ApiParam("物料名称")
     private String partName;
 
+    @ApiParam("状态机代码")
+    private String smCode;
+
     @Override
     public String toString() {
         return "StationRequestBean{" +

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java

@@ -102,6 +102,9 @@ public class PrintOrderDataModel implements Serializable {
     @Transient
     public String createDateTime;
 
+    @Transient
+    public String receiveDateTime;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsActionResponseBean.java

@@ -116,6 +116,9 @@ public class WmsActionResponseBean<Obj> implements Serializable {
     @ApiParam(value = "分组KEY")
     public String groupKey;
 
+    @ApiParam(value = "工厂代码")
+    private String organizeCode;
+
     public WmsActionResponseBean(Boolean codeStatus, String message) {
         this.codeStatus = codeStatus;
         this.message = message;

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

@@ -212,6 +212,17 @@ public class WmsASNMaster extends BaseBean {
         this.recStatus = recStatus;
     }
 
+    public WmsASNMaster(String orderNo, Integer asnStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) {
+        this.orderNo = orderNo;
+        this.asnStatus = asnStatus;
+        this.organizeCode = organizeCode;
+        this.vendorNo = vendorNo;
+        this.dock = dockCode;
+        this.zdoc = zdoc;
+        this.createDatetime = createDateTime;
+        this.createDateTimeStart = receiveDateTime;
+    }
+
     public int getAsnStatusVal() {
         return this.asnStatus == null ? 0 : this.asnStatus;
     }

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

@@ -171,6 +171,21 @@ public class WmsPOMaster extends BaseBean {
     @Column(name = "ZDOC", columnDefinition = "varchar(50) default ''")
     public String zdoc;
 
+    public WmsPOMaster() {
+
+    }
+
+    public WmsPOMaster(String orderNo, Integer poStatus, String organizeCode, String vendorNo, String dockCode, String zdoc, String createDateTime, String receiveDateTime) {
+        this.orderNo = orderNo;
+        this.poStatus = poStatus;
+        this.organizeCode = organizeCode;
+        this.vendorNo = vendorNo;
+        this.dock = dockCode;
+        this.zdoc = zdoc;
+        this.createDatetime = createDateTime;
+        this.createDateTimeStart = receiveDateTime;
+    }
+
     public int getPoStatusVal() {
         return this.poStatus == null ? 0 : this.poStatus;
     }