From 185b40a586745a639694c2320dcd28e39fe853e0 Mon Sep 17 00:00:00 2001
From: WYnneaoapc <lu_1005@foxmail.com>
Date: Wed, 20 Nov 2019 20:51:41 +0800
Subject: [PATCH] =?UTF-8?q?6518=20=E7=AE=A1=E6=8E=A7=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java    | 14 ++++++++------
 .../cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java |  1 +
 .../estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java |  3 +++
 3 files changed, 12 insertions(+), 6 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 7edb1f9..328f36e 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
@@ -197,6 +197,7 @@ public class MesEnumUtil {
         public String getDescription() {
             return description;
         }
+
         // 根据value返回枚举类型,主要在switch中使用
         public static ORGANIZATION_INIT_DATA getByValue(String value) {
             for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) {
@@ -302,7 +303,7 @@ public class MesEnumUtil {
         private int value;
         private String description;
 
-        CUST_ORDER_TYPE(int value,  String description) {
+        CUST_ORDER_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -2959,11 +2960,11 @@ public class MesEnumUtil {
         OPC_LINK_PASSWORD(120, "OPC_LINK", "OPC_LINK_PASSWORD"),
         OPC_LINK_REALM(130, "OPC_LINK", "OPC_LINK_REALM"),
         OPC_LINK_CALLBACK(140, "OPC_LINK", "OPC_LINK_CALLBACK"),
-        SUPPLY_SWITCH(150,"SUPPLY_SWITCH",""),
-        PCN_LOGIN(160, "PCN_LOGIN",""),
-        PCN_MENU(170, "PCN_MENU",""),
-        PCN_MODULE(180, "PCN_MODULE",""),
-        PCN_LOGOUT(190, "PCN_LOGOUT","");
+        SUPPLY_SWITCH(150, "SUPPLY_SWITCH", ""),
+        PCN_LOGIN(160, "PCN_LOGIN", ""),
+        PCN_MENU(170, "PCN_MENU", ""),
+        PCN_MODULE(180, "PCN_MODULE", ""),
+        PCN_LOGOUT(190, "PCN_LOGOUT", "");
 
 
         private int value;
@@ -3078,6 +3079,7 @@ public class MesEnumUtil {
     public enum ONLINE_SEND_TYPE {
 
         PLC("PLC", "PLC"),
+        SELF_HANDLE("SELF_HANDLE", "自处理"),
         DB("DB", "DB");
 
         private String value;
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 d3a1cf1..360c881 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
@@ -2154,6 +2154,7 @@ public class MesPcnEnumUtil {
     public enum ONLINE_SEND_TYPE {
 
         PLC("PLC", "PLC"),
+        SELF_HANDLE("SELF_HANDLE", "自处理"),
         DB("DB", "DB");
 
         private String value;
diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java
index 4047e39..48a1c26 100644
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQcCheckStandard.java
@@ -73,6 +73,9 @@ public class MesQcCheckStandard extends BaseBean {
     @ApiParam("检测值")
     private String checkValue;
 
+    public MesQcCheckStandard() {
+    }
+
     public MesQcCheckStandard(String partNo, String workCenterCode, String workCellCode, Integer checkType, String checkItem, String checkStandard, String checkGuide, String checkFrequency, String partName) {
         this.partNo = partNo;
         this.workCenterCode = workCenterCode;