From d81a7bf22e1dfa0558812b9992d14b04bf047845 Mon Sep 17 00:00:00 2001
From: "jimmy.zeng" <jimmy.zeng@estsh.com>
Date: Fri, 21 Aug 2020 21:39:04 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A5=E5=8F=A3=E6=98=A0=E5=B0=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java |  8 +++
 .../i3plus/pojo/wms/bean/WmsDocMovementSn.java     | 79 +++++++++++++++++++++-
 2 files changed, 85 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
index 6447a3a..306e070 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocFgDetail.java
@@ -182,6 +182,14 @@ public class WmsDocFgDetail extends BaseBean {
     @ApiParam(value = "jis编号")
     private String jisNo;
 
+    @Column(name = "TERMINAL_NO")
+    @ApiParam(value = "工位号")
+    private String terminalNo;
+
+    @Column(name = "PROCESS_TIME")
+    @ApiParam(value = "离开时间")
+    private String processTime;
+
     public WmsDocFgDetail(String jisNo) {
         this.jisNo = jisNo;
     }
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 d74ecbd..28a59c5 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
@@ -172,6 +172,14 @@ public class WmsDocMovementSn extends BaseBean {
     @ApiParam("仓库")
     private String whNo;
 
+    @Transient
+    @ApiParam(value = "ERP单号")
+    private String erpSrcNo;
+
+    @Transient
+    @ApiParam(value = "版本")
+    private String version;
+
     public WmsDocMovementSn(){}
 
     public WmsDocMovementSn(Long countBox,String partNo) {
@@ -179,15 +187,82 @@ public class WmsDocMovementSn extends BaseBean {
         this.partNo = partNo;
     }
 
-    public WmsDocMovementSn(String orderNo,String custNo,String partNo,String partNameRdd,String lotNo,
-                            String whNo,String createDatetime,Double sumQty) {
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd,
+                            String whNo,Double sumQty) {
         this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
         this.custNo = custNo;
+        this.partNameRdd = partNameRdd;
+        this.whNo = whNo;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd,
+                            String whNo,String erpSrcNo,Double sumQty) {
+        this.orderNo = orderNo;
         this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.custNo = custNo;
         this.partNameRdd = partNameRdd;
+        this.whNo = whNo;
+        this.erpSrcNo = erpSrcNo;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String custNo,String partNameRdd,
+                            String whNo,String erpSrcNo,String version,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
         this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.custNo = custNo;
+        this.partNameRdd = partNameRdd;
         this.whNo = whNo;
+        this.erpSrcNo = erpSrcNo;
+        this.version = version;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,
+                            String whNo,String erpSrcNo,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
+        this.createDatetime = createDatetime;
+        this.whNo = whNo;
+        this.erpSrcNo = erpSrcNo;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String version,String whNo,String custNo,
+                            String erpSrcNo,String planDate,Double sumQty) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.lotNo = lotNo;
         this.createDatetime = createDatetime;
+        this.partNameRdd = partNameRdd;
+        this.version = version;
+        this.whNo = whNo;
+        this.custNo = custNo;
+        this.erpSrcNo = erpSrcNo;
+        this.planDate = planDate;
+        this.sumQty = sumQty;
+    }
+
+    public WmsDocMovementSn(String orderNo,String partNo,String lotNo,String createDatetime,String partNameRdd,
+                            String version,String vendorNo,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;
     }
 }