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 // 炉资源计划 +}