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

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

@@ -6059,52 +6059,6 @@ public class MesEnumUtil {
     }
 
     /**
-     * MES_车型散件配置清单 	选配类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_OPTION_TYPE {
-
-        OPTION_PART(1, "选配件"),
-        BOM_DISASSEMBLY(2, "BOM拆解");
-
-        private int value;
-        private String description;
-
-        MES_OPTION_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(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++) {
-                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * 数据格式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

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

@@ -4358,52 +4358,6 @@ public class MesPcnEnumUtil {
     }
 
     /**
-     * MES_生产队列散件清单 	选配类型
-     */
-    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum MES_OPTION_TYPE {
-
-        OPTION_PART(1, "选配件"),
-        BOM_DISASSEMBLY(2, "BOM拆解");
-
-        private int value;
-        private String description;
-
-        MES_OPTION_TYPE(int value, String description) {
-            this.value = value;
-            this.description = description;
-        }
-
-        public int getValue() {
-            return value;
-        }
-
-        public String getDescription() {
-            return description;
-        }
-
-        public static String valueOfDescription(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++) {
-                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].value;
-                }
-            }
-            return tmp;
-        }
-    }
-
-    /**
      * 绑定模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/excel/mgnbj/SparePartsImportModel.java

@@ -53,7 +53,7 @@ public class SparePartsImportModel {
     private String custPartNo;
 
     @ApiParam("用量")
-    private Double qty;
+    private Integer qty;
 
     @ApiParam("单元格编号")
     private Map<String, String> cellNoMap = new HashMap<>();

modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java

@@ -2246,6 +2246,9 @@ public class MesHqlPack {
         if (!StringUtil.isEmpty(mesProduceSnTravel.getOutWorkCenterTimeEnd())) {
             DdlPreparedPack.getStringSmallerPack(mesProduceSnTravel.getOutWorkCenterTimeEnd(), "outWorkCenterTime", packBean);
         }
+        if (!StringUtils.isEmpty(mesProduceSnTravel.getWorkCenterCode())) {
+            DdlPreparedPack.getStringLikerPack(mesProduceSnTravel.getWorkCenterCode(), "workCenterCode", packBean);
+        }
         if (!StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeStart()) || !StringUtils.isEmpty(mesProduceSnTravel.getCreateDateTimeEnd())) {
             DdlPreparedPack.timeBuilder(
                     mesProduceSnTravel.getCreateDateTimeStart(),

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

@@ -75,6 +75,10 @@ public class WmsASNMaster extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class, refForeignKey = "value", value = "description")
     public Integer isTask;
 
+    @Column(name = "REASON")
+    @ApiParam(value = "原因", example = "1")
+    public String reason;
+
     @ApiParam("ASN详情列表")
     @Transient
     public List<WmsASNMasterDetails> asnMasterDetailsList;

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

@@ -199,6 +199,10 @@ public class WmsPOMaster extends BaseBean {
     @ApiParam(value = "部门名称", example = "1")
     public Integer departName;
 
+    @Column(name = "REASON")
+    @ApiParam(value = "原因", example = "1")
+    public String reason;
+
     @Transient
     @ApiParam("周总数")
     private Integer weekRcCount;