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

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

@@ -101,15 +101,15 @@ public class WmsHqlPack {
      * @param wmsDocMovementDetails
      * @return
      */
-    public static String packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
-        StringBuffer result = new StringBuffer();
+    public static DdlPackBean packWmsDocMovementDetails(WmsDocMovementDetails wmsDocMovementDetails) {
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getNumEqualPack(wmsDocMovementDetails.getItemStatus(), "itemStatus", result);
         getStringBuilderPack(wmsDocMovementDetails, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -474,7 +474,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlBasVendorUnique(BasVendor basVendor) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getNumNOEqualPack(basVendor.getId(), "id", result);
         DdlPreparedPack.getStringEqualPack(basVendor.getVendorNo(), "vendorNo", result);
@@ -578,7 +578,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsASNMaster(WmsASNMaster wmsASNMaster) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringRightLikerPack(wmsASNMaster.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMaster.getAsnType(), "asnType", result);
@@ -627,7 +627,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsCheckFactRecord(WmsCheckFactRecord wmsCheckFactRecord) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         //采购单号
         DdlPreparedPack.getStringEqualPack(wmsCheckFactRecord.getPoNo(), "poNo", result);
@@ -646,7 +646,7 @@ public class WmsHqlPack {
     }
 
     public static DdlPackBean packHqlWmsASNMasterDetails(WmsASNMasterDetails wmsASNMasterDetails) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
@@ -828,6 +828,7 @@ public class WmsHqlPack {
 
     /**
      * 根据条件查询单据锁定封装类
+     *
      * @return 单据锁定信息
      */
     public static DdlPackBean packHqlWmsTempOrderLock(WmsTempOrderLock wmsTempOrderLock) {
@@ -951,10 +952,10 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packWmsMoveMasterUnique(WmsMoveMaster wmsMoveMaster) {
-        DdlPackBean result =new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(),"transTypeCode",result);
+        DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result);
         DdlPreparedPack.getNumNOEqualPack(wmsMoveMaster.getId(), "id", result);
         DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result);
 
@@ -1032,6 +1033,7 @@ public class WmsHqlPack {
 
     /**
      * 针对质检查询库存移动条码条件封装(特殊处理)
+     *
      * @param sn
      * @return
      */
@@ -1102,7 +1104,7 @@ public class WmsHqlPack {
      * @return
      */
     public static DdlPackBean packHqlWmsStockSnDialog(WmsStockSn wmsStockSn) {
-        DdlPackBean  result = new DdlPackBean();
+        DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
         DdlPreparedPack.getNotInPack(String.join(",", WmsEnumUtil.STOCK_SN_STATUS.CREATE.getValue() + "",
@@ -1520,7 +1522,7 @@ public class WmsHqlPack {
      * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List<String> orderList) {
+    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName, List<String> orderList) {
         DdlPackBean packBean = new DdlPackBean();
         DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
@@ -1572,12 +1574,12 @@ public class WmsHqlPack {
      * @param wmsTaskCreateLog
      * @return
      */
-    public static String packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
-        HqlPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
+    public static DdlPackBean packHqlWmsTaskCreateLog(WmsTaskCreateLog wmsTaskCreateLog) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getTaskNo(), "taskNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsTaskCreateLog.getOpTypeCode(), "opTypeCode", result);
         getStringBuilderPack(wmsTaskCreateLog, result);
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1625,14 +1627,14 @@ public class WmsHqlPack {
      * @param wmsDocMovementSn
      * @return
      */
-    public static String packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
+    public static DdlPackBean packHqlWmsDocMovementSn(WmsDocMovementSn wmsDocMovementSn) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(wmsDocMovementSn.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsDocMovementSn, result);
 
-        return result.toString();
+        return result;
     }
 
     /**
@@ -1641,14 +1643,14 @@ public class WmsHqlPack {
      * @param details
      * @return
      */
-    public static String packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
-        StringBuffer result = new StringBuffer();
-        HqlPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(details.getPartNo(), "partNo", result);
+    public static DdlPackBean packHqlWmsDocMovementDetails(WmsDocMovementDetails details) {
+        DdlPackBean result = new DdlPackBean();
+        DdlPreparedPack.getStringEqualPack(details.getOrderNo(), "orderNo", result);
+        DdlPreparedPack.getStringEqualPack(details.getPartNo(), "partNo", result);
 
         getStringBuilderPack(details, result);
 
-        return result.toString();
+        return result;
     }
 
     /**