From afac75bb2b5c9839432f4c7fde5c4dcb6a4cd3ef Mon Sep 17 00:00:00 2001
From: Silliter <sliter.yuan@estsh.com>
Date: Thu, 25 Apr 2019 17:25:19 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E6=A3=80=E6=98=8E=E7=BB=86=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9=20=E7=9C=8B?=
 =?UTF-8?q?=E6=9D=BF=E5=8D=A1=E6=96=B0=E7=9A=84moveno=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E4=BB=BB=E5=8A=A1=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=20=E6=A0=A1=E9=AA=8C=E5=BA=93=E5=AE=B9?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java    | 4 ++--
 .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
index 1359294..0e72b17 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsTaskInfoModel.java
@@ -23,8 +23,8 @@ public class WmsTaskInfoModel implements Serializable {
     /**
      * 状态:1=创建,10=待处理,20=已处理
      */
-    @ApiParam(value = "任务状态", example = "1")
-    public Integer taskStatus;
+    @ApiParam(value = "任务状态")
+    public String taskStatus;
 
     @ApiParam("作业类型名称")
     public String opTypeName;
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 5cd3bf9..472580e 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
@@ -1019,6 +1019,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsMoveSn.getOrderNo(), "orderNo", result);
+        HqlPack.getStringEqualPack(wmsMoveSn.getSn(), "sn", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsMoveSn.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringEqualPack(wmsMoveSn.getRemark(), "remark", result);
@@ -1429,7 +1430,7 @@ public class WmsHqlPack {
     public static String packHqlWmsStockSnLike(WmsStockSn wmsStockSn) {
         StringBuffer result = new StringBuffer();
         HqlPack.getStringRightLikerPack(wmsStockSn.getSn(), "sn", result);
-        getStringBuilderPack(wmsStockSn, result);
+        HqlPack.getStringEqualPack(wmsStockSn.getOrganizeCode(), "organizeCode", result);
         HqlPack.getOrderByPack(new Object[]{2}, new String[]{"createDatetime"}, result);
         return result.toString();
     }
@@ -1514,12 +1515,12 @@ public class WmsHqlPack {
      * 给定字段动态in sql
      *
      * @param columnName
-     * @param orderNo
+     * @param orderList
      * @return
      */
-    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , String orderNo) {
+    public static DdlPackBean packHqlAndIn(WmsTaskInfo bean, String columnName , List<String> orderList) {
         DdlPackBean packBean = new DdlPackBean();
-        DdlPreparedPack.getInPack(orderNo, columnName, packBean);
+        DdlPreparedPack.getInPackList(orderList, columnName, packBean);
         DdlPreparedPack.getStringRightLikerPack(bean.getOrderNo(), "orderNo", packBean);
         DdlPreparedPack.getNumNOEqualPack(bean.getTaskStatus(), "taskStatus", packBean);