Merge branch 'dev' into test

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;