From 8148b1654fe8fb25dd3ec94309ada7c49d19e3d8 Mon Sep 17 00:00:00 2001
From: luweihao <wynne.lu@estsh.com>
Date: Sat, 14 Mar 2020 01:30:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E4=B8=8Ames=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 79 ++++++++++++++++++++--
 1 file changed, 73 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 1e56902..2861293 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
@@ -1596,11 +1596,11 @@ public class MesEnumUtil {
         MES_ROUTE_PROCESS_WORK_CELL(350, "工序工作单元"),
         MES_DATASOURCE(360, "DB地址清单"),
         MES_EQU_TASK_NOTIFY_CFG(370, "设备通知配置"),
-        MES_EQU_NOTIFY_OBJECT_CFG(380,"设备通知对象"),
-        MES_PLC(390,"PLC地址清单"),
-        MES_PROCESS(400,"工序信息"),
-        MES_KPSN_RULE(410,"关键件条码校验规则"),
-        MES_QUEUE_JIT_ACTUAL(420,"客户JIT生产队列");
+        MES_EQU_NOTIFY_OBJECT_CFG(380, "设备通知对象"),
+        MES_PLC(390, "PLC地址清单"),
+        MES_PROCESS(400, "工序信息"),
+        MES_KPSN_RULE(410, "关键件条码校验规则"),
+        MES_QUEUE_JIT_ACTUAL(420, "客户JIT生产队列");
 
         private int value;
         private String description;
@@ -4242,6 +4242,7 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 关键件条码校验工步对应的物料分类的值
      */
@@ -4279,7 +4280,6 @@ public class MesEnumUtil {
     }
 
 
-
     /**
      * 工位监听组件类型
      */
@@ -4351,4 +4351,71 @@ public class MesEnumUtil {
             return description;
         }
     }
+
+    /**
+     * 排序校验模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum CHECK_PROD_SEQ_FLAG {
+        PRODUCTION_MATERIAS(10, "NO_SORT_CHECK", "无排序校验"),
+        CUSTOMER_SHPING(20, "QUEUE_BAR_CODE", "按产品队列条码校验排序"),
+        OUTWARD_SHIPMENT(30, "PRODUCT_MATERIAL_NUMBER", "按产品物料号校验排序"),
+        ALLOCATION(40, "SAME_MATERIAL_RACK", "按队列同料架单产品校验排序");
+
+        private int value;
+        private String code;
+        private String description;
+
+        CHECK_PROD_SEQ_FLAG(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(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 String codeOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].code;
+                }
+            }
+            return tmp;
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
 }