From 4590133c27efe00fed76b2ed56ed38ed63d4609c Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 8 Apr 2021 18:04:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=88=90=E5=93=81=E6=A3=80?=
 =?UTF-8?q?=E9=AA=8C=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/estsh/i3plus/pojo/aps/bean/Material.java    | 13 +++++++++++++
 .../estsh/i3plus/pojo/aps/bean/OrderFeedback.java  | 22 ++++++++++++++++++----
 .../estsh/i3plus/pojo/aps/holders/EMaterial.java   |  3 ++-
 .../src/main/resources/relations/Material.xml      |  6 ++++--
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
index dcdd0ba..e00c22a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
+import cn.estsh.i3plus.pojo.aps.holders.EResource;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
@@ -157,6 +158,11 @@ public class Material extends BaseAPS {
     @ApiParam(value ="标签颜色")
     private String labelColor;
 
+    @Column(name="WORK_SHOP_ID")
+    @ApiParam(value ="车间代码")
+    @FieldAnnotation(relation = "WorkShop")
+    private Long workShopId;
+
     public Material getGroup() {
         return BeanRelation.get(this, EMaterial.Group);
     }
@@ -223,4 +229,11 @@ public class Material extends BaseAPS {
     public List<ProductOrder> getProductOrders() {
         return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders);
     }
+
+    public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); }
+
+    public void setWorkShop(WorkShop workShop) {
+        this.workShopId = workShop != null ? workShop.getId() : 0l;
+        BeanRelation.set(this, EMaterial.WorkShop, workShop);
+    }
 }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java
index 105a426..d5533c2 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OrderFeedback.java
@@ -30,13 +30,13 @@ public class OrderFeedback extends BaseAPS {
     private static final long serialVersionUID = 7822380202121225936L;
 
     @Column(name="ORDER_ID")
-    @ApiParam(value ="订单")
-    @FieldAnnotation(property = false)
+    @ApiParam(value ="顶层订单号")
+    @FieldAnnotation(relation = "Order", modify = false)
     private Long orderId;
 
     @Column(name="DELIVER_RATE")
     @ApiParam(value ="发货百分比")
-    private transient Double deliverRate;
+    private Double deliverRate;
 
     @Column(name="QUALIFIED_RATE")
     @ApiParam(value ="成品合格百分比")
@@ -46,14 +46,28 @@ public class OrderFeedback extends BaseAPS {
     @ApiParam(value ="库存扣减数量")
     private Double inventoryCount;
 
+    @Column(name="LAST_OPERATION_COUNT")
+    @ApiParam(value ="硫化报工数量")
+    private Double lastOperationCount;
+
     @Column(name="UNQUALIFIED_COUNT")
     @ApiParam(value ="不良数量")
     private Double unqualifiedCount;
 
     @Column(name="QUALIFIED_COUNT")
-    @ApiParam(value ="合格数量")
+    @ApiParam(value ="成品合格数量")
     private Double qualifiedCount;
 
+    @Column(name="ADD_UNQUALIFIED_COUNT")
+    @ApiParam(value ="累加不良数量")
+    @FieldAnnotation(display = false)
+    private Double addUnqualifiedCount;
+
+    @Column(name="ADD_QUALIFIED_COUNT")
+    @ApiParam(value ="累加合格数量")
+    @FieldAnnotation(display = false)
+    private Double addQualifiedCount;
+
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EOrderFeedback.Order);
     }
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java
index eaa363a..16f5f77 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java
@@ -9,5 +9,6 @@ public enum EMaterial {
     WorkInputs,
     WorkOutputs,
     WorkRelations,
-    Orders
+    Orders,
+    WorkShop
 }
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
index 33c5974..6ce3798 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="Material">
-<Relation field="ProductRoutings" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
-</Relation>
+    <Relation field="ProductRoutings" name="ProductRouting" reverse="Material" type="ONE_TO_MULTI" owner="true">
+    </Relation>
     <Relation field="Childs" name="Material" reverse="Group" type="ONE_TO_MULTI" owner="false">
     </Relation>
+    <Relation field="WorkShop" name="WorkShop" type="MULTI_TO_ONE" owner="false">
+    </Relation>
 </Class>
\ No newline at end of file