枚举漏提交

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

@@ -904,14 +904,16 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
-        , CLOSE(40, "已关闭");
+        CREATE(10, 10, "创建"), FINISH(20, 20, "处理中"),
+        FAIL(30, 30, "已处理"), CLOSE(40, 40, "已关闭");
 
         private int value;
+        private int code;
         private String description;
 
-        TASK_INFO_STATUS(int value, String description) {
+        TASK_INFO_STATUS(int value, int code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -919,6 +921,10 @@ public class WmsEnumUtil {
             return value;
         }
 
+        public int getCode() {
+            return code;
+        }
+
         public String getDescription() {
             return description;
         }
@@ -936,13 +942,24 @@ public class WmsEnumUtil {
         public static String valueOfDescription(int val) {
             return valueOf(val);
         }
-    }
 
+        public static TASK_INFO_STATUS codeOf(Integer value) {
+            if (value == null) {
+                return null;
+            } else {
+                for (int i = 0; i < values().length; i++) {
+                    if (values()[i].value == value) {
+                        return values()[i];
+                    }
+                }
+            }
+            return null;
+        }
+    }
 
 
     /**
      * 业务表：库存条码状态
-     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_STATUS {
@@ -952,7 +969,7 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-        SCRAP(70, "报废"),
+        //SCRAP(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -995,6 +1012,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 单据是否生成任务状态
      */
@@ -1052,12 +1070,14 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 业务表：库存条码质检状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum STOCK_SN_QC_STATUS {
-        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"), ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
+        NORMAL(10, "NORMAL", "合格"), ABNORMAL(20, "ABNORMAL", "不合格"),
+        ISOLATED(30, "ISOLATED", "隔离"), FRAZE(40, "FRAZE", "报废");
 
         private int value;
         private String code;
@@ -1363,7 +1383,6 @@ public class WmsEnumUtil {
     }
 
 
-
     /**
      * 质检业务状态
      */
@@ -1436,6 +1455,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * 质检业务类型
      */
@@ -1476,6 +1496,7 @@ public class WmsEnumUtil {
             return valueOf(val);
         }
     }
+
     /**
      * 作业记录参数状态
      */
@@ -2339,6 +2360,7 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+
     /**
      * NC处理 操作类型
      */
@@ -2854,7 +2876,6 @@ public class WmsEnumUtil {
     }
 
 
-
     public enum WMS_PART_TYPE_STR {
         RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");