From ab0b8a2af11b48b2a1987bbbabd963a64352857c Mon Sep 17 00:00:00 2001
From: Aisiyu <773788208@qq.com>
Date: Tue, 3 Nov 2020 14:38:59 +0800
Subject: [PATCH] =?UTF-8?q?[1211=20=E5=A4=A9=E6=B4=A5=E9=BA=A6=E6=A0=BC?=
 =?UTF-8?q?=E7=BA=B3=E8=B4=A7=E8=BF=90=E7=9C=8B=E6=9D=BFsql=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/wms/bean/WmsDocMovementDetails.java       | 29 ++++++++++++++++------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 2a3156a..a84874b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -109,7 +109,7 @@ public class WmsDocMovementDetails extends BaseBean {
 
     @Transient
     @ApiParam(value = "窗口时间")
-    private Integer windowTime;
+    private String windowTime;
 
     @Transient
     @ApiParam(value = "紧急程度")
@@ -318,6 +318,14 @@ public class WmsDocMovementDetails extends BaseBean {
     private Double snp;
 
     @Transient
+    @ApiParam(value = "订单总数量")
+    private Integer itemCount;
+
+    @Transient
+    @ApiParam(value = "完成订单数量")
+    private Integer completeCount;
+
+    @Transient
     @ApiParam(value = "条码总数量", example = "1")
     private Double detailsSnCount;
 
@@ -444,27 +452,32 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam("窗口领料结束时间")
     private String windowPickEndTime;
 
-    public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo ,Double qty,Double pickQty,
-    Double recQty,Double outQty,Integer itemStatus) {
+    public WmsDocMovementDetails (String custNo,String planDate,String planTime,String orderNo,String projectNo,String partNo,Integer itemStatus) {
         this.custNo = custNo;
         this.orderNo = orderNo;
         this.planDate = planDate;
         this.planTime = planTime;
-        this.qty = qty;
-        this.pickQty = pickQty;
-        this.recQty= recQty;
-        this.outQty = outQty;
         this.itemStatus = itemStatus;
         this.projectNo = projectNo;
         this.partNo=partNo;
     }
+    public WmsDocMovementDetails (String orderNo,String projectNo,Double qty,Double pickQty) {
+        this.orderNo = orderNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.projectNo = projectNo;
+
+    }
 
-    public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus) {
+
+    public WmsDocMovementDetails (String createDatetime, String srcLocateNo, String destLocateNo, String createUser,Integer itemStatus,String orderNo,String partNo) {
         this.createDatetime = createDatetime;
         this.srcLocateNo = srcLocateNo;
         this.destLocateNo = destLocateNo;
         this.createUser = createUser;
         this.itemStatus= itemStatus;
+        this.orderNo = orderNo;
+        this.partNo=partNo;
     }
 
     public WmsDocMovementDetails (String orderNo, String srcZoneNo, String destZoneNo, String destLocateNo) {