diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
index edc6101..6f65d60 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java
@@ -49,9 +49,10 @@ public class WmsHqlPack {
 
     /**
      * 单位换算 分页查询
+     *
      * @return
      */
-    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert){
+    public static DdlPackBean packHqlWmsUnitConvertByPager(WmsUnitConvert wmsUnitConvert) {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
@@ -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开始************************************************/
     /**
      * 作业日志复杂查询
@@ -2199,13 +2198,13 @@ public class WmsHqlPack {
         DdlPreparedPack.getNumEqualPack(actionLog.getIsValid(), "isValid", packBean);
         DdlPreparedPack.getNumEqualPack(actionLog.getIsDeleted(), "isDeleted", packBean);
 
-        if((actionLog.getStartTimeStart() != null&&actionLog.getStartTimeStart() !="")
-                || (actionLog.getStartTimeEnd() != null&&actionLog.getStartTimeEnd() != "")){
+        if ((actionLog.getStartTimeStart() != null && actionLog.getStartTimeStart() != "")
+                || (actionLog.getStartTimeEnd() != null && actionLog.getStartTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getStartTimeStart(), actionLog.getStartTimeEnd(), "startTime", packBean, true);
         }
 
-        if((actionLog.getEndTimeStart() != null&&actionLog.getEndTimeStart() != "")
-                || (actionLog.getEndTimeEnd() != null&&actionLog.getEndTimeEnd() != "")){
+        if ((actionLog.getEndTimeStart() != null && actionLog.getEndTimeStart() != "")
+                || (actionLog.getEndTimeEnd() != null && actionLog.getEndTimeEnd() != "")) {
             DdlPreparedPack.timeBuilder(actionLog.getEndTimeStart(), actionLog.getEndTimeEnd(), "endTime", packBean, true);
         }
 
@@ -2264,19 +2263,19 @@ public class WmsHqlPack {
 
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getVendorNo(), "vendorNo", result);
         // 库位不为空
-        DdlPreparedPack.getStringNotNullPack( "locateNo", result);
-        DdlPreparedPack.getStringNoEqualPack("","locateNo", result);
+        DdlPreparedPack.getStringNotNullPack("locateNo", result);
+        DdlPreparedPack.getStringNoEqualPack("", "locateNo", result);
         // 排除创建及出库状态条码
-        if(wmsStockSn.getSnStatus() != null){
+        if (wmsStockSn.getSnStatus() != null) {
             DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnStatus(), "snStatus", result);
         }
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(),"snStatus",result);
-        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(),"snStatus",result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue(), "snStatus", result);
+        DdlPreparedPack.getNumNOEqualPack(WmsEnumUtil.STOCK_SN_STATUS.OUT_STOCK.getValue(), "snStatus", result);
 
-        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(),"snType",result);
+        DdlPreparedPack.getNumEqualPack(wmsStockSn.getSnType(), "snType", result);
 
         //数量大于0
-        DdlPreparedPack.getNumberBiggerPack(0,"qty",result);
+        DdlPreparedPack.getNumberBiggerPack(0, "qty", result);
         DdlPreparedPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getDateCode(), "dateCode", result);
         DdlPreparedPack.getStringEqualPack(wmsStockSn.getLotNo(), "lotNo", result);