Merge branch 'dev' into test

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

@@ -116,7 +116,7 @@ public class WmsCSFactTrans extends BaseBean {
     public Double sumPartQty;
 
     @Transient
-    @ApiParam("存储区编号")
+    @ApiParam("存储区编号组")
     public String[] zoneNos;
 
     public WmsCSFactTrans(){}

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

@@ -166,11 +166,12 @@ public class WmsPOMasterDetails extends BaseBean {
 
     public WmsPOMasterDetails(){}
 
-    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode){
+    public WmsPOMasterDetails(String orderNo,String containerNo,String partNo,Integer item,String organizeCode,String erpAreaNo){
         this.orderNo = orderNo;
         this.containerNo = containerNo;
         this.partNo = partNo;
         this.item = item;
         this.organizeCode = organizeCode;
+        this.erpAreaNo = erpAreaNo;
     }
 }