From 944b400f1ecd131318e49685a728a2d87a14c6a9 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Wed, 27 May 2020 14:08:53 +0800
Subject: [PATCH] Fix bug#8679

---
 .../i3plus/pojo/wms/bean/QmsStockSnExtBh.java      | 12 ++++--
 .../cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java  | 45 ++++++++++++++++++++++
 2 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
index 91870be..328beca 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/QmsStockSnExtBh.java
@@ -76,6 +76,10 @@ public class QmsStockSnExtBh extends BaseBean {
     public Integer pickStatus;
 
     @Transient
+    @ApiParam("挑选状态")
+    public Integer pickResult;
+
+    @Transient
     @ApiParam("物料号")
     public String partNo;
 
@@ -87,9 +91,7 @@ public class QmsStockSnExtBh extends BaseBean {
     @ApiParam("客户发往地")
     public String flagNo;
 
-    @Transient
-    @ApiParam("挑选状态")
-    public Integer pickResult;
+
 
     @Transient
     @ApiParam("二维码")
@@ -114,6 +116,10 @@ public class QmsStockSnExtBh extends BaseBean {
         this.bhType = bhType;
     }
 
+    public QmsStockSnExtBh(String batchNo, Integer bhType) {
+        this.batchNo = batchNo;
+        this.bhType = bhType;
+    }
     public QmsStockSnExtBh() {
     }
 
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
index f2fb8c4..0420294 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsStockSn.java
@@ -428,6 +428,35 @@ public class WmsStockSn extends BaseBean {
     @ApiParam("BH类型")
     private Integer bhType;
 
+    @Transient
+    @ApiParam("处理状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.BH_WORK_STATUS.class, refForeignKey = "value", value = "description")
+    private Integer workStatus;
+
+    @Transient
+    @ApiParam("是否合格")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer isQualified;
+
+    @Transient
+    @ApiParam("返修状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer reworkStatus;
+
+    @Transient
+    @ApiParam("返修结果")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.TRUE_OR_FALSE.class, refForeignKey = "value", value = "description")
+    public Integer reworkResult;
+
+    @Transient
+    @ApiParam("挑选状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REWORK_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer pickStatus;
+
+    @Transient
+    @ApiParam("挑选状态")
+    public Integer pickResult;
+
     public WmsStockSn() {
     }
 
@@ -647,6 +676,22 @@ public class WmsStockSn extends BaseBean {
 
     }
 
+    public WmsStockSn(String organizeCode, String batchNo, Integer bhType, String locateNo, String partNo,
+                      String partNameRdd, String workCenterCode, String createUser, String createDatetime,
+                      String modifyUser, String modifyDatetime) {
+        this.organizeCode = organizeCode;
+        this.batchNo = batchNo;
+        this.bhType = bhType;
+        this.locateNo = locateNo;
+        this.partNo = partNo;
+        this.partNameRdd = partNameRdd;
+        this.workCenterCode = workCenterCode;
+        this.createUser = createUser;
+        this.createDatetime = createDatetime;
+        this.modifyUser = modifyUser;
+        this.modifyDatetime = modifyDatetime;
+
+    }
 
 
 }