Merge branch 'dev' into test

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

@@ -2895,7 +2895,8 @@ public class MesEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");;
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;

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

@@ -1659,7 +1659,8 @@ public class MesPcnEnumUtil {
         STANDARD_ORDER(10, "标准工单"),
         BTS_ORDER(20, "BTS工单"),
         ATTEMPT_ORDER(30, "试制工单"),
-        BH_ORDER(40, "B&H工单");
+        BH_ORDER(40, "B&H工单"),
+        JIT_ORDER(50, "JIT工单");
 
         private int value;
         private String description;

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

@@ -239,7 +239,7 @@ public class WmsEnumUtil {
         RECEIPT_FINISH(30, "RECEIPT_FINISH", "已完成"),
         CLOSED(40, "CLOSED", "已关闭"),
         CANCELLED(50, "CANCELLED", "已取消"),
-        FINISH_PRODUCT_SHIPING_PICKED(60, "FINISH_PRODUCT_SHIPING_PICKED", "配料完成");
+        BATCHING_FINISH(60, "BATCHING_FINISH", "配料完成");
 
         private int value;
         private String code;
@@ -701,7 +701,8 @@ public class WmsEnumUtil {
         KT_PACK_RC(460, "KT_PACK_RC", "坤泰包装收货"),
         FINISH_PRODUCT_SHPING(470, "FINISH_PRODUCT_SHPING", "成品发运"),
         KT_PICK_RC(480,"KT_PICK_RC", "坤泰拣货"),
-        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库");
+        PRODUCE_INSTOCK(490,"PRODUCE_INSTOCK", "VDA生产入库"),
+        UTENSIL_CONSUMING(500,"UTENSIL_CONSUMING","器具领用");
 
         private int value;
         private String code;
@@ -885,7 +886,8 @@ public class WmsEnumUtil {
         VDA_TRANSACTION_QUERY("VDA_TRANSACTION_QUERY", "VDA事务查询"),
         VDA_STATIC_CS("VDA_STATIC_CS", "VDA静态盘点"),
         VDA_PACKAGE_MANAGE("VDA_PACKAGE_MANAGE", "VDA编组管理"),
-        KT_PICK_RC("KT_PICK_RC", "坤泰拣货");
+        KT_PICK_RC("KT_PICK_RC", "坤泰拣货"),
+        UTENSIL_CONSUMING("UTENSIL_CONSUMING","器具领用");
         private String value;
         private String description;