From d3431028d71799c8d68a4cfe6a17cd51f98a11ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E5=BF=83=E6=B4=81?= <gragon.xu@estsh.com>
Date: Mon, 17 Jun 2019 18:06:07 +0800
Subject: [PATCH] =?UTF-8?q?StockQuan=E8=A1=A8=E6=96=B0=E5=A2=9EScrapQty?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=9ANC,=E7=9B=98=E7=82=B9=E8=B0=83?=
 =?UTF-8?q?=E5=B7=AE=EF=BC=8C=E5=87=BA=E5=85=A5=E7=A7=BB=E5=BA=93=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E5=A4=84=E7=90=86=E7=BB=84=E4=BB=B6+=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E9=80=BB=E8=BE=91=E5=8F=98=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsStockQuan.java   | 12 +++++++++++-
 .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java  | 14 +++++++++++++-
 2 files changed, 24 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 fb9a9df..d56b315 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
@@ -102,6 +102,11 @@ public class WmsStockQuan extends BaseBean {
     @ApiParam(value = "锁定数量", example = "0")
     private Double lockQty;
 
+    @Column(name = "SCRAP_QTY")
+    @ColumnDefault("0")
+    @ApiParam(value = "报废数量", example = "0")
+    private Double scrapQty;
+
     public Double getQty() {
         return this.qty == null ? 0 : this.qty;
     }
@@ -134,10 +139,14 @@ public class WmsStockQuan extends BaseBean {
         return this.lockQty == null ? 0 : this.lockQty;
     }
 
+    public Double getScrapQty() {
+        return this.scrapQty == null ? 0 : this.scrapQty;
+    }
+
     public WmsStockQuan() {
     }
 
-    public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty) {
+    public WmsStockQuan(Double qty, Double failQty, Double holdQty, Double qcQty, Double rinQty, Double freezeQty, Double consignQty, Double lockQty, Double scrapQty) {
         this.qty = qty;
         this.failQty = failQty;
         this.holdQty = holdQty;
@@ -146,5 +155,6 @@ public class WmsStockQuan extends BaseBean {
         this.freezeQty = freezeQty;
         this.consignQty = consignQty;
         this.lockQty = lockQty;
+        this.scrapQty = scrapQty;
     }
 }
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 eeb9fba..9129da2 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
@@ -1687,6 +1687,18 @@ public class WmsHqlPack {
         getStringBuilderPack(wmsLineLocatePart, result);
         return result;
     }
+    /**
+     * 任务数据来源 分页查询
+     *
+     * @param wmsTaskSrc
+     * @return
+     */
+    public static DdlPackBean packHqlWmsTaskSrc(WmsTaskSrc wmsTaskSrc) {
+        DdlPackBean result = new DdlPackBean();
 
-
+        //查询参数封装
+        DdlPreparedPack.getStringEqualPack(wmsTaskSrc.getOpTypeCode(), "opTypeCode", result);
+        getStringBuilderPack(wmsTaskSrc, result);
+        return result;
+    }
 }