【11310 19081-下达至下线时间预警-20200913】

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

@@ -3323,8 +3323,8 @@ public class MesEnumUtil {
         EMERGENCY_ORDER(80, "紧急插单"),
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
-        REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REPRODUCTION_RMS(110, "重新生产-报工"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
@@ -7180,4 +7180,41 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 通知标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum NOTICE_SIGN {
+
+        PENDING(10, "待处理"),
+        PROCESSED(20, "已处理");
+
+        private int value;
+        private String description;
+
+        NOTICE_SIGN(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;
+        }
+
+    }
 }

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

@@ -1878,8 +1878,8 @@ public class MesPcnEnumUtil {
         EMERGENCY_ORDER(80, "紧急插单"),
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
-        REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REPRODUCTION_RMS(110, "重新生产-报工"),
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报工"),
         REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;

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

@@ -140,7 +140,7 @@ public class MesQueueJitActual extends BaseBean implements Serializable {
 
     @Column(name = "NOTICE_SIGN")
     @ApiParam("通知标识")
-    private String noticeSign;
+    private Integer noticeSign = 10;
 
     @Transient
     @ApiParam("客户需求开始时间")