From 7ffa55fbe8796496bb8b1f84b0e13aa050821af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Sun, 5 May 2019 18:39:26 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

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 a3b4325..64c8aba 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
@@ -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;
     }
 
     /**
@@ -1627,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;
     }
 
     /**
@@ -1643,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;
     }
 
     /**

From c72c2fa891a8c6e8a4ff81efd30f98f536f3625d Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Sun, 5 May 2019 19:04:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=95=A3=E4=BB=B6=E7=9B=98=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 13bf512..c4e3dbb 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
@@ -1697,8 +1697,8 @@ public class WmsHqlPack {
         DdlPackBean result = new DdlPackBean();
 
         //查询参数封装
-        DdlPreparedPack.getInPack(String.join(",", WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() + "",
-                WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue() + ""), "orderStatus", result);
+        DdlPreparedPack.getInPackArray(new Object[]{WmsEnumUtil.CS_ORDER_STATUS.STARTING_INVENTORY.getValue() ,
+                WmsEnumUtil.CS_ORDER_STATUS.IN_INVENTORY.getValue()}, "orderStatus", result);
         DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);