From f10f13a8dec8dbbf71642679546a143ee097caa9 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Mon, 22 Feb 2021 18:34:06 +0800
Subject: [PATCH] add import field

---
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java   | 1 +
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java | 9 +++++++++
 .../cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java   | 2 +-
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java
index 07513fd..64165e5 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FlushPlanRule.java
@@ -20,4 +20,5 @@ import javax.persistence.Table;
 @Table(name = "APS_FLUSH_PLAN_RULE")
 @Api("刷新计划规则")
 public class FlushPlanRule extends BaseRule {
+    private static final long serialVersionUID = 4973034215598612466L;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java
index f875d24..09735cf 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java
@@ -29,6 +29,7 @@ import javax.persistence.Transient;
 @Api("数据导入字段配置")
 public class ImportField extends BaseAPS {
 
+    private static final long serialVersionUID = 8848879008582197564L;
     @Column(name="FIELD_NAME")
     @ApiParam("字段名")
     private String fieldName;
@@ -48,6 +49,14 @@ public class ImportField extends BaseAPS {
     @ApiParam(value = "最大长度", example = "0")
     private Integer maxLength;
 
+    @Column(name="RELATION_TABLE")
+    @ApiParam("关联表名")
+    private String relationTable;
+
+    @Column(name="RELATION_FIELD")
+    @ApiParam("关联字段")
+    private String relationField;
+
     @Transient
     private boolean hasDeal = false;
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java
index dcb7f0b..d3febc2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialDeliveryPromise.java
@@ -26,7 +26,7 @@ import java.util.Date;
 @EqualsAndHashCode(callSuper = true)
 @Entity
 @Table(name = "APS_MATERIAL_DELIVERY_PROMISE")
-@Api("物料")
+@Api("物料交期承诺")
 public class MaterialDeliveryPromise extends BaseBean {
     @Column(name="QTY")
     @ApiParam(value ="到货数量")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
index 489e3bd..b15a445 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java
@@ -49,5 +49,5 @@ public class MaterialSetTime extends BaseAPS {
     @Column(name="PRIORITY")
     @ApiParam(value ="优先级")
     @FieldAnnotation(defaultValue = "10")
-    private int priority;
+    private Integer priority;
 }