【task 1436 工步-关键件绑定校验并转过程条码 】解决冲突

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java

@@ -4063,4 +4063,109 @@ public class MesEnumUtil {
             return tmp;
         }
     }
+
+    /**
+     * 客户JIT生产队列状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QUEUE_JIT_ACTUAL_STATUS {
+        CREATE(10, "创建"),
+        LANDED(20, "下达"),
+        CANCEL(30, "取消");
+
+        private int value;
+        private String description;
+
+        MES_QUEUE_JIT_ACTUAL_STATUS(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;
+        }
+    }
+
+    /**
+     * 客户JIT生产队列特殊标识
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG {
+        NORMAL(10, "正常"),
+        EMPTYING(20, "放空");
+        private int value;
+        private String description;
+
+        MES_QUEUE_JIT_ACTUAL_SPECIAL_FLAG(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;
+        }
+    }
+    /**
+     * 关键件条码校验工步对应的物料分类的值
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum PART_TYPE_THREE {
+
+        MM(10, "MM"),
+        MS(20, "MS");
+
+        private int value;
+        private String description;
+
+        PART_TYPE_THREE(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;
+        }
+    }
 }