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

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

@@ -112,6 +112,10 @@ public class WmsCSFactTrans extends BaseBean {
     @ApiParam(value = "物料数量", example = "1")
     public Double sumPartQty;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     public WmsCSFactTrans(){}
 
     public Integer getIsScopeVal() {

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

@@ -116,6 +116,10 @@ public class WmsCSOrderDetails extends BaseBean {
     @ApiParam("源单位")
     public String srcUnit;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     /**
      * 差异类型：10：盘平，20：盘亏，30盘赢
      */

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

@@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 
 /**
  * @Description : 盘点范围信息
@@ -57,6 +58,10 @@ public class WmsCSRange extends BaseBean {
     @ApiParam("单位")
     public String unit;
 
+    @Transient
+    @ApiParam("存储区编号")
+    public String[] zoneNos;
+
     public WmsCSRange(){}
 
     public WmsCSRange(String zoneNo,String partNo,String partNameRdd){

modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java

@@ -1310,7 +1310,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSOrderDetails.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderDetails.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSOrderDetails, result);
@@ -1331,7 +1331,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSFactTrans.getZoneNos(), "zoneNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSFactTrans.getSn(), "sn", result);
 
         getStringBuilderPack(wmsCSFactTrans, result);
@@ -2074,7 +2074,7 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getPartNo(), "partNo", result);
         DdlPreparedPack.getStringEqualPack(wmsCSRange.getLocateNo(), "locateNo", result);
-        DdlPreparedPack.getStringLikerPack(wmsCSRange.getZoneNo(), "zoneNo", result);
+        DdlPreparedPack.getInPackArray(wmsCSRange.getZoneNos(), "zoneNo", result);
 
         DdlPreparedPack.getOrderByPack(new Object[]{1}, new String[]{
                 DdlPreparedPack.getOrderColConvertType("item", CommonEnumUtil.BASIS_TYPE.INT.getValue())}, result);