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

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

@@ -807,7 +807,6 @@ public class WmsEnumUtil {
         INSTOCKED(40, "入库"),
         PICKED(50, "配料"),
         OUT_STOCK(60, "出库"),
-//        FRAZE(70, "报废"),
         COMMING(80, "在途");
 
         private int value;
@@ -2012,7 +2011,8 @@ public class WmsEnumUtil {
         RECEPTION(10, "RECEPTION", "让步接收"),
         SCRAP(20, "SCRAP", "报废"),
         QUARANTINE(30, "QUARANTINE", "隔离"),
-        BACK_QUARANTINE(40, "BACK_QUARANTINE", "反隔离");
+        BACK_QUARANTINE(40, "BACK_QUARANTINE", "反隔离"),
+        DEFINITE_FAIL(50, "DEFINITE_FAIL", "不合格");
 
         private int value;
         private String code;