四车间问题修复

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportDetail.java

@@ -116,6 +116,10 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="外部对象筛选")
     private String outterFilter;
 
+    @Column(name="UPDATE_SQL")
+    @ApiParam(value ="更新外部数据")
+    private String updateSQL;
+
     @FieldAnnotation(property = false)
     private transient ImportDataModel model;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportField.java

@@ -49,6 +49,10 @@ public class ImportField extends BaseAPS {
     @ApiParam(value = "是否必填", example = "0")
     private Integer isRequire;
 
+    @Column(name="IGNORE_NOT_VALID")
+    @ApiParam(value = "无效忽略", example = "0")
+    private Boolean ignoreNotValid;
+
     @Column(name="MAX_LENGTH")
     @ApiParam(value = "最大长度", example = "0")
     @FieldAnnotation(defaultValue = "255")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java

@@ -31,7 +31,7 @@ public class OrderFeedback extends BaseAPS {
 
     @Column(name="ORDER_ID")
     @ApiParam(value ="顶层订单号")
-    @FieldAnnotation(relation = "Order", modify = false)
+    @FieldAnnotation(mainkey = true, relation = "Order")
     private Long orderId;
 
     @Column(name="ORDER_COUNT")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java

@@ -1,9 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@@ -26,12 +29,13 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_PLAN_FEEDBACK")
 @Api("工作反馈")
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class PlanFeedback extends BaseAPS {
     private static final long serialVersionUID = 2520555825093741381L;
 
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work")
     private Long workId;
 
     @Column(name="STATUS")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java

@@ -136,6 +136,9 @@ public class WorkPlan extends BaseAPS {
     @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
     private Date resProduceEnd;
 
+    @ApiParam(value ="调整时间")
+    private Date adjustDate;
+
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {