Merge branches 'dev' and 'test' of http://git.estsh.com/i3-IMPP/i3plus-pojo into test

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

@@ -3632,5 +3632,62 @@ public class WmsEnumUtil {
             return tmp;
         }
     }
+    
+    
+    /**
+     * 物流规则 处理模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_RULE_MODE {
+        CREATE_TASK(10, "CREATE_TASK", "生成任务"),
+        AUTO_OPT(20, "AUTO_OPT", "自动操作"),
+    	MENU_OPT(30, "MENU_OPT", "手工操作"),
+    	AUTO_OPT_NON_TRANS(20, "AUTO_OPT_NON_TRANS", "自动操作无交易");
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_RULE_MODE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        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;
+        }
+
+        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++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
 
 }

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

@@ -92,11 +92,14 @@ public class WmsBom extends BaseBean {
         return this.itemQty == null ? 0 : this.itemQty.doubleValue();
     }
 
-    public WmsBom(){}
-    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) {
+    public WmsBom() {
+    }
+
+    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) {
         this.itemPartNo = itemPartNo;
         this.itemPartNam = itemPartNam;
         this.itemUnit = itemUnit;
         this.bomNum = bomNum;
+        this.itemQty = itemQty;
     }
 }