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

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

@@ -190,7 +190,7 @@ public class WmsMoveDetails extends BaseBean {
     }
 
     public WmsMoveDetails (String organizeCode,String partNo,String partNameRdd,String workCenterCode,String fPartNo,String fPartName,String unit,Double qty,
-                            String createDateTime,String sn){
+                            String createDateTime,String sn,String srcZoneNo){
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
@@ -201,6 +201,7 @@ public class WmsMoveDetails extends BaseBean {
         this.qty = qty;
         this.createDateTime = createDateTime;
         this.sn = sn;
+        this.srcZoneNo = srcZoneNo;
 
     }
 

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

@@ -156,7 +156,21 @@ public class WmsPOMasterDetails extends BaseBean {
     @ApiParam("差异")
     private Double difference;
 
+    @Transient
+    @ApiParam("集装箱号")
+    private String containerNo;
+
     public Double getSnpVal() {
         return snp;
     }
+
+    public WmsPOMasterDetails(){}
+
+    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){
+        this.orderNo = orderNo;
+        this.containerNo = containerNo;
+        this.partNo = partNo;
+        this.item = item;
+        this.organizeCode = organizeCode;
+    }
 }