Merge branch 'dev' into test

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/bean/BaseConstWords.java

@@ -28,4 +28,6 @@ public class BaseConstWords {
     public static final String DICTIONARY_POLITICAL_STATUS ="POLITICAL_STATUS";
     // 员工类型 EMPLOYEE_TYPE
     public static final String DICTIONARY_EMPLOYEE_TYPE ="EMPLOYEE_TYPE";
+    // 系统参数配置 PROPERTIES
+    public static final String DICTIONARY_PROPERTIES ="PROPERTIES";
 }

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

@@ -136,4 +136,17 @@ public class WmsASNMasterDetails extends BaseBean {
     @Transient
     @ApiParam("标准包装")
     public Double snp;
+
+    public WmsASNMasterDetails(){}
+
+    public WmsASNMasterDetails(Double recQty,String partNo,String orderNo,String partNameRdd,String item,String unit,String erpAreaNo,String organizeCode){
+        this.recQty = recQty;
+        this.partNo = partNo;
+        this.orderNo = orderNo;
+        this.partNameRdd = partNameRdd;
+        this.item = item;
+        this.unit = unit;
+        this.erpAreaNo = erpAreaNo;
+        this.organizeCode = organizeCode;
+    }
 }