From d8bc8d713dd2abd6e23bfbe3ad081bbd2e221646 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=95=8F?= <962239776@qq.com>
Date: Wed, 18 Sep 2019 17:03:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=89=93=E5=8D=B0model?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus/pojo/base/enumutil/WmsEnumUtil.java     |  3 +-
 .../i3plus/pojo/model/wms/PrintOrderDataModel.java | 32 ++++++++++++++++++++++
 .../cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java |  3 ++
 .../pojo/wms/modelbean/WmsDataAuthModel.java       |  3 ++
 4 files changed, 40 insertions(+), 1 deletion(-)

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 4b8c2ce..a4572cc 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
@@ -1879,7 +1879,8 @@ public class WmsEnumUtil {
         ZONE(20, "ZONE", "存储区对象"),
         LOCATE(30, "LOCATE", "库位对象"),
         MATERIAL(40, "MATERIAL", "物料对象"),
-        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象");
+        TRANS_TYPE(50, "TRANS_TYPE", "交易代码对象"),
+        BUSI_TYPE(60, "BUSI_TYPE", "业务类型对象");
 
         private String code;
         private String description;
diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
index ce22558..c9a988d 100644
--- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
+++ b/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/PrintOrderDataModel.java
@@ -1,11 +1,14 @@
 package cn.estsh.i3plus.pojo.model.wms;
 
+import cn.estsh.i3plus.pojo.base.annotation.AnnoOutputColumn;
+import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil;
 import cn.estsh.i3plus.pojo.wms.bean.WmsASNMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsDocMovementMaster;
 import cn.estsh.i3plus.pojo.wms.bean.WmsPOMaster;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
 
+import javax.persistence.Transient;
 import java.io.Serializable;
 
 /**
@@ -37,6 +40,35 @@ public class PrintOrderDataModel implements Serializable {
     @ApiParam(value = "移库单主表")
     public WmsDocMovementMaster movementMaster;
 
+    @ApiParam(value = "状态")
+    @Transient
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
+    public Integer orderStatus;
+
+    @ApiParam(value = "供应商名称")
+    @Transient
+    public String vendorName;
+
+    @ApiParam(value = "供应商编码")
+    @Transient
+    public String vendorNo;
+
+    @ApiParam(value = "客户编码")
+    @Transient
+    public String custNo;
+
+    @ApiParam(value = "ERP编号")
+    @Transient
+    public String erpSrcNo;
+
+    @ApiParam(value = "联系人")
+    @Transient
+    public String vendorOwner;
+
+    @ApiParam(value = "供应商邮箱")
+    @Transient
+    public String vendorEmail;
+
     public int getBusiDataType() {
         if (busiDataType != null) {
             return busiDataType.intValue();
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
index a545be8..8b24b26 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.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;
@@ -49,6 +51,7 @@ public class WmsPOMaster extends BaseBean {
      */
     @Column(name = "PO_STATUS")
     @ApiParam(value = "状态", example = "1")
+    @AnnoOutputColumn(refClass = WmsEnumUtil.MASTER_ORDER_STATUS.class, refForeignKey = "value", value = "description")
     public Integer poStatus;
 
     @Column(name = "VENDOR_NO")
diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
index 20c7692..2079deb 100644
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/modelbean/WmsDataAuthModel.java
@@ -42,6 +42,9 @@ public class WmsDataAuthModel extends BaseBean {
     @ApiParam("交易代码列表")
     private List<String> transTypeList;
 
+    @ApiParam("业务类型列表")
+    private List<String> busiTypeList;
+
     @ApiParam(
             value = "新增操作",
             example = "0"