diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java index 1aedf34..9689a0b 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PlanFeedback.java +++ b/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); + } } 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 6370965..b2b1d06 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 @@ -252,8 +252,8 @@ public class Work extends BaseAPS { } @JsonBackReference - public PlanFeedback getPlanFeedback() { - return BeanRelation.get(this, EWork.PlanFeedback); + public List getPlanFeedback() { + return BeanRelation.list(this, EWork.PlanFeedback); } @JsonBackReference diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java index 62bba5c..f49516a 100644 --- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EPlanFeedback.java +++ b/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, } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml new file mode 100644 index 0000000..fc632b6 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/PlanFeedback.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index fe0de7a..23265ff 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml @@ -18,7 +18,7 @@ - +