From 316050dd24a109033b00bf5f450931badf32079d Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Mon, 24 Jun 2019 09:29:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=20=E4=BA=A4=E5=8F=89?=
 =?UTF-8?q?=E7=9B=98=E7=82=B9=20=E5=BA=93=E5=AD=98=E5=AE=B9=E9=87=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java    | 13 +++++++++++++
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java     | 14 ++++++++++++++
 .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  |  2 +-
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java
index e383d9e..57d4028 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsCSAdjustRange.java
@@ -60,4 +60,17 @@ public class WmsCSAdjustRange extends BaseBean {
     @Transient
     @ApiParam("单位")
     public String unit;
+
+    public WmsCSAdjustRange(){}
+    public WmsCSAdjustRange(String orderNo, Integer item, Integer isAdjust, String partNo, String partNameRdd, String zoneNo, String locateNo, String unit,String organizeCode) {
+        this.orderNo = orderNo;
+        this.item = item;
+        this.isAdjust = isAdjust;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.zoneNo = zoneNo;
+        this.locateNo = locateNo;
+        this.unit = unit;
+        this.organizeCode = organizeCode;
+    }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index faccba1..c4e049d 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -200,6 +200,14 @@ public class WmsStockSn extends BaseBean {
     @ApiParam(value = "工厂名称")
     public String organizeName;
 
+    @Transient
+    @ApiParam(value = "物料数量总和")
+    public Double sumPartQty;
+
+    @Transient
+    @ApiParam(value = "条码数量总和")
+    public Long snCount;
+
     public WmsStockSn(){}
 
     public WmsStockSn(String partNo){
@@ -209,4 +217,10 @@ public class WmsStockSn extends BaseBean {
     public Double getQty() {return qty == null ? 0L : this.qty.doubleValue(); }
 
     public Double getInputNCQty(){return inputNCQty == null ? 0L : this.inputNCQty.doubleValue();}
+
+    public WmsStockSn( Long snCount, Double sumPartQty,String locateNo) {
+        this.snCount = snCount;
+        this.sumPartQty = sumPartQty;
+        this.locateNo = locateNo;
+    }
 }
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 2413009..da30628 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
@@ -1740,7 +1740,7 @@ public class WmsHqlPack {
         //查询参数封装
         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.getNumEqualPack(wmsCSOrderMaster.getIsPart(), "isPart", result);
         DdlPreparedPack.getStringEqualPack(wmsCSOrderMaster.getOrderNo(), "orderNo", result);
 
         getStringBuilderPack(wmsCSOrderMaster, result);