From 5144d15ac4a3a57da563c16e4231109f2f17d72a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Tue, 10 Sep 2019 16:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     | 53 ++++++++++++++++++++++
 .../estsh/i3plus/pojo/wms/bean/WmsASNMaster.java   | 11 +++--
 2 files changed, 61 insertions(+), 3 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 1eae9c3..69cb407 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
@@ -3339,4 +3339,57 @@ public class WmsEnumUtil {
         }
     }
 
+    /**
+     * 收货状态
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum REC_STATUS{
+        UNRECEIVED("UNRECEIVED", "未收货"),
+        COMPLETE_RECEIPT("COMPLETE_RECEIPT", "完成收货"),
+        PARTIAL_RECEIPT("PARTIAL_RECEIPT", "部分收货"),
+        OVER_RECEIVED_GOODS("OVER_RECEIVED_GOODS", "超量收货"),
+        OTHER("ELSE", "其他"),;
+
+        private String value;
+        private String description;
+
+        REC_STATUS(String value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return value;
+        }
+
+        public String getValue() {
+            return value;
+        }
+
+
+        public static String getDes(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(String val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value.equals(val) ) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
\ No newline at end of file
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
index a4e4142..22f00de 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsASNMaster.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -41,6 +43,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "ASN_STATUS")
     @ApiParam(value = "状态", example = "0")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class,refForeignKey = "value",value = "description")
     public Integer asnStatus;
 
     @Column(name = "VENDOR_NO")
@@ -65,6 +68,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Column(name = "IS_TASK")
     @ApiParam(value = "是否生产任务", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.IS_GENERAL_TASK.class,refForeignKey = "value",value = "description")
     public Integer isTask;
 
     @ApiParam("ASN详情列表")
@@ -129,7 +133,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("物料名称")
-    private String partNoNameRdd;
+    private String partNameRdd;
 
     @Transient
     @ApiParam("收货数量")
@@ -165,6 +169,7 @@ public class WmsASNMaster extends BaseBean {
 
     @Transient
     @ApiParam("收货状态")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.REC_STATUS.class,refForeignKey = "value",value = "description")
     private String recStatus;
 
     @Transient
@@ -173,7 +178,7 @@ public class WmsASNMaster extends BaseBean {
 
     public  WmsASNMaster(){}
 
-    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNoNameRdd,
+    public  WmsASNMaster(String orderNo,Integer asnStatus,String vendorNo,String partNo,String partNameRdd,
                                        Double sumQty,Double sumRecQty,String planDate,String planTime,Double diffQty,String orderType,
                                        String recStatus){
 
@@ -181,7 +186,7 @@ public class WmsASNMaster extends BaseBean {
         this.asnStatus = asnStatus;
         this.vendorNo = vendorNo;
         this.partNo = partNo;
-        this.partNoNameRdd = partNoNameRdd;
+        this.partNameRdd = partNameRdd;
         this.sumQty = sumQty;
         this.sumRecQty = sumRecQty;
         this.planDate = planDate;