diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java index 1c14524..7356992 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/FieldAnnotation.java @@ -27,4 +27,5 @@ public @interface FieldAnnotation { ApsEnumUtil.EDIT_TYPE editType() default ApsEnumUtil.EDIT_TYPE.NONE; // 定义字段的编辑类型 Class multiEnumClass() default Object.class; // 多选枚举的类型。 String typeName() default ""; // 定义字段类型的简单名称,对于多选关联对象时有用。 + String relation() default ""; // 关联字段标识 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java deleted file mode 100644 index f4a4264..0000000 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java +++ /dev/null @@ -1,12 +0,0 @@ -package cn.estsh.i3plus.pojo.aps.annotation; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -@Target(ElementType.TYPE) -@Retention(RetentionPolicy.RUNTIME) -public @interface HolderAnnotation { - String[] notProperty(); -} 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 3576592..7314227 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 @@ -28,6 +28,12 @@ import java.util.List; @MappedSuperclass @Api("订单基类") public class BaseOrder extends BaseCode { + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="COUNT") @ApiParam(value ="数量") private Double count; @@ -69,11 +75,6 @@ public class BaseOrder extends BaseCode { @ApiParam(value ="专料号") private String specifyMaterialNum; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - @JsonBackReference public List getWorks() { return BeanRelation.list(this, EBaseOrder.Works); diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java index b4b241c..2f7ac74 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java @@ -29,6 +29,11 @@ import java.util.List; @Table(name = "APS_OPER_INPUT") @Api("工序输入") public class OperInput extends BaseAPS { + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") private Double inputCount; @@ -59,11 +64,6 @@ public class OperInput extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public Operation getOperation() { return BeanRelation.get(this, EOperInput.Operation); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java index c1f8984..7e0d8e4 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java @@ -28,6 +28,11 @@ import java.util.List; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") private Double outputCount; @@ -45,11 +50,6 @@ public class OperOutput extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public Operation getOperation() { return BeanRelation.get(this, EOperOutput.Operation); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java index 7d78809..9fd050f 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java @@ -29,6 +29,12 @@ import java.util.List; @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") public class OperResource extends BaseAPS { + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(relation = "Resource") + private Long resourceId; + @Column(name="USE_TYPE") @ApiParam(value ="使用类型") @FieldAnnotation(defaultValue = "MAIN") @@ -71,11 +77,6 @@ public class OperResource extends BaseAPS { @FieldAnnotation(property = false) private Long operationId; - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源") - @FieldAnnotation(property = false) - private Long resourceId; - public Operation getOperation() { return BeanRelation.get(this, EOperResource.Operation); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java index b0963f9..f5d5503 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Resource.java @@ -30,11 +30,6 @@ import java.util.List; @Table(name = "APS_RESOURCE") @Api("资源") public class Resource extends BaseCode { - @Column(name="BOTTLENECK") - @ApiParam(value ="是否瓶颈资源") - @FieldAnnotation(defaultValue = "false") - private Boolean bottleneck; - @Column(name="TYPE") @ApiParam(value ="资源类型") @FieldAnnotation(defaultValue = "MAIN") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java index 52d1f68..b5f79e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/StandOperation.java @@ -25,6 +25,12 @@ import javax.persistence.Table; @Table(name = "APS_STAND_OPERATION") @Api("标准工序") public class StandOperation extends BaseCode { + + @Column(name="DIRECTION") + @ApiParam(value ="排程方向") + @FieldAnnotation(defaultValue = "POSITIVE") + private ApsEnumUtil.DIRECTION direction; + @Column(name="RATIO") @ApiParam(value ="分割比例") private String ratio; @@ -37,11 +43,6 @@ public class StandOperation extends BaseCode { @ApiParam(value ="分割批量") private Double batch; - @Column(name="DIRECTION") - @ApiParam(value ="排程方向") - @FieldAnnotation(defaultValue = "POSITIVE") - private ApsEnumUtil.DIRECTION direction; - @Column(name="COMB_TYPE") @ApiParam(value ="生产组合方式") @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java index 576ffb0..77f0691 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java @@ -38,7 +38,7 @@ public class Work extends BaseAPS { @Column(name="ORDER_ID") @ApiParam(value ="订单") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Order") private Long orderId; @Column(name="WORK_TYPE") @@ -51,6 +51,25 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private Double count; + @Column(name="WORK_STATUS") + @ApiParam(value ="工作状态") + private ApsEnumUtil.WORK_STATUS workStatus; + + @Column(name="PLAN_BEGIN") + @ApiParam(value ="计划开始时间") + @FieldAnnotation(modify = false) + private Date planBegin; + + @Column(name="PLAN_END") + @ApiParam(value ="计划结束时间") + @FieldAnnotation(modify = false) + private Date planEnd; + + @Column(name="PLAN_RESOURCE") + @ApiParam(value ="计划主资源") + @FieldAnnotation(modify = false) + private String planResource; + @Column(name="SPECIFY_COUNT") @ApiParam(value ="指定数量") private Double specifyCount; @@ -97,25 +116,6 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private Date calcLet; - @Column(name="WORK_STATUS") - @ApiParam(value ="工作状态") - private ApsEnumUtil.WORK_STATUS workStatus; - - @Column(name="PLAN_BEGIN") - @ApiParam(value ="计划开始时间") - @FieldAnnotation(modify = false) - private Date planBegin; - - @Column(name="PLAN_END") - @ApiParam(value ="计划结束时间") - @FieldAnnotation(modify = false) - private Date planEnd; - - @Column(name="PLAN_RESOURCE") - @ApiParam(value ="计划主资源") - @FieldAnnotation(modify = false) - private String planResource; - @Column(name="FIX_SPLIT") @ApiParam(value ="已分割的工作是否固定") private Boolean fixSplit; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 10cc5dd..e84ac02 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java @@ -29,16 +29,16 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Work") private Long workId; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") @FieldAnnotation(modify = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java index c5638a8..b3c4aaa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java @@ -31,16 +31,16 @@ import java.util.List; @Api("工作输出") public class WorkOutput extends BaseAPS { - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Work") private Long workId; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material") + private Long materialId; + @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") @FieldAnnotation(modify = false) 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 e0b655c..09daae4 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 @@ -34,6 +34,17 @@ import java.util.List; @Table(name="APS_WORK_PLAN") @Api("工作计划") public class WorkPlan extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(relation = "Work") + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(relation = "Resource") + private Long resourceId; + @Column(name="TYPE") @ApiParam(value ="工作计划类型") @FieldAnnotation(modify = false, display = false) @@ -51,7 +62,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PREV_SET_TIME") @ApiParam(value ="前设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer prevSetTime; @Column(name="PRODUCE_BEGIN") @@ -68,7 +79,7 @@ public class WorkPlan extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer produceTime; @Column(name="POST_SET_BEGIN") @@ -83,7 +94,7 @@ public class WorkPlan extends BaseAPS { @Column(name="POST_SET_TIME") @ApiParam(value ="后设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postSetTime; @Column(name="LOCK_BEGIN") @@ -99,19 +110,9 @@ public class WorkPlan extends BaseAPS { @Column(name="LOCK_TIME") @ApiParam(value ="锁定时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer lockTime; - @Column(name="WORK_ID") - @ApiParam(value ="工作对象id") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源对象id") - @FieldAnnotation(property = false) - private Long resourceId; - @Column(name="WORK_RESOURCE_ID") @ApiParam(value ="工作资源对象id") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java index 876e25f..9343d9e 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkRelation.java @@ -30,27 +30,27 @@ public class WorkRelation extends BaseAPS { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Material") private Long materialId; @Column(name="PREV_ORDER_ID") @ApiParam(value ="前订单") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PrevOrder") private Long prevOrderId; @Column(name="POST_ORDER_ID") @ApiParam(value ="后订单") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PostOrder") private Long postOrderId; @Column(name="PREV_WORK_ID") @ApiParam(value ="前工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PrevWork") private Long prevWorkId; @Column(name="POST_WORK_ID") @ApiParam(value ="后工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "PostWork") private Long postWorkId; @Column(name="COUNT") 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 fbc7726..795117a 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 @@ -30,12 +30,12 @@ public class WorkResource extends BaseAPS { @Column(name="WORK_ID") @ApiParam(value ="工作") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Work") private Long workId; @Column(name="RESOURCE_ID") @ApiParam(value ="资源") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Resource") private Long resourceId; @Column(name="USE_TYPE") @@ -45,17 +45,17 @@ public class WorkResource extends BaseAPS { @Column(name="PREV_TIME") @ApiParam(value ="前设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer prevTime; @Column(name="PRODUCE_TIME") @ApiParam(value ="制造时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer produceTime; @Column(name="POST_TIME") @ApiParam(value ="后设置时间") - @FieldAnnotation(modify = false) + @FieldAnnotation(modify = false, editType = ApsEnumUtil.EDIT_TYPE.DURATION) private Integer postTime; @Column(name="PRIORITY") 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 ef776fc..e4c5238 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 @@ -1,10 +1,7 @@ package cn.estsh.i3plus.pojo.aps.holders; -import io.swagger.annotations.ApiParam; - public enum EBaseOrder { Works, - @ApiParam(value = "物料") Material, PrevRelations, PostRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java index 4e72065..47da0e1 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java @@ -1,9 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"ParentWork", "WorkResources", "WorkInputs", "WorkOutputs", - "PrevRelations", "PostRelations", "Operation"}) public enum EWork { Order, // 订单 ParentWork, // 父工作 diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java index 2b35993..ddfbd3a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkInput.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"OperInput"}) public enum EWorkInput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java index b6d52e0..e2f1de2 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkOutput.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = "OperOutput") public enum EWorkOutput { Work, WorkRelations, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java index 25438ec..490bddc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"WorkResource", "MainPlan", "FurnacePlan"}) public enum EWorkPlan { Work, Resource, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java index d75afa7..1fc05e6 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkRelation.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"}) public enum EWorkRelation { Material, PrevOrder, diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java index 360e756..2f77bcc 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkResource.java @@ -1,8 +1,5 @@ package cn.estsh.i3plus.pojo.aps.holders; -import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; - -@HolderAnnotation(notProperty = "OperResource") public enum EWorkResource { Work, Resource,