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 @@
+
+
\ No newline at end of file