From 8eb1831861233ddf4031e001d317993245b75852 Mon Sep 17 00:00:00 2001
From: "puxiao.liao" <liaopuxiao@sina.cn>
Date: Fri, 15 Jan 2021 09:38:53 +0800
Subject: [PATCH] Fix bug#12607

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 10 +++---
 .../pojo/wms/bean/WmsDocMovementDetails.java       | 38 ++++++++++++++++++----
 2 files changed, 37 insertions(+), 11 deletions(-)

diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
index 91f0f5d..65c5ee9 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@@ -9163,11 +9163,11 @@ public class WmsEnumUtil {
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
     public enum RC_BOARD_STATUS {
-        FINISH(10, "已完成(绿色)"),
-        OVER_TIME(20, "已超时（红色）"),
-        UNRECEIVED(30, "未收货（蓝色）"),
-        VARIANT(40, "有差异（黄色）"),
-        NORMAL(50, "正常（白色）");
+        FINISH(10, "已完成"),//绿色
+        OVER_TIME(20, "已超时"),//红色
+        UNRECEIVED(30, "未收货"),//蓝色
+        VARIANT(40, "有差异"),//黄色
+        NORMAL(50, "正常");//白色
 
         private int value;
         private String description;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
index 5ba84cf..b6b0f0b 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsDocMovementDetails.java
@@ -9,14 +9,19 @@ import cn.estsh.i3plus.pojo.base.util.StringUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.ColumnDefault;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.*;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Index;
+import javax.persistence.Inheritance;
+import javax.persistence.InheritanceType;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import javax.persistence.Version;
 
 /**
  * @Description :移库单明细实体(用于转储类业务)
@@ -387,6 +392,12 @@ public class WmsDocMovementDetails extends BaseBean {
     @ApiParam(value = "目的库位名称")
     public String destLocateName;
 
+    @Transient
+    @ApiParam("报废类型")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.SCRAP_TYPE.class, refForeignKey = "value", value = "description")
+    public Integer scrapType;
+
+
 
     public String getRecommondLot() {
         return recommondLot == null ? "无" : this.recommondLot;
@@ -740,9 +751,9 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.destLocateName = locateName;
     }
 
-    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo,Integer moveType, Integer busiType,
-                                 String item, String partNo, String partNameRdd,String unit, Double qty,
-                                 Integer isSn, Integer orderMasterStatus,String createUser, String createDatetime) {
+    public WmsDocMovementDetails(String organizeCode, String workOrderCode, String orderNo, Integer moveType, Integer busiType,
+                                 String item, String partNo, String partNameRdd, String unit, Double qty,
+                                 Integer isSn, Integer orderMasterStatus, String createUser, String createDatetime) {
         this.organizeCode = organizeCode;
         this.workOrderCode = workOrderCode;
         this.orderNo = orderNo;
@@ -758,4 +769,19 @@ public WmsDocMovementDetails (String partNo,String orderNo) {
         this.createUser = createUser;
         this.createDatetime = createDatetime;
     }
+
+    public WmsDocMovementDetails(String orderNo, String partNo, String custPartNo, String srcZoneNo, String destZoneNo, String destLocateNo, Double qty, Double pickQty, String createDatetime, Integer orderStatus, String createUser) {
+        this.orderNo = orderNo;
+        this.partNo = partNo;
+        this.custPartNo = custPartNo;
+        this.srcZoneNo = srcZoneNo;
+        this.destZoneNo = destZoneNo;
+        this.destLocateNo = destLocateNo;
+        this.qty = qty;
+        this.pickQty = pickQty;
+        this.createDatetime = createDatetime;
+        this.orderStatus = orderStatus;
+        this.createUser = createUser;
+
+    }
 }