From b05711dc6cf6f14c30070aea3a9a802381bed91d Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Tue, 29 Oct 2019 20:52:31 +0800
Subject: [PATCH] =?UTF-8?q?1=EF=BC=9A=E6=96=B0=E5=A2=9E=E5=BC=B9=E5=87=BA?=
 =?UTF-8?q?=E6=A1=86=E9=80=89=E6=8B=A9=E5=A4=9A=E4=B8=AA=E5=AF=B9=E8=B1=A1?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java      | 6 ++++++
 .../main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java   | 5 +++--
 .../main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java    | 5 ++---
 .../main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java   | 7 +++++++
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index ddd9a92..db9b0b4 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.enums.WORK_PLAN_TYPE;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
 import io.swagger.annotations.Api;
@@ -33,6 +34,11 @@ import java.util.List;
 @Table(name="APS_WORK_PLAN")
 @Api("工作计划")
 public class WorkPlan extends BaseAPS {
+    @Column(name="TYPE")
+    @ApiParam(value ="工作计划类型")
+    @FieldAnnotation(modify = false, display = false)
+    private WORK_PLAN_TYPE type;
+
     @Column(name="PREV_SET_BEGIN")
     @ApiParam(value ="前设置开始时间")
     @FieldAnnotation(modify = false)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
index 3402810..d78c393 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_CLASS.java
@@ -8,6 +8,7 @@ package cn.estsh.i3plus.pojo.aps.enums;
  * @Modify:
  **/
 public enum RESOURCE_CLASS {
-    MAIN,   // 主资源
-    ASS     // 副资源
+    LIMITLESS,  // 无限能力
+    SINGLE,     // 单能力
+    BATCH       // 炉资源
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
index a42c74c..fa18826 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/RESOURCE_TYPE.java
@@ -8,7 +8,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
  * @Modify:
  **/
 public enum RESOURCE_TYPE {
-    LIMITLESS,  // 无限能力
-    SINGLE,     // 单能力
-    BATCH       // 炉资源
+    MAIN,   // 主资源
+    ASS     // 副资源
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java
new file mode 100644
index 0000000..2a3afa2
--- /dev/null
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/WORK_PLAN_TYPE.java
@@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.enums;
+
+public enum WORK_PLAN_TYPE {
+    MAIN_PLAN,   // 主资源计划
+    ASS_PLAN,   // 副资源计划
+    BATCH_PLAN  // 炉资源计划
+}