From 09c95d354298795ae45922c8f0b1732e8da0a207 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: Tue, 1 Sep 2020 10:33:09 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=BA=93=E5=AD=98=E6=8E=92=E7=A8=8B?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=A2=9E=E5=8A=A0=E7=A6=81=E7=94=A8=E5=90=AF?=
 =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 47 ++++++++++++++++++++++
 .../i3plus/pojo/mes/model/PaintOnLineModel.java    |  3 ++
 2 files changed, 50 insertions(+)

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 19abb5b..d6b499c 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
@@ -4888,4 +4888,51 @@ public class MesPcnEnumUtil {
         }
     }
 
+    /**
+     * 产品特性
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TRAIT {
+        NORMAL(10, "正常件"),
+        FICTITIOUS_ASSEMBLY(20, "虚拟散件总成"),
+        FICTITIOUS_HALF_ASSEMBLY(30, "虚拟散件半总成"),
+        FICTIVE(40, "虚拟件");
+
+        private int value;
+        private String description;
+
+        PART_TRAIT(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;
+        }
+    }
+
 }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
index 9ab41c8..4b7addd 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/PaintOnLineModel.java
@@ -49,4 +49,7 @@ public class PaintOnLineModel {
 
     @ApiParam("过程条码")
     private String serialNumber;
+
+    @ApiParam("是否虚拟件")
+    private Integer isFictive = 2;
 }