From ec7aee68a7fa06b8f07d9a183caa1e993b9455d1 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Tue, 25 Aug 2020 18:20:03 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=9010744=2020011--=E4=BA=8C=E7=BB=B4?=
 =?UTF-8?q?=E7=A0=81=E6=94=B6=E8=B4=A7=E6=97=B6=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E8=AF=A5=E9=9B=B6=E4=BB=B6=E5=8F=B7=E8=AE=BE=E7=BD=AE=E4=BA=86?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E6=89=B9=E6=AC=A1=EF=BC=8C=E5=88=99=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=B7=B1=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=97=B6=E6=B0=B8=E8=BF=9C?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E2=80=9C=E6=9D=A1=E7=A0=81=E6=9C=AA=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E4=BE=9B=E5=BA=94=E5=95=86=E6=89=B9=E6=AC=A1=20?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=88=90=E5=8A=9F=E8=AF=B7=E6=89=AB=E6=8F=8F?=
 =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E2=80=9D=EF=BC=8C=E5=AE=9E=E9=99=85?=
 =?UTF-8?q?=E6=89=B9=E6=AC=A1=E5=B7=B2=E7=BB=8F=E5=AD=98=E5=9C=A8=E4=B8=8E?=
 =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=B8=AD--0830=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java | 20 +++++++++++++++++++-
 .../cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java   | 12 ++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
index 28a59c5..7d1d04e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementSn.java
@@ -173,6 +173,10 @@ public class WmsDocMovementSn extends BaseBean {
     private String whNo;
 
     @Transient
+    @ApiParam("源仓库")
+    private String srcWhNo;
+
+    @Transient
     @ApiParam(value = "ERP单号")
     private String erpSrcNo;
 
@@ -254,7 +258,20 @@ public class WmsDocMovementSn extends BaseBean {
     }
 
     public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
-                            String version,String vendorNo,Integer snStatus,Double sumQty) {
+                            String version,String whNo,Integer snStatus,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.version = version;
+        this.whNo = whNo;
+        this.snStatus = snStatus;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String version,String whNo,String assignSrcWhNo,Integer snStatus,Double sumQty) {
         this.orderNo = orderNo;
         this.partNo = partNo;
         this.lotNo = lotNo;
@@ -262,6 +279,7 @@ public class WmsDocMovementSn extends BaseBean {
         this.partNameRdd = partNameRdd;
         this.version = version;
         this.whNo = whNo;
+        this.srcWhNo = assignSrcWhNo;
         this.snStatus = snStatus;
         this.sumQty = sumQty;
     }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
index 67fd34b..df42ed8 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTaskInfo.java
@@ -92,6 +92,18 @@ public class WmsTaskInfo extends BaseBean {
     @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class,refForeignKey = "value",value = "description")
     public Integer isCheckSn;
 
+    @Column(name = "SYNC_STATUS")
+    @ApiParam("是否同步")
+    public Integer syncStatus = 10;
+
+    @Column(name = "SYNC_DATE_TIME")
+    @ApiParam(value = "同步时间", example = "1")
+    public String syncDateTime;
+
+    @Column(name = "SYNC_USER")
+    @ApiParam(value = "同步人", example = "1")
+    public String syncUser;
+
     @Transient
     @ApiParam("计划日期")
     private String zdate;