From bed955575dd778acfbb25a01b9864bd4f01c7f84 Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 20 Nov 2019 20:25:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=84=E5=88=99=E7=BB=84?= =?UTF-8?q?=E5=90=88=E5=85=B3=E8=81=94=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/aps/annotation/FieldAnnotation.java | 1 + .../pojo/aps/bean/AssistResourceSetTime.java | 11 +++++-- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 4 ++- .../cn/estsh/i3plus/pojo/aps/bean/DayShift.java | 9 +++--- .../estsh/i3plus/pojo/aps/bean/DynamicSetTime.java | 1 + .../estsh/i3plus/pojo/aps/bean/ExportDetail.java | 22 +++++++++----- .../cn/estsh/i3plus/pojo/aps/bean/FieldInfo.java | 4 +++ .../estsh/i3plus/pojo/aps/bean/FieldSetRule.java | 2 ++ .../estsh/i3plus/pojo/aps/bean/ImportDetail.java | 16 ++++++---- .../cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 2 +- .../i3plus/pojo/aps/bean/MaterialSetTime.java | 9 ++++-- .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 12 ++++---- .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 12 ++++---- .../estsh/i3plus/pojo/aps/bean/OperResource.java | 12 ++++---- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 24 ++++++++------- .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 10 +++---- .../cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java | 3 +- .../cn/estsh/i3plus/pojo/aps/bean/Resource.java | 2 +- .../cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java | 4 +-- .../estsh/i3plus/pojo/aps/bean/ShippingTime.java | 34 ++++++++++++---------- .../cn/estsh/i3plus/pojo/aps/bean/SysParam.java | 2 +- .../src/main/resources/relations/ShippingTime.xml | 2 +- .../i3plus/pojo/base/enumutil/ApsEnumUtil.java | 8 ++--- 24 files changed, 124 insertions(+), 85 deletions(-) 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 7356992..67ab48c 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 @@ -28,4 +28,5 @@ public @interface FieldAnnotation { Class multiEnumClass() default Object.class; // 多选枚举的类型。 String typeName() default ""; // 定义字段类型的简单名称，对于多选关联对象时有用。 String relation() default ""; // 关联字段标识 + boolean notEmpty() default false; // 是否不允许为空 } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java index c5eec24..527cbea 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/AssistResourceSetTime.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.BaseAPS; import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; @@ -26,25 +27,31 @@ import javax.persistence.Table; public class AssistResourceSetTime extends BaseAPS { @Column(name="RES_CODE") @ApiParam(value ="资源编码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCode; @Column(name="TYPE") @ApiParam(value ="副资源使用类型") + @FieldAnnotation(defaultValue = "FIRST_ASS") private ApsEnumUtil.USE_TYPE type; @Column(name="PREV_RESOURCE") - @ApiParam(value ="前资源编码") + @ApiParam(value ="前资源") + @FieldAnnotation(notEmpty = true) private String prevResource; @Column(name="POST_RESOURCE") - @ApiParam(value ="后资源编码") + @ApiParam(value ="后资源") + @FieldAnnotation(notEmpty = true) private String postResource; @Column(name="TIME") @ApiParam(value ="设置时间") + @FieldAnnotation(notEmpty = true) private String time; @Column(name="PRIORITY") @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") private int priority; } 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 7314227..0dfe904 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 @@ -31,11 +31,12 @@ public class BaseOrder extends BaseCode { @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material") + @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; @Column(name="COUNT") @ApiParam(value ="数量") + @FieldAnnotation(notEmpty = true) private Double count; @Column(name="PRIORITY") @@ -45,6 +46,7 @@ public class BaseOrder extends BaseCode { @Column(name="LET") @ApiParam(value ="最晚结束时刻") + @FieldAnnotation(notEmpty = true) private Date let; @Column(name="CALC_EST") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java index 54f2d8a..6f816fb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DayShift.java @@ -1,6 +1,8 @@ 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 io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -22,12 +24,9 @@ import javax.persistence.Table; @Entity @Table(name = "APS_DAY_SHIFT") @Api("班次") -public class DayShift extends BaseAPS { - @Column(name="CODE") - @ApiParam(value ="编码") - private String code; - +public class DayShift extends BaseCode { @Column(name="WORK_TIMES") @ApiParam(value ="工作时间") + @FieldAnnotation(notEmpty = true) private String workTimes; } 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 3837379..156673e 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 @@ -27,6 +27,7 @@ import javax.persistence.Table; public class DynamicSetTime extends BaseAPS { @Column(name="RES_CODE") @ApiParam(value ="资源代码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCode; @Column(name="TYPE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java index 5e49e94..31196db 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportDetail.java @@ -26,13 +26,6 @@ import javax.persistence.Table; @Table(name = "APS_EXPORT_DETAIL") @Api("数据导出明细") public class ExportDetail extends BaseAPS { - @Column(name="FILTER") - @ApiParam(value ="筛选") - private String filter; - - @Column(name="SORT_BY") - @ApiParam(value ="排序") - private String sortBy; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") @@ -42,9 +35,22 @@ public class ExportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; + @Column(name="FILTER") + @ApiParam(value ="筛选") + private String filter; + + @Column(name="SORT_BY") + @ApiParam(value ="排序") + private String sortBy; + + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + @FieldAnnotation(display = false) + private Integer orderNumber; + @Column(name="PROJECT_ID") @ApiParam(value ="导出项目ID") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Project") private Long projectId; public ExportProject getProject() { 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 2ea445a..ca0c1d9 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 @@ -104,6 +104,10 @@ public class FieldInfo extends BaseCode { @ApiParam(value ="枚举项内容") private transient Enum[] enumItems; + @Column(name = "NOT_EMPTY") + @ApiParam(value = "不能为空") + private Boolean notEmpty; + @JsonIgnore private transient Class clazz; @JsonIgnore diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java index 470db80..00ba1ea 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/FieldSetRule.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.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; @@ -33,6 +34,7 @@ public class FieldSetRule extends BaseRule { @Column(name="FIELD_NAME") @ApiParam(value ="字段名") + @FieldAnnotation(notEmpty = true) private String fieldName; @Column(name="VALUE") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java index 8e0d4c5..2589083 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java @@ -27,10 +27,6 @@ import javax.persistence.Table; @Table(name = "APS_IMPORT_DETAIL") @Api("数据导入明细") public class ImportDetail extends BaseAPS { - @Column(name="TYPE") - @ApiParam(value ="导入类型") - @FieldAnnotation(defaultValue = "REPLACE") - private ApsEnumUtil.IMPORT_DETAIL_TYPE type; @Column(name="OUT_NAME") @ApiParam(value ="外部表名") @@ -40,9 +36,19 @@ public class ImportDetail extends BaseAPS { @ApiParam(value ="内部表名") private String inName; + @Column(name="TYPE") + @ApiParam(value ="导入类型") + @FieldAnnotation(defaultValue = "REPLACE") + private ApsEnumUtil.IMPORT_DETAIL_TYPE type; + + @Column(name="ORDER_NUMBER") + @ApiParam(value ="序号") + @FieldAnnotation(property = false) + private Integer orderNumber; + @Column(name="PROJECT_ID") @ApiParam(value ="导入项目ID") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Project") private Long projectId; public ImportProject getProject() { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java index 9150118..95baac0 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MatCalcRule.java @@ -38,7 +38,7 @@ public class MatCalcRule extends BaseRule { @Column(name="DEL_AUTO") @ApiParam(value ="自动删除补充订单") - @FieldAnnotation(defaultValue = "true") + @FieldAnnotation(defaultValue = "1") private Boolean delAuto; @Column(name="DEL_LIMIT") @@ -52,6 +52,7 @@ public class MatCalcRule extends BaseRule { @Column(name="AUTO_SUPPLY") @ApiParam(value ="自动补充") + @FieldAnnotation(defaultValue = "1") private Boolean autoSupply; @Column(name="BATCH_SUPPLY") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java index e19681f..f0bd577 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java @@ -77,7 +77,7 @@ public class Material extends BaseCode { @Column(name="IS_AUTO_FIX_PEGGING") @ApiParam(value ="自动补充标识") - @FieldAnnotation(defaultValue = "true") + @FieldAnnotation(defaultValue = "1") private Boolean autoFixPegging; @Column(name="MAX_PRODUCT_BATCH") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java index 6e01250..e362742 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/MaterialSetTime.java @@ -2,6 +2,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.base.enumutil.ApsEnumUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; import lombok.Data; @@ -26,18 +27,22 @@ import javax.persistence.Table; public class MaterialSetTime extends BaseAPS { @Column(name="RES_CODE") @ApiParam(value ="资源编码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCode; @Column(name="PREV_MATERIAL") - @ApiParam(value ="前物料编码") + @ApiParam(value ="前物料") + @FieldAnnotation(notEmpty = true) private String prevMaterial; @Column(name="POST_MATERIAL") - @ApiParam(value ="后物料编码") + @ApiParam(value ="后物料") + @FieldAnnotation(notEmpty = true) private String postMaterial; @Column(name="TIME") @ApiParam(value ="设置时间") + @FieldAnnotation(notEmpty = true) private String time; @Column(name="PRIORITY") 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 2f7ac74..0b9c305 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,9 +29,14 @@ import java.util.List; @Table(name = "APS_OPER_INPUT") @Api("工序输入") public class OperInput extends BaseAPS { + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) + private Long operationId; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material") + @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; @Column(name="INPUT_COUNT") @@ -59,11 +64,6 @@ public class OperInput extends BaseAPS { @ApiParam(value ="最小时间间隔") private String minSpaceTime; - @Column(name="OPERATION_ID") - @ApiParam(value ="工序") - @FieldAnnotation(property = false) - private Long operationId; - 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 7e0d8e4..1b2ef55 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,9 +28,14 @@ import java.util.List; @Table(name = "APS_OPER_OUTPUT") @Api("工序输出") public class OperOutput extends BaseAPS { + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) + private Long operationId; + @Column(name="MATERIAL_ID") @ApiParam(value ="物料") - @FieldAnnotation(relation = "Material") + @FieldAnnotation(relation = "Material", notEmpty = true) private Long materialId; @Column(name="OUTPUT_COUNT") @@ -45,11 +50,6 @@ public class OperOutput extends BaseAPS { @ApiParam(value ="固定报废数") private Double fixScrapCount; - @Column(name="OPERATION_ID") - @ApiParam(value ="工序") - @FieldAnnotation(property = false) - private Long operationId; - 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 9fd050f..0568af5 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,10 +29,14 @@ import java.util.List; @Table(name = "APS_OPER_RESOURCE") @Api("工序资源") public class OperResource extends BaseAPS { + @Column(name="OPERATION_ID") + @ApiParam(value ="工序") + @FieldAnnotation(relation = "Operation", notEmpty = true, display = false) + private Long operationId; @Column(name="RESOURCE_ID") @ApiParam(value ="资源") - @FieldAnnotation(relation = "Resource") + @FieldAnnotation(relation = "Resource", notEmpty = true) private Long resourceId; @Column(name="USE_TYPE") @@ -46,6 +50,7 @@ public class OperResource extends BaseAPS { @Column(name="PRODUCE_TIME") @ApiParam(value ="生产时间") + @FieldAnnotation(notEmpty = true) private String produceTime; @Column(name="POST_TIME") @@ -72,11 +77,6 @@ public class OperResource extends BaseAPS { @ApiParam(value ="资源使用配套号") private String userMatchNumber; - @Column(name="OPERATION_ID") - @ApiParam(value ="工序") - @FieldAnnotation(property = false) - private Long operationId; - 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/Operation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java index 9400f9c..135ab21 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java @@ -29,17 +29,29 @@ import java.util.List; @Table(name = "APS_OPERATION") @Api("工序") public class Operation extends BaseAPS { - @Column(name="NUMBER") @ApiParam(value ="工序号") + @FieldAnnotation(notEmpty = true) private Integer number; + @Column(name="PRODUCT_ROUTING_ID") + @ApiParam(value ="工艺路线") + @FieldAnnotation(relation = "ProductRouting", notEmpty = true, display = false) + private Long productRoutingId; + + @Column(name="STAND_OPERATION_ID") + @ApiParam(value ="标准工序") + @FieldAnnotation(relation = "StandOperation", notEmpty = true) + private Long standOperationId; + @Column(name="PREV_COUNT_RATE") @ApiParam(value ="前工序数量比") + @FieldAnnotation(notEmpty = true, defaultValue = "1.0") private Double prevCountRate; @Column(name="YIELD") @ApiParam(value ="成品率") + @FieldAnnotation(notEmpty = true, defaultValue = "1.0") private Double yield; @Column(name="FIX_SCRAP_COUNT") @@ -71,16 +83,6 @@ public class Operation extends BaseAPS { @ApiParam(value ="最小时间间隔") private String minSpaceTime; - @Column(name="PRODUCT_ROUTING_ID") - @ApiParam(value ="工艺路线") - @FieldAnnotation(property = false) - private Long productRoutingId; - - @Column(name="STAND_OPERATION_ID") - @ApiParam(value ="标准工序") - @FieldAnnotation(property = false) - private Long standOperationId; - public ProductRouting getProductRouting() { return BeanRelation.get(this, EOperation.ProductRouting); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java index 7cdd7b5..b8b6869 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java @@ -29,6 +29,11 @@ import java.util.List; @Table(name = "APS_PRODUCT_ROUTING") @Api("物料") public class ProductRouting extends BaseCode { + @Column(name="MATERIAL_ID") + @ApiParam(value ="物料") + @FieldAnnotation(relation = "Material", notEmpty = true, display = false) + private Long materialId; + @Column(name="VALID_START") @ApiParam(value ="有效开始时间") private Date validStart; @@ -42,11 +47,6 @@ public class ProductRouting extends BaseCode { @FieldAnnotation(defaultValue = "10") private Integer priority; - @Column(name="MATERIAL_ID") - @ApiParam(value ="物料") - @FieldAnnotation(property = false) - private Long materialId; - public Material getMaterial() { return BeanRelation.get(this, EProductRouting.Material); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java index fdac512..e16db49 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ResCalendar.java @@ -31,7 +31,7 @@ import java.util.List; public class ResCalendar extends BaseAPS { @Column(name="RES_CODES") @ApiParam(value ="资源代码") - @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true) private String resCodes; @Column(name="WEEKS") @@ -45,6 +45,7 @@ public class ResCalendar extends BaseAPS { @Column(name="SHIFT_CODES") @ApiParam(value ="班次代码") + @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "DayShift", notEmpty = true) private String shiftCodes; @Column(name="PRIORITY") 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 5ae21a4..39657b0 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 @@ -41,7 +41,7 @@ public class Resource extends BaseCode { @Column(name="EFFICIENCY") @ApiParam(value ="生产效率") - @FieldAnnotation(defaultValue = "1.0") + @FieldAnnotation(defaultValue = "1.0", notEmpty = true) private Double efficiency; @Column(name="PREV_BUFFER") diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java index 72f0ae6..1aa5caa 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/RuleDetail.java @@ -38,12 +38,12 @@ public class RuleDetail extends BaseAPS { @Column(name="RULE_GROUP_ID") @ApiParam(value ="规则组合ID") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "RuleGroup", display = false) private Long ruleGroupId; @Column(name="RULE_ID") @ApiParam(value ="规则配置ID") - @FieldAnnotation(property = false) + @FieldAnnotation(relation = "Rule", display = false) private Long ruleId; public RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); } diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java index 6fc2187..6b83309 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ShippingTime.java @@ -26,35 +26,37 @@ import javax.persistence.Table; @Table(name = "APS_SHIPPING_TIME") @Api("运输时间") public class ShippingTime extends BaseAPS { - @Column(name="TIME") - @ApiParam(value ="运输时间") - private String time; - - @Column(name="PRIORITY") - @ApiParam(value ="优先级") - @FieldAnnotation(defaultValue = "10") - private Integer priority; @Column(name="PREV_RES_CODE") - @ApiParam(value ="前资源对象Id") - @FieldAnnotation(property = false) + @ApiParam(value ="前资源编码") + @FieldAnnotation(relation = "PrevRes") private Long prevResId; @Column(name="POST_RES_CODE") - @ApiParam(value ="后资源对象Id") - @FieldAnnotation(property = false) + @ApiParam(value ="后资源编码") + @FieldAnnotation(relation = "PostRes") private Long postResId; @Column(name="PREV_STAND_CODE") - @ApiParam(value ="前标准工序对象Id") - @FieldAnnotation(property = false) + @ApiParam(value ="前标准工序编码") + @FieldAnnotation(relation = "PrevStand") private Long prevStandId; @Column(name="POST_STAND_CODE") - @ApiParam(value ="后标准工序对象Id") - @FieldAnnotation(property = false) + @ApiParam(value ="后标准工序编码") + @FieldAnnotation(relation = "PostStand") private Long postStandId; + @Column(name="TIME") + @ApiParam(value ="运输时间") + @FieldAnnotation(notEmpty = true) + private String time; + + @Column(name="PRIORITY") + @ApiParam(value ="优先级") + @FieldAnnotation(defaultValue = "10") + private Integer priority; + public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); } public void setPrevRes(Resource res) { diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java index acea2ca..2a24fcb 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SysParam.java @@ -33,7 +33,7 @@ public class SysParam extends BaseAPS { @Column(name="MAX_INTERRUPT_COUNT") @ApiParam(value ="最大中断次数") @FieldAnnotation(defaultValue = "20") - private Integer maxInterruptCount; + private Integer maxInterruptCount = 20; @Column(name="TYPE") @ApiParam(value ="工艺路径有效判断类型") diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml index c51acb0..933946a 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ShippingTime.xml @@ -1,5 +1,5 @@ - + 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 11d5fe1..5528aeb 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 @@ -781,10 +781,10 @@ public class ApsEnumUtil { */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum CONSTRAINT_TYPE { - ES("ES", "前工作开始，后工作结束"), - SS("SS", "前工作开始，后工作开始"), - EE("EE", "前工作结束，后工作结束"), - SSEE("SSEE", "前后工作同时开始或同时结束"); + ES("ES", "前工序结束，后工序开始"), + SS("SS", "前工序开始，后工序开始"), + EE("EE", "前工序结束，后工序结束"), + SSEE("SSEE", "前后工序同时开始或同时结束"); private String value; private String description;