二车间模具选择资源逻辑优化

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

@@ -34,30 +34,30 @@ import javax.persistence.Table;
 public class PlanFeedback extends BaseAPS {
     private static final long serialVersionUID = 2520555825093741381L;
 
-    @Column(name="WORK_ID")
-    @ApiParam(value ="工作")
+    @Column(name = "WORK_ID")
+    @ApiParam(value = "工作")
     @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work")
     private Long workId;
 
-    @Column(name="TOP_ORDER_ID")
-    @ApiParam(value ="顶层订单")
-    @FieldAnnotation(popSearch = true, relation = "Order")
+    @Column(name = "TOP_ORDER_ID")
+    @ApiParam(value = "顶层订单")
+    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order")
     private Long topOrderId;
 
-    @Column(name="STATUS")
-    @ApiParam(value ="状态")
+    @Column(name = "STATUS")
+    @ApiParam(value = "状态")
     private ApsEnumUtil.FEED_BACK_STATUS status;
 
-    @Column(name="PLAN_COUNT")
-    @ApiParam(value ="计划完成数量")
+    @Column(name = "PLAN_COUNT")
+    @ApiParam(value = "计划完成数量")
     private Double planCount;
 
-    @Column(name="ACTUAL_COUNT")
-    @ApiParam(value ="实际完成数量")
+    @Column(name = "ACTUAL_COUNT")
+    @ApiParam(value = "实际完成数量")
     private Double actualCount;
 
-    @Column(name="REMARK")
-    @ApiParam(value ="备注")
+    @Column(name = "REMARK")
+    @ApiParam(value = "备注")
     private String remark;
 
     @JsonIgnore
@@ -71,7 +71,9 @@ public class PlanFeedback extends BaseAPS {
     }
 
     @JsonIgnore
-    public BaseOrder getTopOrder() { return BeanRelation.get(this, EPlanFeedback.TopOrder); }
+    public BaseOrder getTopOrder() {
+        return BeanRelation.get(this, EPlanFeedback.TopOrder);
+    }
 
     public void setTopOrder(BaseOrder topOrder) {
         this.topOrderId = topOrder != null ? topOrder.getId() : 0L;