修复二车间硫化问题

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

@@ -62,11 +62,6 @@ public class Material extends BaseAPS {
     @FieldAnnotation(defaultValue = "ONEBYONE")
     private ApsEnumUtil.REPLENISHMENT_TYPE replType;
 
-    @Column(name="GROUP_ID")
-    @ApiParam(value ="物料组")
-    @FieldAnnotation(relation = "Material")
-    private Long groupId;
-
     @Column(name="PURCHASE_LEAD_TIME")
     @ApiParam(value ="采购提前期")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
@@ -140,11 +135,6 @@ public class Material extends BaseAPS {
     @FieldAnnotation(property = false)
     private Double maxStockCount;
 
-    @Column(name="ORDER_BATCH_PERIOD")
-    @ApiParam(value ="订单合并期间")
-    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
-    private String orderBatchPeriod;
-
     @Column(name="LABEL_NAME")
     @ApiParam(value ="标签名称")
     private String labelName;
@@ -158,18 +148,6 @@ public class Material extends BaseAPS {
     @FieldAnnotation(relation = "WorkShop")
     private Long workShopId;
 
-    public Material getGroup() {
-        return BeanRelation.get(this, EMaterial.Group);
-    }
-
-    public void setGroup(Material material) {
-        this.groupId = material != null ? material.getId() : 0l;
-        BeanRelation.set(this, EMaterial.Group, material);
-    }
-
-    @JsonBackReference
-    public List<Material> getChilds() { return BeanRelation.list(this, EMaterial.Childs); }
-
     @JsonBackReference
     public List<ProductRouting> getProductRoutings() {
         return BeanRelation.list(this, EMaterial.ProductRoutings);

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

@@ -18,7 +18,6 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -80,14 +79,6 @@ public class Resource extends BaseAPS {
     @ApiParam(value ="最大生产批量")
     private Double maxProduceBatch;
 
-    @Column(name="TIME_TAIL_ADJUST")
-    @ApiParam(value ="时间尾数圆整")
-    private String timeTailAdjust;
-
-    @Column(name="TIME_ADJUST")
-    @ApiParam(value ="时间圆整")
-    private String timeAdjust;
-
     @Column(name="MAX_PREV_SD_TIME")
     @ApiParam(value ="最大前设置中断时间")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
@@ -103,33 +94,16 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxPostSdTime;
 
-    @Column(name="ROUND_TYPE")
-    @ApiParam(value ="圆整类型")
-    @FieldAnnotation(defaultValue = "ROUNDING")
-    private ApsEnumUtil.TIME_ROUND_TYPE roundType;
-
     @Column(name="EFFICIENCY_EFFECT")
     @ApiParam(value ="效率影响类型")
     @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
     private Integer EfficiencyEffect;
 
-    @Column(name="TIME_ROUND")
-    @ApiParam(value ="时间圆整影响")
-    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
-    private Integer timeRound;
-
-    @Column(name="TIME_TAIL_ROUND")
-    @ApiParam(value ="时间尾数影响")
-    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
-    private Integer timeTailRound;
-
     @ApiParam(value ="是否存在任务冲突")
     @FieldAnnotation(property = false)
     @Transient
     private boolean hasConflict;
 
-    private transient Date rightLimit;
-
     public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {

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", "PrevFurnace.produceBegin"}, method = "calcPositive")
+        "PrevPlan.produceBegin", "PrevFurnace.produceBegin", "PrevAssPlan.produceBegin"}, method = "calcPositive")
     private Date produceBegin;
 
     @Column(name="PRODUCE_END")
     @ApiParam(value ="生产结束时间")
     @FieldAnnotation(modify = false)
     @RippleAnnotation(dependence = {"MainWork.PostRelations.PostWork.MainPlan.produceEnd",
-            "PostPlan.produceEnd", "PostFurnace.produceEnd"}, method = "calcReverse")
+            "PostPlan.produceEnd", "PostFurnace.produceEnd", "PostAssPlan.produceEnd"}, method = "calcReverse")
     private Date produceEnd;
 
     @Column(name="PRODUCE_TIME")

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EMaterial.java

@@ -8,8 +8,6 @@ package cn.estsh.i3plus.pojo.aps.holders;
  * @Modify:
  **/
 public enum EMaterial {
-    Group,
-    Childs,
     ProductRoutings,
     OperInputs,
     OperOutputs,

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWorkPlan.java

@@ -17,4 +17,6 @@ public enum EWorkPlan {
     PrevFurnace,
     PostFurnace,
     FurnacePlan,
+    PrevAssPlan,
+    PostAssPlan,
 }

modules/i3plus-pojo-aps/src/main/resources/relations/Material.xml

@@ -2,8 +2,6 @@
 <Class name="Material">
     <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>

modules/i3plus-pojo-aps/src/main/resources/relations/WorkPlan.xml

@@ -6,4 +6,6 @@
     </Relation>
     <Relation field="PrevFurnace" name="WorkPlan" reverse="PostFurnace" type="MULTI_TO_MULTI" owner="false">
     </Relation>
+    <Relation field="PrevAssPlan" name="WorkPlan" reverse="PostAssPlan" type="MULTI_TO_MULTI" owner="false">
+    </Relation>
 </Class>