From 44e3d667b355a05c1d5c6970e85263ff684c908a Mon Sep 17 00:00:00 2001
From: "joke.wang" <joke.wang@estsh.com>
Date: Sat, 4 Jul 2020 16:57:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=B1=A0=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     | 74 +++++++++++++++++++++-
 .../estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java |  9 +++
 2 files changed, 82 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 0d6e544..45e6034 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
@@ -6516,7 +6516,79 @@ public class MesEnumUtil {
         public static String valueOfDescription(Integer value) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
-                if (values()[i].value.equals(value)) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIT队列订单池 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIT_ORDER_CACHE_STATUS {
+        CREATE(10, "创建"),
+        COMPLETE(20, "完成"),
+        CANCEL(20, "取消");
+
+        private Integer value;
+        private String description;
+
+        JIT_ORDER_CACHE_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * JIT队列锁定池 状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum JIT_LOCK_CACHE_STATUS {
+        CREATE(10, "创建"),
+        RELEASE(20, "下达"),
+        ONLINE_COMPLETE(20, "上线完成");
+
+        private Integer value;
+        private String description;
+
+        JIT_LOCK_CACHE_STATUS(Integer value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public Integer getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(Integer value) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == value) {
                     tmp = values()[i].description;
                 }
             }
diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java
index 1e6d5ad..7bfc2e8 100644
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java
@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -45,4 +46,12 @@ public class MesJitIssueCfg extends BaseBean implements Serializable {
     @Column(name = "CFG_TYPE")
     @ApiParam("缓存类型")
     private Integer cfgType;
+
+    @Transient
+    @ApiParam("当前JIT缓存数")
+    private Integer currentJitCacheNum;
+
+    @Transient
+    @ApiParam("其他工单数")
+    private Integer otherWorkNum = 0;
 }