diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java index 067f76a..3935866 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/DataLink.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,14 +27,17 @@ import javax.persistence.Table; public class DataLink extends BaseAPS { @Column(name="CODE") @ApiParam(value ="编码") + @FieldAnnotation(notEmpty = true) private String code; @Column(name="TYPE") @ApiParam(value ="链接类型") + @FieldAnnotation(defaultValue = "CSV") private ApsEnumUtil.DATA_LINK_TYPE type; @Column(name="PATH") @ApiParam(value ="IP/文件路径") + @FieldAnnotation(notEmpty = true) private String path; @Column(name="PORT") 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 77f0691..5eee173 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 @@ -135,6 +135,10 @@ public class Work extends BaseAPS { @FieldAnnotation(modify = false) private String failedReason; + @Column(name="REMARK") + @ApiParam(value ="备注") + private String remark; + @Column(name="OPERATION_ID") @ApiParam(value ="工序") @FieldAnnotation(property = false) diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java index f35fbed..a6aa5e5 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java @@ -312,6 +312,10 @@ public class BeanRelation { } } + public static void setOne(BaseBean bean, Enum holder, BaseBean relaBean) { + get(bean).get(holder).add(relaBean); + } + /** * 移除关联 * diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml index c47bdad..1adb280 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml @@ -2,7 +2,7 @@ - +