From 3eeaff50b3c4c590b1f0379d8dfa59934ee7e64c Mon Sep 17 00:00:00 2001
From: jokelone <jokelone@yeah.net>
Date: Tue, 12 Nov 2019 17:50:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=EF=BC=9A5957=E5=B7=A5=E5=8E=82?=
 =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     |  1 -
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 87 ++++++++++++++++++++++
 2 files changed, 87 insertions(+), 1 deletion(-)

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 9fd5314..60a7aab 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
@@ -26,7 +26,6 @@ public class MesEnumUtil {
         MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"),
         MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"),
         MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"),
-        MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"),
         MES_EVENT("MesEvent", "MES_EVENT", "事件清单"),
         MES_METHOD("MesMethod", "MES_METHOD", "方法清单"),
         MES_ACTION("MesAction", "MES_ACTION", "动作"),
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 8f58397..527f46b 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
@@ -13,6 +13,93 @@ import org.apache.commons.lang3.StringUtils;
 public class MesPcnEnumUtil {
 
     /**
+     * 条码类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_PRODUCE_SN_TYPE {
+
+        NORMAL(10, "正常件"),
+        FIRST_INSPECTION(20, "首检件");
+
+        private int value;
+        private String description;
+
+        MES_PRODUCE_SN_TYPE(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;
+        }
+    }
+
+    /**
+     * pcn 操作类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_OPERATE_TYPE {
+
+        WORKSTATION_SCAN(10, "工位扫描"),
+        QUALITY_JUDGEMENT(20, "质量判定"),
+        MATERIAL_DISMANTLING(30, "物料拆解"),
+        REWORK(40, "返修作业"),
+        WORKSTATION_MONITORING(50, "工位监控");
+
+        private int value;
+        private String description;
+
+        MES_OPERATE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        // 根据value返回枚举类型,主要在switch中使用
+        public static MES_OPERATE_TYPE getByValue(int value) {
+            for (MES_OPERATE_TYPE mesInsertExcel : values()) {
+                if (mesInsertExcel.getValue() == value) {
+                    return mesInsertExcel;
+                }
+            }
+            return null;
+        }
+
+
+        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;
+        }
+
+    }
+
+    /**
      * MesProductEncodeCfg 匹配类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)