From 9c189dce3c66f738f426ade827ec4a02c8060059 Mon Sep 17 00:00:00 2001
From: Chnx <Chnx@itcast.com>
Date: Sat, 6 Jul 2019 10:08:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=93=E5=AD=98=E7=A7=BB=E5=8A=A8=E5=8D=95?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java    | 11 +++++++----
 .../java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java     |  6 +++++-
 .../main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveSn.java    |  7 ++++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
index 2abe9b4..f23b64e 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveDetails.java
@@ -136,6 +136,10 @@ public class WmsMoveDetails extends BaseBean {
     @ApiParam("条码")
     private String sn;
 
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     public WmsMoveDetails(){}
 
     public WmsMoveDetails(String partNo, Long waitingCounts ,Long finishedCounts){
@@ -161,8 +165,8 @@ public class WmsMoveDetails extends BaseBean {
         return finishedCounts == null ? 0L : this.finishedCounts;
     }
 
-    public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode,
-                          Integer itemStatus,String unit,String srcWhNo,
+    public WmsMoveDetails(String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,String transTypeCode
+            ,String transTypeName,Integer itemStatus,String unit,String srcWhNo,
                           String srcZoneNo,String srcLocateNo,String destWhNo, String destZoneNo, String destLocateNo,
                           Double transQty,Double rejectQty,String refSrc,String vendorNo, String custNo){
         this.organizeCode = organizeCode;
@@ -171,6 +175,7 @@ public class WmsMoveDetails extends BaseBean {
         this.item = item;
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
         this.itemStatus = itemStatus;
         this.unit = unit;
         this.srcWhNo = srcWhNo;
@@ -185,7 +190,5 @@ public class WmsMoveDetails extends BaseBean {
         this.vendorNo = vendorNo;
         this.custNo = custNo;
 
-
-
     }
 }
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
index f5d2080..5b4030c 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsMoveMaster.java
@@ -126,15 +126,19 @@ public class WmsMoveMaster extends BaseBean {
     @ApiParam("库位")
     private String destLocateNo;
 
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
 
     public WmsMoveMaster(){};
 
-    public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,Integer itemStatus,
+    public WmsMoveMaster(String organizeCode,String partNo,String partNameRdd,String transTypeCode,String transTypeName,Integer itemStatus,
                          String unit,String srcWhNo,String srcZoneNo,String destWhNo,String destZoneNo,Double transQty, Double rejectQty) {
         this.organizeCode = organizeCode;
         this.partNo = partNo;
         this.partNameRdd = partNameRdd;
         this.transTypeCode = transTypeCode;
+        this.transTypeName = transTypeName;
         this.itemStatus = itemStatus;
         this.unit = unit;
         this.srcWhNo = srcWhNo;
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 884cae5..06a15a7 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
@@ -173,6 +173,10 @@ public class WmsMoveSn extends BaseBean {
     @ApiParam("供应商编码")
     private String vendorNo;
 
+    @Transient
+    @ApiParam("交易类型名称")
+    private String transTypeName;
+
     public WmsMoveSn(){}
 
     public WmsMoveSn(String partNo, Long finishedCounts ,Long waitingCounts){
@@ -205,7 +209,7 @@ public class WmsMoveSn extends BaseBean {
         this.refSrc = refSrc;
     }
     public  WmsMoveSn( String organizeCode,String orderNo,Integer item,String partNo,String partNameRdd,
-            String transTypeCode,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
+            String transTypeCode,String transTypeName,Integer itemStatus,String unit, String srcLocateNo,String destLocateNo,Double srcQty,Double destQty,Integer srcQcStatus,Integer descQcStatus,Integer srcSnStatus,
             Integer destSnStatus, String lotNo,String dateCode){
             this.organizeCode=organizeCode;
             this.orderNo=orderNo;
@@ -213,6 +217,7 @@ public class WmsMoveSn extends BaseBean {
             this.partNo=partNo;
             this.partNameRdd=partNameRdd;
             this.transTypeCode=transTypeCode;
+            this.transTypeName=transTypeName;
             this.itemStatus=itemStatus;
             this.unit=unit;
             this.srcLocateNo=srcLocateNo;