Merge remote-tracking branch 'origin/dev' into dev

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

@@ -958,6 +958,40 @@ public class WmsEnumUtil {
     }
 
     /**
+     * 库存条码表条码质量状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum SN_QUALITY_STATUS {
+        NORMAL(10, "合格"), ABNORMAL(20, "不合格"), ISOLATED(30, "隔离");
+
+        private int value;
+        private String description;
+
+        SN_QUALITY_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
      * 业务表：库存条码状态
      * 1=创建，10=质检中，20=待入库，30=入库，40=配料，50=出库，60=报废，70=在途
      */
@@ -969,8 +1003,9 @@ public class WmsEnumUtil {
         INSTOCKED(30, "入库"),
         PICKED(40, "配料"),
         OUT_STOCK(50, "出库"),
-        SCRAPED(60, "报废"),
-        COMMING(70, "在途");
+        FRAZE(60, "冻结"),
+        SCRAPED(70, "报废"),
+        COMMING(80, "在途");
 
         private int value;
         private String description;
@@ -1240,6 +1275,41 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 库存移动单明细状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum MOVE_DETAIL_STATUS {
+        CREATE(10, "创建"),
+        BE_HANDLE(20, "待处理"),
+        FINISH(30, "已处理");
+
+        private int value;
+        private String description;
+
+        MOVE_DETAIL_STATUS(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
 
     /**
      * 质检业务类型