From b0d2a7b71053e98860d2951414bb31c059410824 Mon Sep 17 00:00:00 2001
From: Jason <jason.niu@estsh.com>
Date: Thu, 1 Jul 2021 15:30:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E5=BA=93=E5=AD=98=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java    | 5 -----
 .../src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java        | 4 ++--
 .../src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java    | 2 ++
 modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml    | 2 ++
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
index 46f2e1f..2b079df 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@@ -83,11 +83,6 @@ public class ProductOrder extends BaseOrder {
     @FieldAnnotation(modify = false)
     private String calcLeadTime;
 
-//    @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
-//    @ApiParam(value ="多余量")
-//    @FieldAnnotation(modify = false)
-//    private Double excessCount;
-
     @Column(name="LACK_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="缺少量")
     @FieldAnnotation(modify = false)
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
index fa58935..2b8979f 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkPlan.java
@@ -72,14 +72,14 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="生产开始时间")
     @FieldAnnotation(modify = false)
     @RippleAnnotation(dependence = {"MainWork.PrevRelations.PrevWork.MainPlan.produceBegin",
-        "PrevPlan.produceBegin"}, method = "calcPositive")
+        "PrevPlan.produceBegin", "PrevFurnace.produceBegin"}, method = "calcPositive")
     private Date produceBegin;
 
     @Column(name="PRODUCE_END")
     @ApiParam(value ="生产结束时间")
     @FieldAnnotation(modify = false)
     @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd",
-            "PostPlan.produceEnd"}, method = "calcReverse")
+            "PostPlan.produceEnd", "PostFurnace.produceEnd"}, method = "calcReverse")
     private Date produceEnd;
 
     @Column(name="PRODUCE_TIME")
diff --git a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
index 025e156..cec9e5a 100644
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java
@@ -7,5 +7,7 @@ public enum EWorkPlan {
     WorkResource,
     PrevPlan,
     PostPlan,
+    PrevFurnace,
+    PostFurnace,
     FurnacePlan,
 }
diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml
index 49eb584..47d45a9 100644
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml
@@ -4,4 +4,6 @@
     </Relation>
     <Relation field="PrevPlan" name="WorkPlan" reverse="PostPlan" type="MULTI_TO_MULTI" owner="false">
     </Relation>
+    <Relation field="PrevFurnace" name="WorkPlan" reverse="PostFurnace" type="MULTI_TO_MULTI" owner="false">
+    </Relation>
 </Class>
\ No newline at end of file