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

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/WmsMoveMaster.java

@@ -132,8 +132,10 @@ public class WmsMoveMaster extends BaseBean {
 
     public WmsMoveMaster(){};
 
-    public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
+    public WmsMoveMaster(Long id,String orderNo,String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
                          String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
+        this.id = id;
+        this.orderNo = orderNo;
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;