From a1597c089c327fce23f1124d4871fde60207abc5 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: Fri, 18 Oct 2019 18:21:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E5=93=81=E5=86=B2=E9=94=80+=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E8=BD=AC=E6=8D=A2=E6=A0=BC=E5=BC=8F=EF=BC=88=E5=B0=B1?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E4=B8=8D=E7=9F=A5=E9=81=93=E6=98=AF=E4=BB=80?=
 =?UTF-8?q?=E4=B9=88=E5=8D=95=E5=AF=BC=E5=85=A5=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java |  4 ++--
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java    | 16 ++++++++++++----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java
index a72ed67..bc8af3b 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/WmsWriteOffModel.java
@@ -1,10 +1,10 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.wms.bean.WmsMoveSn;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description 冲销Model
@@ -18,5 +18,5 @@ public class WmsWriteOffModel implements Serializable {
     private static final long serialVersionUID = -5490167040159056107L;
     private String locateNo;
     private List<String> snList;
-    private List<Map<String, Object>> summaryList;
+    private List<WmsMoveSn> summaryList;
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
index 4ea1543..f4fdad9 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java
@@ -186,7 +186,7 @@ public class WmsMoveSn extends BaseBean {
     @Version
     @Column(name = "LOCK_VERSION")
     @ApiParam(value = "乐观锁", example = "1")
-    public  Integer lockVersion;
+    public Integer lockVersion;
 
     @Transient
     @ApiParam(value = "快照时间")
@@ -202,10 +202,12 @@ public class WmsMoveSn extends BaseBean {
     public WmsMoveSn() {
     }
 
-    public WmsMoveSn(String partNo, Long finishedCounts, Long waitingCounts) {
+    public WmsMoveSn(String partNo, String partNameRdd, String unit, String lotNo, Double qty) {
         this.partNo = partNo;
-        this.waitingCounts = waitingCounts;
-        this.finishedCounts = finishedCounts;
+        this.partNameRdd = partNameRdd;
+        this.unit = unit;
+        this.lotNo = lotNo;
+        this.qty = qty;
     }
 
     public Long getWaitingCounts() {
@@ -216,6 +218,12 @@ public class WmsMoveSn extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
+    public WmsMoveSn(String partNo, String lotNo, Double qty) {
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.qty = qty;
+    }
+
     public WmsMoveSn(String partNo, String partNameRdd, Double destQty, Integer busiTypeCode, String transTypeCode, String refSrc) {
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;