解决冲突

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

@@ -4276,15 +4276,6 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -4908,16 +4899,6 @@ public class MesEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription2(int val) {
-            String tmp = null;
-            for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
-                }
-            }
-            return tmp;
-        }
     }
 
     /**
@@ -5003,11 +4984,11 @@ public class MesEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription2(int val) {
+        public static Integer descriptionOfValue(String description) {
-            String tmp = null;
+            Integer tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value == val) {
+                if (values()[i].description.equals(description)) {
-                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                    tmp = values()[i].value;
                 }
             }
             return tmp;

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

@@ -4496,4 +4496,50 @@ public class MesPcnEnumUtil {
 
     }
 
+    /**
+     * 工作中心 工位监控模式  10=工单作业，20=标准作业
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_CENTER_MONITOR_TYPE {
+
+        ORDER_WORK(10, "工单作业"),
+        STANDARD_WORK(20, "标准作业");
+
+        private int value;
+        private String description;
+
+        WORK_CENTER_MONITOR_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;
+        }
+    }
+
 }

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

@@ -66,6 +66,11 @@ public class MesWorkCenter extends BaseBean implements Serializable {
     @ApiParam("条码生成模式")
     private Integer generateType;
 
+    // 10=工单作业，20=标准作业
+    @Column(name = "MONITOR_TYPE")
+    @ApiParam("工位监控模式")
+    private Integer monitorType;
+
     @Transient
     @ApiParam(value = "子集列表")
     private List<MesWorkCell> childTreeList;

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

@@ -1232,7 +1232,7 @@ public class MesHqlPack {
             DdlPreparedPack.getStringLikerPack(numberRule.getNumberRule(), "numberRule", packBean);
         }
         if (!StringUtils.isEmpty(numberRule.getPrefix())) {
-            DdlPreparedPack.getNumEqualPack(numberRule.getPrefix(), "prefix", packBean);
+            DdlPreparedPack.getStringLikerPack(numberRule.getPrefix(), "prefix", packBean);
         }
         if (null != numberRule.getIsCycle()) {
             DdlPreparedPack.getNumEqualPack(numberRule.getIsCycle(), "isCycle", packBean);

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

@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @Description : 任务单模型
@@ -35,6 +36,9 @@ public class WmsTaskInfoModel implements Serializable {
     @ApiParam(value = "关联单据业务类型代码")
     private String busiTypeCode;
 
+    @ApiParam(value = "关联单据业务类型代码集合")
+    private List<String> busiTypeCodeLst;
+
     @ApiParam(value = "计划日期")
     private String zdate;
 
@@ -107,4 +111,9 @@ public class WmsTaskInfoModel implements Serializable {
         this.srcZoneNo = srcZoneNo;
         this.createUser = createUser;
     }
+
+    public WmsTaskInfoModel(String organizeCode, String busiTypeCode) {
+        this.organizeCode = organizeCode;
+        this.busiTypeCode = busiTypeCode;
+    }
 }

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

@@ -60,6 +60,7 @@ public class WmsPackage extends BaseBean {
 
     @Column(name="PRINT_STATUS")
     @ApiParam(value = "打印状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.PRINT_STATUS.class)
     public Integer printStatus;
 
     @Column(name="PACK_LEVEL")

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

@@ -112,6 +112,10 @@ public class WmsTaskInfo extends BaseBean {
     @ApiParam("工厂集合")
     private List<String> organizeCodeList;
 
+    @Transient
+    @ApiParam("业务类型代码")
+    public String busiTypeCode;
+
     public WmsTaskInfo(){};
 
     public WmsTaskInfo(String orderNo ,Integer taskStatus , String zdate ,String ztime,String custNo,String vendorNo){