Merge remote-tracking branch 'origin/dev' into dev

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

@@ -171,8 +171,8 @@ public class WmsMoveDetails extends BaseBean {
     }
 
     public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
-            ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,
-                          String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo,
+            ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,String destWhNo,
+                          String srcZoneNo,String destZoneNo,String srcLocateNo, String destLocateNo,
                           Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
@@ -184,10 +184,10 @@ public class WmsMoveDetails extends BaseBean {
         this.itemStatus = itemStatus;
         this.unit = unit;
         this.srcWhNo = srcWhNo;
-        this.srcZoneNo = srcZoneNo;
-        this.srcLocateNo = srcLocateNo;
         this.destWhNo = destWhNo;
+        this.srcZoneNo = srcZoneNo;
         this.destZoneNo = destZoneNo;
+        this.srcLocateNo = srcLocateNo;
         this.destLocateNo = destLocateNo;
         this.transQty = transQty;
         this.rejectQty = rejectQty;

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

@@ -211,7 +211,7 @@ public class WmsMoveSn extends BaseBean {
     }
     public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
             String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
-            Integer destSnStatus, String lotNo,String dateCode){
+            Integer destSnStatus, String lotNo,String dateCode,String refSrc,String destZoneNo,String destWhNo){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
             this.item=item;
@@ -232,6 +232,9 @@ public class WmsMoveSn extends BaseBean {
             this.destSnStatus=destSnStatus;
             this.lotNo=lotNo;
             this.dateCode=dateCode;
+            this.refSrc = refSrc;
+            this.destZoneNo = destZoneNo;
+            this.destWhNo =destWhNo;
 
 }
 }