订单合并功能开发，临时提交

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

@@ -38,10 +38,19 @@ public class PlanFeedback extends BaseAPS {
     @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work")
     private Long workId;
 
+    @Column(name="TOP_ORDER_ID")
+    @ApiParam(value ="顶层订单")
+    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order")
+    private Long topOrderId;
+
     @Column(name="STATUS")
     @ApiParam(value ="状态")
     private ApsEnumUtil.FEED_BACK_STATUS status;
 
+    @Column(name="PLAN_COUNT")
+    @ApiParam(value ="计划完成数量")
+    private Double planCount;
+
     @Column(name="ACTUAL_COUNT")
     @ApiParam(value ="实际完成数量")
     private Double actualCount;
@@ -58,4 +67,11 @@ public class PlanFeedback extends BaseAPS {
         this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EPlanFeedback.Work, work);
     }
+
+    public BaseOrder getTopOrder() { return BeanRelation.get(this, EPlanFeedback.TopOrder); }
+
+    public void setTopOrder(BaseOrder topOrder) {
+        this.topOrderId = topOrder != null ? topOrder.getId() : 0L;
+        BeanRelation.set(this, EPlanFeedback.TopOrder, topOrder);
+    }
 }

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

@@ -252,8 +252,8 @@ public class Work extends BaseAPS {
     }
 
     @JsonBackReference
-    public PlanFeedback getPlanFeedback() {
+    public List<PlanFeedback> getPlanFeedback() {
-        return BeanRelation.get(this, EWork.PlanFeedback);
+        return BeanRelation.list(this, EWork.PlanFeedback);
     }
 
     @JsonBackReference

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java

@@ -8,5 +8,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
  * @Modify:
  **/
 public enum EPlanFeedback {
-    Work
+    Work,
+    TopOrder,
 }

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

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="PlanFeedback">
+    <Relation field="TopOrder" name="BaseOrder" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+</Class>

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

@@ -18,7 +18,7 @@
     </Relation>
     <Relation field="WorkPlans" name="WorkPlan" reverse="Work" type="ONE_TO_MULTI" owner="true">
     </Relation>
-    <Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_ONE" owner="true">
+    <Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
     </Relation>
     <Relation field="SpecifyResource" name="Resource" type="MULTI_TO_ONE">
     </Relation>