From 9f12a44fb6b5031e01c9fb8ad91bf635abf91625 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Fri, 12 Mar 2021 17:12:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8F=92=E5=8D=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java     |  6 +++++-
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java |  5 +++++
 .../main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java | 11 +++++++++++
 .../java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java  |  8 +++++++-
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java
index be4c060..5965305 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/InsertedOrder.java
@@ -33,7 +33,7 @@ public class InsertedOrder extends BaseOrder  {
     @Column(name="ORDER_STATUS")
     @ApiParam(value ="订单状态")
     @FieldAnnotation(defaultValue = "UNCOMMIT")
-    private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus;
+    private ApsEnumUtil.INSERTED_ORDER_STATUS orderStatus = ApsEnumUtil.INSERTED_ORDER_STATUS.UNCOMMIT;
 
     @Column(name="STAND_OPERATIONS")
     @ApiParam("工序")
@@ -44,6 +44,10 @@ public class InsertedOrder extends BaseOrder  {
     @FieldAnnotation(property = false)
     private Long productRoutingId;
 
+    @Column(name="REMARK")
+    @ApiParam(value ="备注")
+    private String remark;
+
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EInsertedOrder.ProductRouting);
     }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
index 91e4421..ce7887a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@@ -103,6 +103,11 @@ public class ProductOrder extends BaseOrder {
     @FieldAnnotation(property = false)
     private Long productRoutingId;
 
+    @Column(name="SRC_INSERTED_ORDER")
+    @ApiParam(value ="需求单为插单")
+    @FieldAnnotation(property = false)
+    private Long srcInsertedOrder;
+
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EProductOrder.ProductRouting);
     }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
index 727c9a2..4d8dede 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkResource.java
@@ -13,6 +13,7 @@ import lombok.EqualsAndHashCode;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.validation.constraints.Min;
 
 /**
  * @Description :工作资源
@@ -89,6 +90,16 @@ public class WorkResource extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operResourceId;
 
+    @Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
+    @ApiParam(value ="容量限制")
+    @Min(0)
+    private Double capacity;
+
+    @Column(name="RES_CAPACITY_ID")
+    @ApiParam(value ="设备能力id")
+    @FieldAnnotation(property = false)
+    private Long resCapacityId = 0l;
+
     public Work getWork() {
         return BeanRelation.get(this, EWorkResource.Work);
     }
diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
index 4eb8a14..e4bf9f7 100644
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java
@@ -406,11 +406,15 @@ public class ApsEnumUtil {
         }
     }
 
+    public interface IRESOURCE_RULE {
+        String getValue();
+        String getDescription();
+    }
     /**
      * 预置的资源选择规则
      */
     @JsonFormat(shape = JsonFormat.Shape.OBJECT)
-    public enum RESOURCE_CHOISE_RULE {
+    public enum RESOURCE_CHOISE_RULE implements IRESOURCE_RULE {
         PREV_SET_TIME("PREV_SET_TIME", "前设置时间"),
         PRODUCE_TIME("PRODUCE_TIME", "生产时间"),
         POST_SET_TIME("POST_SET_TIME", "后设置时间"),
@@ -433,10 +437,12 @@ public class ApsEnumUtil {
             this.description = description;
         }
 
+        @Override
         public String getValue() {
             return value;
         }
 
+        @Override
         public String getDescription() {
             return description;
         }