From 1720952d23a29296f7d89d9d98f6f37da2ae8a42 Mon Sep 17 00:00:00 2001 From: Jason Date: Tue, 19 Nov 2019 17:58:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=A1=A8=E8=BE=BE=E5=BC=8F=E5=8F=96=E5=80=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/HolderAnnotation.java | 12 +++++ .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 10 ++-- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 11 ++-- .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 20 ++++--- .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 26 ++++----- .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 27 +++++----- .../estsh/i3plus/pojo/aps/bean/WorkRelation.java | 61 +++++++++++----------- .../estsh/i3plus/pojo/aps/bean/WorkResource.java | 21 ++++---- .../cn/estsh/i3plus/pojo/aps/common/BaseCode.java | 4 -- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 4 ++ .../estsh/i3plus/pojo/aps/holders/EWorkInput.java | 3 ++ .../estsh/i3plus/pojo/aps/holders/EWorkOutput.java | 3 ++ .../estsh/i3plus/pojo/aps/holders/EWorkPlan.java | 3 ++ .../i3plus/pojo/aps/holders/EWorkRelation.java | 13 +++-- .../i3plus/pojo/aps/holders/EWorkResource.java | 3 ++ 15 files changed, 131 insertions(+), 90 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java 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 new file mode 100644 index 0000000..f4a4264 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/HolderAnnotation.java @@ -0,0 +1,12 @@ +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/DynamicSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java index ba3afb0..3837379 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DynamicSetTime.java @@ -30,25 +30,25 @@ public class DynamicSetTime extends BaseAPS { private String resCode; @Column(name="TYPE") - @ApiParam(value ="应用工作计划类型") + @ApiParam(value ="影响类型") @FieldAnnotation(defaultValue = "ALL") private ApsEnumUtil.DYNAMIC_SET_TYPE type; @Column(name="CONSIDER_ASS_RES") - @ApiParam(value ="是否启用副资源动态设置时间") + @ApiParam(value ="启用副资源设置时间") private Boolean considerAssRes; @Column(name="CONSIDER_MATERIAL") - @ApiParam(value ="是否启用物料动态设置时间") + @ApiParam(value ="启用物料设置时间") private Boolean considerMaterial; @Column(name="ASS_RES_CALC") - @ApiParam(value ="副资源动态设置计算方式") + @ApiParam(value ="副资源设置计算方式") @FieldAnnotation(defaultValue = "MAX") private ApsEnumUtil.DYNAMIC_SET_CALC assResCalc; @Column(name="MATERIAL_CALC") - @ApiParam(value ="物料动态设置时间计算方式") + @ApiParam(value ="物料设置时间计算方式") @FieldAnnotation(defaultValue = "MAX") private ApsEnumUtil.DYNAMIC_SET_CALC materialCalc; diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java index 30da6eb..2ea445a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java @@ -1,5 +1,6 @@ package cn.estsh.i3plus.pojo.aps.bean; +import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation; import cn.estsh.i3plus.pojo.aps.common.BaseCode; import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; @@ -50,18 +51,22 @@ public class FieldInfo extends BaseCode { @Column(name="CUSTOMIZE") @ApiParam(value ="是否为自定义字段") - private Boolean customize; + @FieldAnnotation(defaultValue = "true") + private Boolean customize = true; @Column(name="MODIFY") @ApiParam(value ="是否能修改") - private Boolean modify; + @FieldAnnotation(defaultValue = "true") + private Boolean modify = true; @Column(name="DISPLAY") @ApiParam(value ="是否在界面显示") - private Boolean display; + @FieldAnnotation(defaultValue = "true") + private Boolean display = true; @Column(name="PRIC") @ApiParam(value ="浮点数显示精度") + @FieldAnnotation(defaultValue = "2") private Integer pric; @Column(name="TIPS") 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 e14f224..576ffb0 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 @@ -1,6 +1,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.BaseCode; import cn.estsh.i3plus.pojo.aps.common.BeanRelation; import cn.estsh.i3plus.pojo.aps.holders.EWork; @@ -29,10 +30,20 @@ import java.util.List; @Entity @Table(name = "APS_WORK") @Api("工作") -public class Work extends BaseCode { +public class Work extends BaseAPS { + @Column(name="CODE") + @ApiParam(value ="编码") + @FieldAnnotation(popSearch = true, mainkey = true) + private String code; + + @Column(name="ORDER_ID") + @ApiParam(value ="订单") + @FieldAnnotation(property = false) + private Long orderId; + @Column(name="WORK_TYPE") @ApiParam(value ="工作类型") - @FieldAnnotation(modify = false) + @FieldAnnotation(property = false) private ApsEnumUtil.WORK_TYPE workType; @Column(name="count") @@ -124,11 +135,6 @@ public class Work extends BaseCode { @FieldAnnotation(modify = false) private String failedReason; - @Column(name="ORDER_ID") - @ApiParam(value ="订单") - @FieldAnnotation(property = false) - private Long orderId; - @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) 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 ad465c2..10cc5dd 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,10 +29,15 @@ import java.util.List; @Table(name = "APS_WORK_INPUT") @Api("工作输入") public class WorkInput extends BaseAPS { - @Column(name="INPUT_TIME") - @ApiParam(value ="输入时间") - @FieldAnnotation(modify = false) - private Date inputTime; + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; @Column(name="INPUT_COUNT") @ApiParam(value ="输入数量") @@ -44,15 +49,10 @@ public class WorkInput extends BaseAPS { @FieldAnnotation(modify = false) private Double shortCount; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; + @Column(name="INPUT_TIME") + @ApiParam(value ="输入时间") + @FieldAnnotation(modify = false) + private Date inputTime; @Column(name="OPER_INPUT_ID") @ApiParam(value ="工序输入") 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 51f4803..c5638a8 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 @@ -30,10 +30,16 @@ import java.util.List; @Table(name = "APS_WORK_OUTPUT") @Api("工作输出") public class WorkOutput extends BaseAPS { - @Column(name="OUTPUT_TIME") - @ApiParam(value ="输出时间") - @FieldAnnotation(modify = false) - private Date outputTime; + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; @Column(name="OUTPUT_COUNT") @ApiParam(value ="输出数量") @@ -45,15 +51,10 @@ public class WorkOutput extends BaseAPS { @FieldAnnotation(modify = false) private Double remainCount; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; + @Column(name="OUTPUT_TIME") + @ApiParam(value ="输出时间") + @FieldAnnotation(modify = false) + private Date outputTime; @Column(name="OPER_OUTPUT_ID") @ApiParam(value ="工序输出") 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 b0cb321..876e25f 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 @@ -27,6 +27,37 @@ import javax.persistence.Table; @Table(name = "APS_Work_Relation") @Api("工作关联") public class WorkRelation extends BaseAPS { + + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(property = false) + private Long materialId; + + @Column(name="PREV_ORDER_ID") + @ApiParam(value ="前订单") + @FieldAnnotation(property = false) + private Long prevOrderId; + + @Column(name="POST_ORDER_ID") + @ApiParam(value ="后订单") + @FieldAnnotation(property = false) + private Long postOrderId; + + @Column(name="PREV_WORK_ID") + @ApiParam(value ="前工作") + @FieldAnnotation(property = false) + private Long prevWorkId; + + @Column(name="POST_WORK_ID") + @ApiParam(value ="后工作") + @FieldAnnotation(property = false) + private Long postWorkId; + + @Column(name="COUNT") + @ApiParam(value ="关联数量") + @FieldAnnotation(modify = false) + private Double count; + @Column(name="TYPE") @ApiParam(value ="关联类型") @FieldAnnotation(modify = false) @@ -47,11 +78,6 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(modify = false) private String minSpaceTime; - @Column(name="COUNT") - @ApiParam(value ="关联数量") - @FieldAnnotation(modify = false) - private Double count; - @Column(name="FIX_RELATION") @ApiParam(value ="是否固定关联") private Boolean fixRelation; @@ -70,31 +96,6 @@ public class WorkRelation extends BaseAPS { @FieldAnnotation(property = false) private Long workOutputId; - @Column(name="PREV_WORK_ID") - @ApiParam(value ="前工作") - @FieldAnnotation(property = false) - private Long prevWorkId; - - @Column(name="POST_WORK_ID") - @ApiParam(value ="后工作") - @FieldAnnotation(property = false) - private Long postWorkId; - - @Column(name="PREV_ORDER_ID") - @ApiParam(value ="前订单") - @FieldAnnotation(property = false) - private Long prevOrderId; - - @Column(name="POST_ORDER_ID") - @ApiParam(value ="后订单") - @FieldAnnotation(property = false) - private Long postOrderId; - - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public WorkInput getWorkInput() { return BeanRelation.get(this, EWorkRelation.WorkInput); } 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 67bac97..fbc7726 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 @@ -27,6 +27,17 @@ import javax.persistence.Table; @Table(name = "APS_WORK_RESOURCE") @Api("工作资源") public class WorkResource extends BaseAPS { + + @Column(name="WORK_ID") + @ApiParam(value ="工作") + @FieldAnnotation(property = false) + private Long workId; + + @Column(name="RESOURCE_ID") + @ApiParam(value ="资源") + @FieldAnnotation(property = false) + private Long resourceId; + @Column(name="USE_TYPE") @ApiParam(value ="使用类型") @FieldAnnotation(modify = false) @@ -72,16 +83,6 @@ public class WorkResource extends BaseAPS { @FieldAnnotation(modify = false) private String userMatchNumber; - @Column(name="WORK_ID") - @ApiParam(value ="工作") - @FieldAnnotation(property = false) - private Long workId; - - @Column(name="RESOURCE_ID") - @ApiParam(value ="资源") - @FieldAnnotation(property = false) - private Long resourceId; - @Column(name="OPER_RESOURCE_ID") @ApiParam(value ="工序资源") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java index 8fca466..638f867 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseCode.java @@ -28,8 +28,4 @@ public abstract class BaseCode extends BaseAPS { @ApiParam(value ="名称") @FieldAnnotation(popSearch = true) private String name; - - @Column(name="REMARK") - @ApiParam(value ="备注") - private String remark; } 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 47da0e1..4e72065 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,5 +1,9 @@ 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 ddfbd3a..2b35993 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,5 +1,8 @@ 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 e2f1de2..b6d52e0 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,5 +1,8 @@ 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 490bddc..25438ec 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,5 +1,8 @@ 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 cdfc8ab..d75afa7 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,11 +1,14 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = {"WorkInput", "WorkOutput"}) public enum EWorkRelation { - WorkInput, - WorkOutput, - PrevWork, - PostWork, + Material, PrevOrder, PostOrder, - Material + PrevWork, + PostWork, + WorkInput, + WorkOutput } 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 2f77bcc..360e756 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,5 +1,8 @@ package cn.estsh.i3plus.pojo.aps.holders; +import cn.estsh.i3plus.pojo.aps.annotation.HolderAnnotation; + +@HolderAnnotation(notProperty = "OperResource") public enum EWorkResource { Work, Resource,