From 799967bde5e0f294c9136e7bc0da16b7f6d63f6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= <adair.song@estsh.com>
Date: Thu, 10 Sep 2020 22:29:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B4=A5=E9=BA=A6?=
 =?UTF-8?q?=E6=A0=BC=E7=BA=B3=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 38 +++++++++++++++++++++-
 .../pojo/mes/model/PaintWorkOrderSnModel.java      |  4 +++
 .../i3plus/pojo/mes/model/TJMgnBoardModel.java     |  3 ++
 3 files changed, 44 insertions(+), 1 deletion(-)

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 95020ed..538ba18 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
@@ -1879,7 +1879,8 @@ public class MesPcnEnumUtil {
         FICTIVE(90, "虚拟工单"),
         SPARE_PART_PRODUCTION(100, "备件生产"),
         REPRODUCTION_RMS(110, "重新生产-报功"),
-        REPRODUCTION_NOT_RMS(120, "重新生产-不报功");
+        REPRODUCTION_NOT_RMS(120, "重新生产-不报功"),
+        REVERSE_SPRAY_ORDER(130, "反喷工单");
 
         private int value;
         private String description;
@@ -5170,4 +5171,39 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 涂装导入--反喷标识（Y-正常；F-反喷）
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REVERSE_SPRAY_MARK {
+        REVERSE_SPRAY("F", "反喷"),
+        NORMAL("Y", "正常");
+
+        private String value;
+        private String description;
+
+        REVERSE_SPRAY_MARK(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String 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-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
index 2265b41..60a89fe 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintWorkOrderSnModel.java
@@ -66,4 +66,8 @@ public class PaintWorkOrderSnModel extends BaseBean {
     private List<ProdPackModel> prodPackageList;
 
     private String partNameRdd;
+
+    @ApiParam("反喷标识--工单类型")
+    private String reverseSprayMark;
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java
index 63b76b8..469a7e1 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/TJMgnBoardModel.java
@@ -41,6 +41,9 @@ public class TJMgnBoardModel extends BaseBean {
     @ApiParam("最终合格率")
     private String finalPassRate;
 
+    @ApiParam("不良处理类型")
+    private String defectType;
+
     @ApiParam("列名")
     private List<List<String>> headModelList;