有库存问题修复

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)

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")

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,
 }

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>