From c5ae91b41e46559300db58f509a5c5767575db81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= <jessica.chen@estsh.com>
Date: Mon, 16 Dec 2019 17:25:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90KT-1286=20=E8=AE=A1=E5=88=92=E6=8B=89?=
 =?UTF-8?q?=E5=8A=A8-=E8=AE=A1=E5=88=92=E6=8B=89=E5=8A=A8JOB=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java   |  2 +-
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java |  4 ++--
 .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 15 +++++++++++++--
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index d6d917c..de1b164 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -4656,7 +4656,7 @@ public class WmsEnumUtil {
     }
 
     /**
-     * 计划拉动明细表状态创建
+     * 计划拉动主表状态创建
      * 默认为 10
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java
index b2e4e34..0a41d3e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPullTaskDetails.java
@@ -32,7 +32,7 @@ public class WmsPullTaskDetails extends BaseBean{
 
     @Column(name="WROKORDER_NO")
     @ApiParam("工单号")
-    private String wrokorderNo;
+    private String woekorderNo;
 
     @Column(name="ITEM")
     @ApiParam(value = "行号", example = "0")
@@ -107,7 +107,7 @@ public class WmsPullTaskDetails extends BaseBean{
     private Double bootLotNo = 0d;
 
     @Column(name="ORDER_STATUS")
-    @ApiParam(value = "单据状态", example = "0")
+    @ApiParam(value = "明细状态", example = "0")
     private Integer orderStatus = 0;
 
     public Integer getOrderStatus() {
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 17c8805..1f4fc92 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
@@ -2618,7 +2618,18 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskMaster(WmsPullTaskMaster wmsPullTaskMaster,String statusList) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getInPack(statusList, "orderStatus", result);
+        List<String> stringList = null;
+        List<Integer> integerList = null;
+        //List<Integer> integers = Arrays.stream(statusList.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+        if(StringUtils.isNotBlank(statusList)){
+            stringList = Arrays.asList(statusList.split(","));
+            integerList = new ArrayList<>();
+            for(String sl : stringList){
+                integerList.add(Integer.valueOf(sl));
+            }
+        }
+
+        DdlPreparedPack.getInPackList(integerList, "orderStatus", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskMaster.getWoekorderNo(), "woekorderNo", result);
         DdlPreparedPack.getStringEqualPack(wmsPullTaskMaster.getPdlineNo(), "pdlineNo", result);
         DdlPreparedPack.getStringBiggerPack(wmsPullTaskMaster.getStartProductTime(), "startProductTime", result);
@@ -2637,7 +2648,7 @@ public class WmsHqlPack {
      */
     public static DdlPackBean packHqlWmsPullTaskDetails(WmsPullTaskDetails wmsPullTaskDetails) {
         DdlPackBean result = new DdlPackBean();
-        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWrokorderNo(), "wrokorderNo", result);
+        DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getWoekorderNo(), "woekorderNo", result);
         DdlPreparedPack.getStringLikerPack(wmsPullTaskDetails.getPartNo(), "partNo", result);
 
         getStringBuilderPack(wmsPullTaskDetails, result);