关闭任务

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

@@ -896,7 +896,8 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum TASK_INFO_STATUS {
-        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理");
+        CREATE(10, "创建"), FINISH(20, "处理中"), FAIL(30, "已处理")
+        , CLOSE(40, "已关闭");
 
         private int value;
         private String description;
@@ -929,24 +930,27 @@ public class WmsEnumUtil {
         }
     }
 
+
+
     /**
-     * 单据是否生成任务状态
+     * 业务表：库存条码状态
+     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum IS_GENERAL_TASK {
+    public enum STOCK_SN_STATUS {
-        CREATE(10, "CREATE", "创建"),
+        CREATE(10, "创建"),
-        INIT(20, "INIT", "初始化"),
+        QUALITY_CONTROL(20, "质检中"),
-        IS_GENERAL(30, "IS_GENERAL", "已生成"),
+        PRE_INSTOCK(30, "待入库"),
-        NO_GENERAL(40, "NO_GENERAL", "不生成"),
+        INSTOCKED(40, "入库"),
-        CANCEL(50, "CANCEL", "撤销");
+        PICKED(50, "配料"),
+        OUT_STOCK(60, "出库"),
+        COMMING(80, "在途");
 
         private int value;
-        private String code;
         private String description;
 
-        IS_GENERAL_TASK(int value, String code, String description) {
+        STOCK_SN_STATUS(int value, String description) {
             this.value = value;
-            this.code = code;
             this.description = description;
         }
 
@@ -958,10 +962,6 @@ public class WmsEnumUtil {
             return description;
         }
 
-        public String getCode() {
-            return code;
-        }
-
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -972,6 +972,10 @@ public class WmsEnumUtil {
             return tmp;
         }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -981,32 +985,25 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
     }
-
-
     /**
-     * 业务表：库存条码状态
+     * 单据是否生成任务状态
-     * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum STOCK_SN_STATUS {
+    public enum IS_GENERAL_TASK {
-        CREATE(10, "创建"),
+        CREATE(10, "CREATE", "创建"),
-        QUALITY_CONTROL(20, "质检中"),
+        INIT(20, "INIT", "初始化"),
-        PRE_INSTOCK(30, "待入库"),
+        IS_GENERAL(30, "IS_GENERAL", "已生成"),
-        INSTOCKED(40, "入库"),
+        NO_GENERAL(40, "NO_GENERAL", "不生成"),
-        PICKED(50, "配料"),
+        CANCEL(50, "CANCEL", "撤销");
-        OUT_STOCK(60, "出库"),
-        COMMING(80, "在途");
 
         private int value;
+        private String code;
         private String description;
 
-        STOCK_SN_STATUS(int value, String description) {
+        IS_GENERAL_TASK(int value, String code, String description) {
             this.value = value;
+            this.code = code;
             this.description = description;
         }
 
@@ -1018,6 +1015,10 @@ public class WmsEnumUtil {
             return description;
         }
 
+        public String getCode() {
+            return code;
+        }
+
         public static String valueOf(int val) {
             String tmp = null;
             for (int i = 0; i < values().length; i++) {
@@ -1028,10 +1029,6 @@ public class WmsEnumUtil {
             return tmp;
         }
 
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
-
         public static int descOf(String desc) {
             int tmp = 1;
             for (int i = 0; i < values().length; i++) {
@@ -1041,8 +1038,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-    }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
     /**
      * 业务表：库存条码质检状态
      */
@@ -1354,20 +1354,22 @@ public class WmsEnumUtil {
     }
 
 
+
     /**
-     * 质检业务类型
+     * 质检业务状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_INFO_TYPE {
+    public enum QC_INFO_STATUS {
-        FEED(10, "进料检验"),
+        CREATE(10, "新建"),
-        ONLINE(20, "在线检验"),
+        FINISH(20, "处理中"),
-        EMDPRODUCT(30, "成品检验"),
+        FAIL(30, "已完成"),
-        SHIPMENTS(40, "出货检验");
+        CLOSE(40, "已关闭"),
+        CANCEL(50, "已取消");
 
         private int value;
         private String description;
 
-        QC_INFO_TYPE(int value, String description) {
+        QC_INFO_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1389,27 +1391,20 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-
-        public static String valueOfDescription(int val) {
-            return valueOf(val);
-        }
     }
 
     /**
-     * 质检业务状态
+     * 质检明细状态
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_INFO_STATUS {
+    public enum QC_ITEM_STATUS {
-        CREATE(10, "新建"),
+        NORMAL(10, "正常"),
-        FINISH(20, "处理中"),
+        CANCELLATION(20, "已处理");
-        FAIL(30, "已完成"),
-        CLOSE(40, "已关闭"),
-        CANCEL(50, "已取消");
 
         private int value;
         private String description;
 
-        QC_INFO_STATUS(int value, String description) {
+        QC_ITEM_STATUS(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1432,19 +1427,20 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
-
     /**
-     * 质检明细状态
+     * 质检业务类型
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum QC_ITEM_STATUS {
+    public enum QC_INFO_TYPE {
-        NORMAL(10, "正常"),
+        FEED(10, "进料检验"),
-        CANCELLATION(20, "已处理");
+        ONLINE(20, "在线检验"),
+        EMDPRODUCT(30, "成品检验"),
+        SHIPMENTS(40, "出货检验");
 
         private int value;
         private String description;
 
-        QC_ITEM_STATUS(int value, String description) {
+        QC_INFO_TYPE(int value, String description) {
             this.value = value;
             this.description = description;
         }
@@ -1466,8 +1462,11 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
-    }
 
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+    }
     /**
      * 作业记录参数状态
      */