From 54a51a4c69619cac8a75ad6e2992e2d4d2685577 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Thu, 16 Jul 2020 20:43:41 +0800
Subject: [PATCH] Fix Bug #916

---
 .../i3plus/pojo/base/enumutil/MesEnumUtil.java     | 13 +++++-
 .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java  | 46 ++++++++++++++++++++++
 2 files changed, 58 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 fc9ae03..faf97ff 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
@@ -5837,7 +5837,18 @@ public class MesEnumUtil {
         STRING("10", "String", "字符串"),
         BOOLEAN("20","Boolean",  "布尔"),
         WORD("30", "Word", "整形-Word"),
-        DWORD("40","Dword",  "整形-DWord");
+        DWORD("40","Dword",  "整形-DWord"),
+        LONG("50", "Long", "长整形-Long"),
+        SHORT("60", "Short", "UShort"),
+        DOUBLE("70", "Double", "双精度-Double"),
+        FLOAT("80", "Float", "单精度-Float"),
+        LLONG("90", "LLong", "LLONG"),
+        QWORD("100", "QWord", "QWORD"),
+        BCD("110", "BCD", "BCD"),
+        LBCD("120", "LBCD", "LBCD"),
+        BYTE("130", "Byte", "Byte"),
+        CHAR("140", "Char", "Char"),
+        Date("150", "DateTime", "日期");
 
         private String value;
         private String code;
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 df68d86..f1ba2ff 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
@@ -4423,4 +4423,50 @@ public class MesPcnEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 关键件校验并转过程条码工步 取值模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum VALUE_RANGE {
+
+        SCAN(10, "扫描"),
+        READ_CACHE(20, "读取缓存");
+
+        private int value;
+        private String description;
+
+        VALUE_RANGE(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;
+        }
+    }
 }