Merge branch 'dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into dev

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")

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)

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);
+    }
+
     /**
      * 移除关联
      *

modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml

@@ -2,7 +2,7 @@
 <Class name="WorkPlan">
     <Relation field="WorkResource" name="WorkResource" type="ONE_TO_ONE" owner="false">
     </Relation>
-    <Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="false">
+    <Relation field="AssPlans" name="WorkPlan" reverse="MainPlan" type="ONE_TO_MULTI" owner="true">
     </Relation>
     <Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
     </Relation>