From 172fc81bee75f7d786b71f039c373b82bb46b562 Mon Sep 17 00:00:00 2001
From: shiyanghuan <714967695@qq.com>
Date: Tue, 2 Jul 2019 20:06:19 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java | 11 ++++++++++-
 .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java     |  6 +++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
index 73a9619..60c4e87 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java
@@ -122,6 +122,10 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "报废数量", example = "0")
     private Double scrapQty;
 
+    @Transient
+    @ApiParam(value = "总数量")
+    private Double totalQty;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
@@ -158,11 +162,16 @@ public class WmsStockQuan extends BaseBean {
         return this.scrapQty == null ? 0 : this.scrapQty;
     }
 
+    public Double getTotalQty() {
+        return this.totalQty == null ? 0 : this.totalQty;
+    }
+
     public WmsStockQuan() {
     }
 
     public WmsStockQuan(String whNo, String zoneNo, String unit, String partNo, String partName,
-                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) {
+                        Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty,
+                        Double consignQty, Double lockQty) {
         this.whNo = whNo;
         this.zoneNo = zoneNo;
         this.partNo = partNo;
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 f1c64dd..0d9a204 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
@@ -412,7 +412,11 @@ public class WmsHqlPack {
         DdlPreparedPack.getStringEqualPack(wmsLocate.getLocateName(), "locateName", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getLocateType(), "locateType", result);
         DdlPreparedPack.getStringEqualPack(wmsLocate.getWhNo(), "whNo", result);
-        DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
+        if(wmsLocate.getZoneNo() != null){
+            DdlPreparedPack.getInPack(StringUtils.join(new ArrayList<String>(Arrays.asList(wmsLocate.getZoneNo().split(","))),","),"",result);
+        }
+
+       // DdlPreparedPack.getStringEqualPack(wmsLocate.getZoneNo(), "zoneNo", result);
         DdlPreparedPack.getNumEqualPack(wmsLocate.getStatus(), "status", result);
 
         getStringBuilderPack(wmsLocate, result);