From 6fe792f75b2b6c6420ba605ab44a89b55e617605 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 24 Nov 2020 11:51:15 +0800
Subject: [PATCH] =?UTF-8?q?posn=E6=96=B0=E5=A2=9E=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E5=95=86=E7=94=9F=E4=BA=A7=E6=89=B9=E6=AC=A1=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java |  3 ++-
 .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java | 12 ++++++++++--
 2 files changed, 12 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 1d731cd..081c0bb 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
@@ -869,7 +869,8 @@ public class WmsEnumUtil {
         WITHOUT_PRICE_CENTER_IN(720, "WITHOUT_PRICE_CENTER_OUT", "无成本中心入库"),
         OTHER_IN(730, "OTHER_IN", "其它入库"),
         OTHER_OUT(740, "OTHER_OUT", "其它出库"),
-        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账");
+        COGI_BALANCE(750, "COGI_BALANCE", "COGI调账"),
+        SUPPLIER_STD_RETURN(80, "SUPPLIER_STD_RETURN", "供应商退货"); //默认DMR
 
         private int value;
         private String code;
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
index d3ba94f..c414b10 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPoSn.java
@@ -1,6 +1,8 @@
 package cn.estsh.i3plus.pojo.wms.bean;
 
+import cn.estsh.i3plus.pojo.base.annotation.DynamicField;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -103,6 +105,11 @@ public class WmsPoSn extends BaseBean {
     @ApiParam(value = "供应商编码")
     public String vendorNo;
 
+//    @Column(name = "DATE_CODE", nullable = false)
+//    @ApiParam(value = "供应商生产批次")
+//    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
+//    public String dateCode = "";
+
     @ApiParam(value = "供应商名称")
     @Transient
     public String vendorNameRdd;
@@ -119,8 +126,9 @@ public class WmsPoSn extends BaseBean {
     @Transient
     public String lotNo;
 
-    @Transient
-    @ApiParam(value = "生产日期")
+    @Column(name = "DATE_CODE", nullable = false)
+    @ApiParam(value = "供应商生产日期")
+    @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT)
     public String dateCode;
 
     @Transient