From 3056922b15f0cb149fcb079ffe67cfd1a2d3d75d Mon Sep 17 00:00:00 2001
From: "gragon.xu" <gragon.xu@estsh.com>
Date: Fri, 8 Mar 2019 11:29:39 +0800
Subject: [PATCH] =?UTF-8?q?POMasterDetails=E4=BF=AE=E6=94=B9=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=90=8DwhNo->erpWhNo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java   | 12 ++++++++++++
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java  |  2 +-
 .../i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java      |  2 +-
 .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java    |  6 +++---
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
index 6d8434c..a694def 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMasterDetails.java
@@ -88,4 +88,16 @@ public class WmsASNMasterDetails extends WmsOrderDetailsModel {
     @ApiParam(value = "已收数量", example = "0")
     public Double recQty;
 
+    @Override
+    public String toString() {
+        return "WmsASNMasterDetails{" +
+                "recQty=" + recQty +
+                ", partNo='" + partNo + '\'' +
+                ", partNameRdd='" + partNameRdd + '\'' +
+                ", item=" + item +
+                ", qty=" + qty +
+                ", unit='" + unit + '\'' +
+                ", orderNo='" + orderNo + '\'' +
+                '}';
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
index c5e5990..0246ac2 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsQCTrans.java
@@ -34,7 +34,7 @@ public class WmsQCTrans extends BaseBean {
 
     @Column(name="ITEM")
     @ApiParam("行号")
-    public String item;
+    public Integer item;
 
     /**
      * 状态:1=创建,10=已处理
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java
index 6b4b34a..0be658a 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsOrderDetailsModel.java
@@ -34,7 +34,7 @@ public class WmsOrderDetailsModel extends BaseBean {
     public String partNameRdd;
     @Column(name = "ITEM")
     @ApiParam("行号")
-    public String item;
+    public Integer item;
     @Column(name = "QTY")
     @ApiParam(value = "需求数量", example = "0")
     public Double qty;
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 784d620..8a923bd 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
@@ -50,7 +50,7 @@ public class WmsHqlPack {
 
         //查询参数封装
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getStringLikerPack(wmsPOMasterDetails.getItem(), "item", result);
+        HqlPack.getNumEqualPack(wmsPOMasterDetails.getItem(), "item", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getStringLikerPack(wmsPOMasterDetails.getZTime(), "zTime", result);
@@ -574,7 +574,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getOrderNo(), "orderNo", result);
-        HqlPack.getStringEqualPack(wmsASNMasterDetails.getItem(), "item", result);
+        HqlPack.getNumEqualPack(wmsASNMasterDetails.getItem(), "item", result);
         HqlPack.getStringEqualPack(wmsASNMasterDetails.getPartNo(), "partNo", result);
         HqlPack.getStringLikerPack(wmsASNMasterDetails.getPartNameRdd(), "partNameRdd", result);
         HqlPack.getNumEqualPack(wmsASNMasterDetails.getQty(), "qty", result);
@@ -991,7 +991,7 @@ public class WmsHqlPack {
         //单号
         HqlPack.getStringEqualPack(wmsQCTrans.getOrderNo(), "orderNo", result);
         //行号
-        HqlPack.getStringEqualPack(wmsQCTrans.getItem(), "item", result);
+        HqlPack.getNumEqualPack(wmsQCTrans.getItem(), "item", result);
 
         getStringBuilderPack(wmsQCTrans, result);