Jenkins自动合并

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

@@ -3030,8 +3030,8 @@ public class WmsEnumUtil {
 
 
     public enum WMS_PART_TYPE_STR {
-        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器");
+        RAW_MATERIAL("10", "原材料"), PARTIALLY_PREPARED_PRODUCTS("20", "半成品"), FINISHED_PRODUCT("30", "成品"), CONTAINER_PRODUCT("40", "容器"),
-
+        UTENSIL("50", "器具");
         private String value;
         private String description;
 
@@ -3057,6 +3057,16 @@ public class WmsEnumUtil {
             }
             return tmp;
         }
+
+        public static String descriptionOfValue(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(val)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
     }
 
 

modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsStockFifoModel.java

@@ -33,4 +33,7 @@ public class WmsStockFifoModel {
 
     @ApiParam(value = "物料对应的存储区集合")
     Map<String,List<String>> partToZonesMap;
+
+    @ApiParam(value = "波次配料物料清单")
+    boolean collectPicking = false;
 }

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java

@@ -272,4 +272,13 @@ public class WmsDocMovementDetails extends BaseBean {
         this.destLocateNo = destLocateNo;
     }
 
+    public WmsDocMovementDetails (String partNo) {
+        this.partNo = partNo;
+    }
+
+    public WmsDocMovementDetails (String partNo,String orderNo) {
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+    }
+
 }