From ebc92f6290c7dcf349c95eeb9bbc2001333542b0 Mon Sep 17 00:00:00 2001
From: amy <962239776@qq.com>
Date: Tue, 19 Mar 2019 16:49:38 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
index 99f3f47..a2ddf74 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementMaster.java
@@ -100,4 +100,12 @@ public class WmsDocMovementMaster extends BaseBean {
 
     @Transient
     private List<WmsDocMovementDetails> movementDetailsList;
+
+    @Transient
+    @ApiParam(value = "源库存地代码")
+    private String srcAreaNo;
+
+    @Transient
+    @ApiParam(value = "目的库存地代码")
+    private String desrAreaNo;
 }

From 4ef08afaa7ff22d46e37520ea7cd90ed3934da7f Mon Sep 17 00:00:00 2001
From: "gragon.xu" <gragon.xu@estsh.com>
Date: Tue, 19 Mar 2019 17:40:37 +0800
Subject: [PATCH 2/3] dragon

---
 .../estsh/i3plus/pojo/wms/bean/WmsTransQuan.java   | 40 +++++++++++++++++-----
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
index f858769..893a13b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java
@@ -56,14 +56,6 @@ public class WmsTransQuan extends BaseBean {
     @ApiParam(value = "单位")
     private String unit;
 
-    @Column(name = "QTY")
-    @ApiParam(value = "交易数量", example = "1")
-    private Double qty;
-
-    @Column(name = "REJECT_QTY")
-    @ApiParam(value = "不合格交易数量", example = "1")
-    private Double rejectQty;
-
     @Column(name = "TRANS_STATUS")
     @ApiParam(value = "状态", example = "10")
     private Integer transStatus;
@@ -99,4 +91,36 @@ public class WmsTransQuan extends BaseBean {
     @Column(name = "ERROR_MESSAGE")
     @ApiParam(value = "错误信息")
     private String errorMessage;
+
+    @Column(name = "QTY")
+    @ApiParam(value = "可用数量", example = "0")
+    public Double qty;
+
+    @Column(name = "FAIL_QTY")
+    @ApiParam(value = "不合格数量", example = "0")
+    private Double failQty;
+
+    @Column(name = "HOLD_QTY")
+    @ApiParam(value = "隔离数量", example = "0")
+    private Double holdQty;
+
+    @Column(name = "QC_QTY")
+    @ApiParam(value = "质检中数量", example = "0")
+    private Double qcQty;
+
+    @Column(name = "RIN_QTY")
+    @ApiParam(value = "待入库数量", example = "0")
+    private Double rinQty;
+
+    @Column(name = "FREEZE_QTY")
+    @ApiParam(value = "冻结数量", example = "0")
+    private Double freezeQty;
+
+    @Column(name = "CONSIGN_QTY")
+    @ApiParam(value = "寄售数量", example = "0")
+    private Double consignQty;
+
+    @Column(name = "LOCK_QTY")
+    @ApiParam(value = "锁定数量", example = "0")
+    private Double lockQty;
 }

From 6cf53459e28a037ff8b23485d0c1d08d08eb1527 Mon Sep 17 00:00:00 2001
From: jimmy <1622218722@qq.com>
Date: Tue, 19 Mar 2019 19:24:41 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java       | 1 +
 1 file changed, 1 insertion(+)

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 6787a24..f93613e 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
@@ -648,6 +648,7 @@ public class WmsHqlPack {
         StringBuffer result = new StringBuffer();
 
         HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result);
+        HqlPack.getStringLikerPack(wmsTaskInfo.getOrderNo(), "orderNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result);
         HqlPack.getStringLikerPack(wmsTaskInfo.getRemark(), "remark", result);