From e2ce63a9cd70507c50aa43021451c83c2daa8d15 Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Tue, 19 May 2020 11:33:50 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20[8533]=20plc=E6=95=B0=E6=8D=AE=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=94=B9=E4=B8=BA=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     | 88 ++++++++++++++++------
 1 file changed, 63 insertions(+), 25 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 eba9bab..d524f9f 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
@@ -14,14 +14,14 @@ public class MesEnumUtil {
 
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum HQL_EXPRESSION {
-        GT(">",">","大于"),
-        LT("<","<","小于"),
-        EQ("=","=","等于"),
-        NEQ("!=","!=","不等于"),
-        GTE(">=",">=","大于等于"),
-        LTE("<=","<=","小于等于"),
-        LIKE("like","like","LIKE"),
-        IN("in","in","包含");
+        GT(">", ">", "大于"),
+        LT("<", "<", "小于"),
+        EQ("=", "=", "等于"),
+        NEQ("!=", "!=", "不等于"),
+        GTE(">=", ">=", "大于等于"),
+        LTE("<=", "<=", "小于等于"),
+        LIKE("like", "like", "LIKE"),
+        IN("in", "in", "包含");
 
         private String value;
         private String code;
@@ -240,7 +240,7 @@ public class MesEnumUtil {
     }
 
     /**
-     *  排序校验模式
+     * 排序校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CHECK_PROD_SEQ_FLAG {
@@ -307,7 +307,7 @@ public class MesEnumUtil {
     }
 
     /**
-     *  排序校验模式
+     * 排序校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TOOLING_ACTION_RECORD_TYPE {
@@ -371,6 +371,7 @@ public class MesEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * JIS发运是否按主队列顺序扫描
      */
@@ -3241,7 +3242,7 @@ public class MesEnumUtil {
         BH_ORDER(40, "B&H工单"),
         JIT_ORDER(50, "JIT工单"),
         STOCK_ORDER(60, "库存工单"),
-        REPAIR(70,"返修插单");
+        REPAIR(70, "返修插单");
 
         private int value;
         private String description;
@@ -5009,7 +5010,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	作业校验模式
+     * 作业校验模式
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum CHECK_MODEL {
@@ -5044,7 +5045,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	PLC类型
+     * PLC类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum PLC_TYPE {
@@ -5079,7 +5080,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	看板类型
+     * 看板类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_TYPE {
@@ -5124,7 +5125,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	看板类型
+     * 看板类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum BOARD_OBJECT_TYPE {
@@ -5207,7 +5208,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	界面类型
+     * 界面类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum WINDOW_TYPE {
@@ -5243,7 +5244,7 @@ public class MesEnumUtil {
 
 
     /**
-     * 	运算对象属性 运算类型
+     * 运算对象属性 运算类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_TYPE {
@@ -5279,7 +5280,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象属性 属性类型
+     * 运算对象属性 属性类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum ATTRIBUTE_TYPE {
@@ -5314,7 +5315,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象属性配置 赋值类型
+     * 运算对象属性配置 赋值类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum VALUE_TYPE {
@@ -5360,7 +5361,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	运算对象 对象代码
+     * 运算对象 对象代码
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OBJECT_CODE {
@@ -5406,7 +5407,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	脚本类型（组件、表单、报表、JOB、其他）
+     * 脚本类型（组件、表单、报表、JOB、其他）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_TYPE {
@@ -5444,7 +5445,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	语言类型（Groovy、Python、JavaScript、Scala、Ruby）
+     * 语言类型（Groovy、Python、JavaScript、Scala、Ruby）
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum SCRIPT_LANGUAGE {
@@ -5482,9 +5483,8 @@ public class MesEnumUtil {
     }
 
 
-
     /**
-     * 	运算对象代码
+     * 运算对象代码
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OPERATE_OBJECT_CODE {
@@ -5530,7 +5530,7 @@ public class MesEnumUtil {
     }
 
     /**
-     * 	oee 运算状态
+     * oee 运算状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum OEE_STATUS {
@@ -5730,4 +5730,42 @@ public class MesEnumUtil {
         }
     }
 
+
+    /**
+     * MES_PLC 数据类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PLC_DATA_TYPE {
+
+        INT("int", "数字"),
+        STRING("string", "字符串"),
+        BOOLEAN("boolean", "布尔");
+
+        private String value;
+        private String description;
+
+        PLC_DATA_TYPE(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val)) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }