Merge branch 'test'

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

@@ -138,6 +138,10 @@ public class WmsPart extends BaseBean {
     @ApiParam("结算方式")
     private String outCloseType;
 
+    @Column(name = "OUT_CLOSE_VENDOR")
+    @ApiParam("结算供应商")
+    private String outCloseVendor;
+
     @Transient
     @ApiParam("总数量")
     private Double qty;

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

@@ -46,6 +46,6 @@ public class WmsSapOrderLock extends BaseBean {
 
     @Column(name = "IS_SYNC")
     @ApiParam("同步标识")
-    public Integer isSync = 1;
+    public Integer isSync = 2;
 
 }

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

@@ -49,6 +49,7 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
     public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
@@ -1470,12 +1471,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getRefSrc(), "refSrc", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getPrinted(), "printed", result);
 
-        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zones", result);
+        DdlPreparedPack.getInPackList(wmsStockSn.getErpZoneNoList(), "zoneNo", result);
         DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
         DdlPreparedPack.getNumberBiggerPack(wmsStockSn.getQty(), "qty", result);
-        if (StringUtils.isNotBlank(wmsStockSn.getOrderByParam())) {
-            result.setOrderByStr(wmsStockSn.getOrderByParam());
-        }
+        result.setOrderByStr(wmsStockSn.orderBy());
+
         getStringBuilderPack(wmsStockSn, result);
         return result;
     }
@@ -2178,7 +2178,6 @@ public class WmsHqlPack {
     }
 
 
-
     /******************************************作业记录日志HQLPACK开始************************************************/
     /**
      * 作业日志复杂查询