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

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

@@ -1974,7 +1974,8 @@ public class MesEnumUtil {
         MES_PART_STOCK_SCHEDULE(550, "partStockScheduleExcelService", "库存排程配置导入"),
         MES_PROD_CFG_DETAIL(560, "prodCfgDetailExcelService", "产品配置明细导入"),
         MES_LOCATION(570, "locationExcelService", "库位信息导入"),
-        MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入");
+        MES_SUB_PART(580, "mesSubPartExcelService", "替代料导入"),
+        MES_WORK_CELL_DEFECT(590, "workCellDefectExcelService", "工位缺陷信息导入");
 
         private int value;
         private String service;

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

@@ -5063,6 +5063,58 @@ public class WmsEnumUtil {
 
 
     /**
+     * 生产计划主表计划状态
+     * 默认为 10
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum WORK_ORDER_PLAN_STATUS {
+        CREATE(10, "CREATE", "创建"),
+        PLANNED(20, "PLANNED", "处理中"),
+        CLOSE(30, "CLOSE", "已关闭");
+
+        private int value;
+        private String code;
+        private String description;
+
+        WORK_ORDER_PLAN_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].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+    /**
      * 是否贵重物料
      * 默认为2
      */

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

@@ -81,6 +81,11 @@ public class MesPpMaster extends BaseBean{
     @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2)
     private String remark;
 
+    @Column(name = "WORK_ORDER_PLAN_STATUS", columnDefinition = "int default 10")
+    @ApiParam("工单计划状态:10-创建，20-处理中，30-已关闭")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.SELECT, dataSrc = "WORK_ORDER_PLAN_STATUS")
+    private Integer workOrderPlanStatus;
+
     public Integer getOrderStatus() {
         return orderStatus == null ? 0 : this.orderStatus.intValue();
     }