From 95dffb65e094710c76f9e6ceea3ded7af22579da Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Mon, 12 Apr 2021 11:29:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 14 ++++++++++----
 .../java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java   |  3 ++-
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java  |  2 +-
 .../java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java  |  1 +
 .../src/main/resources/relations/BaseOrder.xml             |  2 ++
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
index 738d2ad..9a9eb42 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
@@ -9,7 +9,6 @@ import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
-import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -58,10 +57,10 @@ public class BaseOrder extends BaseAPS {
     @Min(0)
     private Double count;
 
-    @Column(name="PRIORITY")
+    @Column(name="PRIORITY_ID")
     @ApiParam(value ="优先级")
-    @FieldAnnotation(defaultValue = "10")
-    private Integer priority;
+    @FieldAnnotation(relation = "Priority")
+    private Long priorityId;
 
     @Column(name="LET")
     @ApiParam(value ="最晚结束时刻")
@@ -128,4 +127,11 @@ public class BaseOrder extends BaseAPS {
     public List<WorkRelation> getPostRelations() {
         return BeanRelation.list(this, EBaseOrder.PostRelations);
     }
+
+    public PriorityType getPriority() { return BeanRelation.get(this, EBaseOrder.Priority); }
+
+    public void setPriority(PriorityType priority) {
+        this.priorityId = priority != null ? priority.getId() : 0;
+        BeanRelation.set(this, EBaseOrder.Priority, priority);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java
index ec04938..f9e9ffa 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PriorityType.java
@@ -28,10 +28,11 @@ public class PriorityType extends BaseAPS {
 
     @Column(name="CODE")
     @ApiParam(value ="标识")
-    @FieldAnnotation(mainkey = true)
+    @FieldAnnotation(mainkey = true, popSearch = true)
     private String code;
 
     @Column(name="VALUE")
     @ApiParam(value ="值")
+    @FieldAnnotation(notEmpty = true, popSearch = true)
     private Integer value;
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java
index 377522b..273641d 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkShop.java
@@ -33,7 +33,7 @@ public class WorkShop extends BaseAPS {
 
     @Column(name="NAME")
     @ApiParam(value ="名称")
-    @FieldAnnotation(popSearch = true)
+    @FieldAnnotation(popSearch = true, notEmpty = true)
     private String name;
 
 
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
index 28e4b51..d6720fa 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EBaseOrder.java
@@ -5,4 +5,5 @@ public enum EBaseOrder {
     Material,
     PrevRelations,
     PostRelations,
+    Priority,
 }
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
index e1e512a..75f82e5 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
@@ -8,4 +8,6 @@
     </Relation>
     <Relation field="PrevRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
     </Relation>
+    <Relation field="priority" name="PriorityType" type="MULTI_TO_ONE" owner="false">
+    </Relation>
 </Class>
\ No newline at end of file