From 802c8010137a4aaa736e690356755be51daa8511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Mon, 14 Sep 2020 11:37:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9011310=2019081-=E4=B8=8B=E8=BE=BE?=
 =?UTF-8?q?=E8=87=B3=E4=B8=8B=E7=BA=BF=E6=97=B6=E9=97=B4=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?-20200913=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 41 ++++++++++++++++++++--
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  |  4 +--
 .../i3plus/pojo/mes/bean/MesQueueJitActual.java    |  2 +-
 3 files changed, 42 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
index a9c6f83..ec7d0e5 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/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;
+        }
+
+    }
 }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
index 47d87e1..28ed12b 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/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;
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
index 2e24438..e438425 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java
+++ b/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("客户需求开始时间")