Merge branch 'ext-dev' of http://git.estsh.com/i3-IMPP/i3plus-pojo into Mytest

modules/i3plus-pojo-andon/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -52,4 +52,4 @@
         <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
-</project>
+</project>

modules/i3plus-pojo-aps/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-pojo</artifactId>
         <groupId>i3plus.pojo</groupId>
-        <version>1.0-TEST-SNAPSHOT</version>
+        <version>1.0.0.1</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -56,4 +56,4 @@
         <finalName>${project.artifactId}-${project.version}</finalName>
     </build>
 
-</project>
+</project>

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/annotation/ClassLevelAnnotation.java

@@ -0,0 +1,11 @@
+package cn.estsh.i3plus.pojo.aps.annotation;
+
+/**
+ * @author Jason
+ * @ClassName: ClassLevelAnnotation
+ * @Description: TODO(这里用一句话描述这个类的作用)
+ * @date 2022-01-22
+ */
+public @interface ClassLevelAnnotation {
+    int level();
+}

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

@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @Api("副资源设置时间")
 public class AssistResourceSetTime extends BaseAPS {
     private static final long serialVersionUID = 901172392855536686L;
+
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -36,6 +37,7 @@ import java.util.List;
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class BaseOrder extends BaseAPS {
     private static final long serialVersionUID = -2571085172798608026L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -109,19 +111,23 @@ public class BaseOrder extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer delayTime;
 
-    private transient Date lastBegin;
+    @Column(name="CHECK_FINISH")
+    @ApiParam(value ="检验完成")
+    @FieldAnnotation(property = false)
+    private Boolean checkFinish;
 
     @JsonBackReference
     public List<Work> getWorks() {
         return BeanRelation.list(this, EBaseOrder.Works);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EBaseOrder.Material);
     }
 
     public void setMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.materialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EBaseOrder.Material, material);
     }
 
@@ -135,6 +141,7 @@ public class BaseOrder extends BaseAPS {
         return BeanRelation.list(this, EBaseOrder.PostRelations);
     }
 
+    @JsonIgnore
     public PriorityType getPriority() { return BeanRelation.get(this, EBaseOrder.Priority); }
 
     public void setPriority(PriorityType priority) {

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

@@ -25,8 +25,13 @@ import javax.persistence.MappedSuperclass;
 @ExcludeImportExport
 public class BaseRule extends BaseAPS {
     private static final long serialVersionUID = -1818853814377611968L;
+
     @Column(name="CODE")
     @ApiParam(value ="规则编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
     private String code;
+
+    @Column(name="REMARK")
+    @ApiParam(value ="备注")
+    private String remark;
 }

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

@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -23,11 +24,9 @@ import javax.persistence.Table;
 @Api("取消计划规则")
 public class CancelPlanRule extends BaseRule {
     private static final long serialVersionUID = 2674055522875545446L;
+
+    @Lob
     @Column(name="WORK_FILTERS")
     @ApiParam(value ="工作筛选")
     private String workFilters;
-
-    @Column(name="RECORD_RIGHT_EDGE")
-    @ApiParam(value ="记录工作右边界")
-    private Boolean recordRightEdge;
 }

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

@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @Api("数据集成数据连接信息")
 public class DataLink extends BaseAPS {
     private static final long serialVersionUID = 8324774871058505466L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(notEmpty = true)

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

@@ -32,6 +32,7 @@ import javax.persistence.Table;
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class DayShift extends BaseAPS {
     private static final long serialVersionUID = 7964370027924366093L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)

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

@@ -0,0 +1,35 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @Description :删除订单历史表
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2022-07-13 11:03
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_DELETE_ORDER_HISTORY")
+@Api("删除订单历史表")
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+public class DeleteOrderHistory extends BaseBean {
+    @Column(name="TOP_ORDER")
+    @ApiParam(value ="顶层订单号")
+    private String topOrder;
+}

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

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -26,6 +27,8 @@ import javax.persistence.Table;
 @Api("动态设置时间")
 public class DynamicSetTime extends BaseAPS {
     private static final long serialVersionUID = -1696499471488104793L;
+
+    @Lob
     @Column(name="RES_CODE")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EExportDetail;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -11,6 +12,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -26,8 +28,8 @@ import javax.persistence.Table;
 @Table(name = "APS_EXPORT_DETAIL")
 @Api("数据导出明细")
 public class ExportDetail extends BaseAPS {
-
     private static final long serialVersionUID = -8898414164032180539L;
+
     @Column(name="OUT_NAME")
     @ApiParam(value ="外部表名")
     private String outName;
@@ -36,10 +38,12 @@ public class ExportDetail extends BaseAPS {
     @ApiParam(value ="内部表名")
     private String inName;
 
+    @Lob
     @Column(name="FILTER")
     @ApiParam(value ="筛选")
     private String filter;
 
+    @Lob
     @Column(name="SORT_BY")
     @ApiParam(value ="排序")
     private String sortBy;
@@ -54,12 +58,13 @@ public class ExportDetail extends BaseAPS {
     @FieldAnnotation(relation = "Project")
     private Long projectId;
 
+    @JsonIgnore
     public ExportProject getProject() {
         return BeanRelation.get(this, EExportDetail.Project);
     }
 
     public void setProject(ExportProject project) {
-        this.projectId = project != null ? project.getId() : 0l;
+        this.projectId = project != null ? project.getId() : 0L;
         BeanRelation.set(this, EExportDetail.Project, project);
     }
 }

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

@@ -30,6 +30,7 @@ import java.util.List;
 @Api("数据导出明细集合")
 public class ExportProject extends BaseAPS {
     private static final long serialVersionUID = -7281303629295174330L;
+
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;
@@ -45,12 +46,13 @@ public class ExportProject extends BaseAPS {
     @ApiParam(value ="当前执行的明细名称")
     private transient String curDetailName;
 
+    @JsonIgnore
     public DataLink getLink() {
         return BeanRelation.get(this, EExportProject.Link);
     }
 
     public void setLink(DataLink link) {
-        this.linkId = link != null ? link.getId() : 0l;
+        this.linkId = link != null ? link.getId() : 0L;
         BeanRelation.set(this, EExportProject.Link, link);
     }
 

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

@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -24,6 +25,7 @@ import javax.persistence.Table;
 @Api("表达式记录")
 public class ExpressionRecord extends BaseAPS {
     private static final long serialVersionUID = 4038954046132896632L;
+
     @Column(name="BEAN_NAME")
     @ApiParam(value ="表名")
     private String beanName;
@@ -36,6 +38,7 @@ public class ExpressionRecord extends BaseAPS {
     @ApiParam(value ="名称")
     private String name;
 
+    @Lob
     @Column(name="EXPRESSION")
     @ApiParam(value ="表达式")
     private String expression;

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

@@ -13,10 +13,7 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.annotations.DynamicInsert;
 import org.hibernate.annotations.DynamicUpdate;
 
-import javax.persistence.Column;
+import javax.persistence.*;
-import javax.persistence.Entity;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.lang.reflect.Method;
 import java.sql.JDBCType;
 
@@ -37,6 +34,7 @@ import java.sql.JDBCType;
 @ExcludeImportExport
 public class FieldInfo extends BaseAPS {
     private static final long serialVersionUID = -6195036426929675850L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -87,6 +85,7 @@ public class FieldInfo extends BaseAPS {
     @ApiParam(value ="字段提示")
     private String tips;
 
+    @Lob
     @Column(name="EXPRESSION")
     @ApiParam(value ="表达式")
     private String expression;

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

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Api("属性赋值规则")
 public class FieldSetRule extends BaseRule {
     private static final long serialVersionUID = 6880145972942618559L;
+
     @Column(name="BEAN")
     @ApiParam(value ="实体名")
     private String bean;

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

@@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import javax.validation.constraints.Min;
 
@@ -30,8 +31,9 @@ import javax.validation.constraints.Min;
 @Table(name="APS_FURNACE_CAPACITY")
 @Api("炉容量")
 public class FurnaceCapacity extends BaseAPS {
-
     private static final long serialVersionUID = -5657804042629460659L;
+
+    @Lob
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

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

@@ -1,9 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EFurnacePlan;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,9 +32,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="APS_FURNACE_PLAN")
 @Api("炉资源计划")
+@ClassLevelAnnotation(level = 1)
 public class FurnacePlan extends BaseAPS {
-
     private static final long serialVersionUID = 6816465736285211114L;
+
     @Column(name="CAPACITY", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="已占用的能力")
     private Double capacity;
@@ -41,14 +44,33 @@ public class FurnacePlan extends BaseAPS {
     @ApiParam(value ="容量限制")
     private Double capacityLimit;
 
-    @Column(name="MIN_PRODUCT_BATCH")
+    @Column(name="REMAIN_CAPACITY")
-    @ApiParam(value ="最小加工批量")
+    @ApiParam(value ="剩余可组炉容量")
-    private Integer minProductBatch;
+    private Double remainCapacity;
 
     @Column(name="FIX_PLAN")
     @ApiParam(value ="固定组炉的计划")
     private Boolean fixPlan;
 
+    @Column(name="MERGE_PLAN_ID")
+    @ApiParam(value ="合并炉计划")
+    private Long mergePlanId;
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
+
+    @JsonIgnore
+    public FurnacePlan getMergePlan() {
+        return BeanRelation.get(this, EFurnacePlan.MergePlan);
+    }
+
+    public void setMergePlan(FurnacePlan plan) {
+        this.mergePlanId = plan != null ? plan.getId() : 0L;
+        BeanRelation.set(this, EFurnacePlan.MergePlan, plan);
+    }
+
+    @JsonBackReference
+    public FurnacePlan getOriginMergePlan() {
+        return BeanRelation.get(this, EFurnacePlan.OriginMergePlan);
+    }
 }

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

@@ -29,8 +29,8 @@ import javax.persistence.Table;
 @Table(name="APS_FURNACE_SETTING")
 @Api("组炉设置")
 public class FurnaceSetting extends BaseAPS {
-
     private static final long serialVersionUID = -4566911526487268870L;
+
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

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

@@ -1,63 +0,0 @@
-package cn.estsh.i3plus.pojo.aps.bean;
-
-import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
-import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiParam;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Lob;
-import javax.persistence.Table;
-
-/**
- * @Description : 排程优化规则
- * @Reference :
- * @Author : jason.niu
- * @CreateDate : 2021-03-24
- * @Modify:
- **/
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Table(name = "APS_HEURISTIC_OPTIMIZE")
-@Api("排程优化规则")
-public class HeuristicOptimize extends BaseRule {
-    private static final long serialVersionUID = -464821596740369199L;
-
-    @Column(name="WORK_FILTER")
-    @ApiParam(value ="工作筛选")
-    private String workFilter;
-
-    @Lob
-    @Column(name="WORK_SORT")
-    @ApiParam(value ="工作排序")
-    private String workSort;
-
-    @Column(name="RES_FILTER")
-    @ApiParam(value ="资源筛选")
-    private String resFilter;
-
-    @Lob
-    @Column(name="RES_SELECT")
-    @ApiParam(value ="资源选择")
-    private String resSelect;
-
-    @Column(name="WAITING_TIME")
-    @ApiParam(value ="最大等待时间")
-    private String waitingTime;
-
-    @Column(name="OPTIMIZE_INTERVAL")
-    @ApiParam(value ="优化间隔")
-    private String optimizeInterval;
-
-    @Column(name="MAX_WAITING_LIMIT")
-    @ApiParam(value ="最大等待时间限制")
-    private Boolean maxWaitingLimit;
-
-    @Column(name="MAX_WAITING_ADJUST")
-    @ApiParam(value ="最大等待时间调整")
-    private Boolean maxWaitingAdjust;
-}

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

@@ -26,13 +26,14 @@ import javax.persistence.Table;
 @Api("排程运算规则")
 public class HeuristicRule extends BaseRule {
     private static final long serialVersionUID = -4856714428377308150L;
+
     @Column(name="WORK_FILTER")
     @ApiParam(value ="工作筛选")
     private String workFilter;
 
-    @Column(name="RES_FILTER")
+//    @Column(name="RES_FILTER")
-    @ApiParam(value ="资源筛选")
+//    @ApiParam(value ="资源筛选")
-    private String resFilter;
+//    private String resFilter;
 
     @Lob
     @Column(name="WORK_SORT")

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

@@ -10,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,7 +36,6 @@ import java.util.List;
 @Api("数据导入明细")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class ImportDetail extends BaseAPS {
-
     private static final long serialVersionUID = 1264030397500660450L;
 
     @Column(name="NAME")
@@ -117,15 +117,20 @@ public class ImportDetail extends BaseAPS {
     @ApiParam(value ="外部对象筛选")
     private String outterFilter;
 
+    @Column(name="UPDATE_SQL")
+    @ApiParam(value ="更新外部数据")
+    private String updateSQL;
+
     @FieldAnnotation(property = false)
     private transient ImportDataModel model;
 
+    @JsonIgnore
     public ImportProject getProject() {
         return BeanRelation.get(this, EImportDetail.Project);
     }
 
     public void setProject(ImportProject project) {
-        this.projectId = project != null ? project.getId() : 0l;
+        this.projectId = project != null ? project.getId() : 0L;
         BeanRelation.set(this, EImportDetail.Project, project);
     }
 

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EImportDetail;
 import cn.estsh.i3plus.pojo.aps.holders.EImportField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,8 +29,8 @@ import javax.persistence.Transient;
 @Table(name = "APS_IMPORT_FIELD")
 @Api("数据导入字段配置")
 public class ImportField extends BaseAPS {
-
     private static final long serialVersionUID = 8848879008582197564L;
+
     @Column(name="FIELD_NAME")
     @ApiParam("字段名")
     private String fieldName;
@@ -49,11 +50,19 @@ public class ImportField extends BaseAPS {
     @ApiParam(value = "是否必填", example = "0")
     private Integer isRequire;
 
+    @Column(name="IGNORE_NOT_VALID")
+    @ApiParam(value = "无效忽略", example = "0")
+    private Boolean ignoreNotValid;
+
     @Column(name="MAX_LENGTH")
     @ApiParam(value = "最大长度", example = "0")
     @FieldAnnotation(defaultValue = "255")
     private Integer maxLength;
 
+    @Column(name="ADD_VALUE")
+    @ApiParam(value = "累加数值", example = "0")
+    private Boolean addValue;
+
     @Column(name="VALIDATOR")
     @ApiParam("校验表达式")
     private String validator;
@@ -75,12 +84,13 @@ public class ImportField extends BaseAPS {
     @FieldAnnotation(relation = "ImportDetail", notEmpty = true)
     private Long importDetailId;
 
+    @JsonIgnore
     public ImportDetail getImportDetail() {
         return BeanRelation.get(this, EImportField.ImportDetail);
     }
 
     public void setImportDetail(ImportDetail detail) {
-        this.importDetailId = detail != null ? detail.getId() : 0l;
+        this.importDetailId = detail != null ? detail.getId() : 0L;
         BeanRelation.set(this, EImportField.ImportDetail, detail);
     }
 }

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EImportProject;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,6 +30,7 @@ import java.util.List;
 @Api("数据导入明细集合")
 public class ImportProject extends BaseAPS {
     private static final long serialVersionUID = -1899074765155621438L;
+
     @Column(name="NAME")
     @ApiParam(value ="标识名")
     private String name;
@@ -44,12 +46,13 @@ public class ImportProject extends BaseAPS {
     @ApiParam(value ="当前执行的明细名称")
     private transient String curDetailName;
 
+    @JsonIgnore
     public DataLink getLink() {
         return BeanRelation.get(this, EImportProject.Link);
     }
 
     public void setLink(DataLink link) {
-        this.linkId = link != null ? link.getId() : 0l;
+        this.linkId = link != null ? link.getId() : 0L;
         BeanRelation.set(this, EImportProject.Link, link);
     }
 

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -27,6 +28,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_INSERTED_ORDER")
 @Api("插单管理")
+@ClassLevelAnnotation(level = 3)
 public class InsertedOrder extends BaseOrder  {
     private static final long serialVersionUID = -5036380772996107234L;
 
@@ -46,22 +48,30 @@ public class InsertedOrder extends BaseOrder  {
 
     @Column(name="FINISH_COUNT")
     @ApiParam(value ="完工数")
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double finishCount;
 
     @Column(name="QUALIFIED_COUNT")
     @ApiParam(value ="检验合格数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double qualifiedCount;
 
     @Column(name="REMARK")
     @ApiParam(value ="备注")
     private String remark;
 
+    @Column(name="FORCE_COUNT")
+    @ApiParam(value ="强制完成数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
+    private Double forceCount;
+
+    @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EInsertedOrder.ProductRouting);
     }
 
     public void setProductRouting(ProductRouting routing) {
-        this.productRoutingId = routing != null ? routing.getId() : 0l;
+        this.productRoutingId = routing != null ? routing.getId() : 0L;
         BeanRelation.set(this, EInsertedOrder.ProductRouting, routing);
     }
 

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EInterMediateDetail;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -41,10 +42,11 @@ public class InterMediateDetail extends BaseAPS {
     @ApiParam(value ="评估值")
     private Double evaluateValue;
 
+    @JsonIgnore
     public InterMediateResult getResult() { return BeanRelation.get(this, EInterMediateDetail.Result); }
 
     public void setResult(InterMediateResult result) {
-        this.resultId = result != null ? result.getId() : 0;
+        this.resultId = result != null ? result.getId() : 0L;
         BeanRelation.set(this, EInterMediateDetail.Result, result);
     }
 }

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

@@ -7,6 +7,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EInterMediateResult;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -46,19 +47,21 @@ public class InterMediateResult extends BaseAPS {
     @ApiParam(value ="评估值")
     private Double evaluateValue;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EInterMediateResult.Work);
     }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EInterMediateResult.Work, work);
     }
 
+    @JsonIgnore
     public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); }
 
     public void setResource(Resource resource) {
-        this.resourceId = resource != null ? resource.getId() : 0l;
+        this.resourceId = resource != null ? resource.getId() : 0L;
         BeanRelation.set(this, EInterMediateResult.Resource, resource);
     }
 

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -30,6 +31,7 @@ import java.util.List;
 @Entity
 @Table(name = "APS_INVENTORY")
 @Api("库存")
+@ClassLevelAnnotation(level = 3)
 public class Inventory extends BaseOrder {
     private static final long serialVersionUID = 2378846162007550439L;
 
@@ -46,11 +48,6 @@ public class Inventory extends BaseOrder {
     @FieldAnnotation(modify = false)
     private Double assignCount;
 
-//    @Column(name="EXCESS_COUNT", columnDefinition = "decimal(18,8)")
-//    @ApiParam(value ="多余量")
-//    @FieldAnnotation(modify = false)
-//    private Double excessCount;
-
     @Column(name="SINGLE_SUPPLY_COUNT", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="单次补充数量")
     private Double singleSupplyCount;

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

@@ -25,6 +25,7 @@ import javax.persistence.Table;
 @Api("物料运算规则")
 public class MatCalcRule extends BaseRule {
     private static final long serialVersionUID = 2102986260688118982L;
+
     @Column(name="MATERIAL_FILTER")
     @ApiParam(value ="物料筛选")
     private String materialFilter;
@@ -67,10 +68,4 @@ public class MatCalcRule extends BaseRule {
     @Column(name="BATCH_SUPPLY")
     @ApiParam(value ="批量补充")
     private Boolean batchSupply;
-
-    @Column(name="ASSIGN_LIMIT")
-    @ApiParam(value ="物料分配制约")
-    @FieldAnnotation(multiEnumClass = ApsEnumUtil.MATERIAL_ASSIGN_LIMIT.class)
-    private Integer assignLimit;
-
 }

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

@@ -1,17 +1,17 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
 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;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,8 +35,10 @@ import java.util.List;
 @Table(name = "APS_MATERIAL")
 @Api("物料")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+@ClassLevelAnnotation(level = 1)
 public class Material extends BaseAPS {
     private static final long serialVersionUID = -7928225487946173108L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -62,11 +64,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)
@@ -100,11 +97,6 @@ public class Material extends BaseAPS {
     @FieldAnnotation(modify = false)
     private Integer level;
 
-    @Column(name="IS_AUTO_FIX_PEGGING")
-    @ApiParam(value ="自动补充标识")
-    @FieldAnnotation(defaultValue = "1")
-    private Boolean autoFixPegging;
-
     @Column(name="MAX_PRODUCT_BATCH", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="最大生产批量")
     private Double maxProductBatch;
@@ -145,11 +137,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;
@@ -163,17 +150,9 @@ public class Material extends BaseAPS {
     @FieldAnnotation(relation = "WorkShop")
     private Long workShopId;
 
-    public Material getGroup() {
+    @Column(name="BATCH_DAYS")
-        return BeanRelation.get(this, EMaterial.Group);
+    @ApiParam(value ="合并天数")
-    }
+    private Integer batchDays;
-
-    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() {
@@ -230,10 +209,11 @@ public class Material extends BaseAPS {
         return BeanRelation.listByClass(this, ProductOrder.class, EMaterial.Orders);
     }
 
+    @JsonIgnore
     public WorkShop getWorkShop() { return BeanRelation.get(this, EMaterial.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {
-        this.workShopId = workShop != null ? workShop.getId() : 0l;
+        this.workShopId = workShop != null ? workShop.getId() : 0;
         BeanRelation.set(this, EMaterial.WorkShop, workShop);
     }
 }

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
 import cn.estsh.i3plus.pojo.aps.holders.EMaterialDeliveryPromise;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,6 +30,7 @@ import java.util.Date;
 @Api("物料交期承诺")
 public class MaterialDeliveryPromise extends BaseBean {
     private static final long serialVersionUID = 831759543772896829L;
+
     @Column(name="QTY")
     @ApiParam(value ="到货数量")
     private Double count;
@@ -42,12 +44,13 @@ public class MaterialDeliveryPromise extends BaseBean {
     @FieldAnnotation(relation = "Material", notEmpty = true)
     private Long materialId;
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
     }
 
     public void setMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.materialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EMaterialDeliveryPromise.Material, material);
     }
 }

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

@@ -26,6 +26,7 @@ import javax.persistence.Table;
 @Api("物料设置时间")
 public class MaterialSetTime extends BaseAPS {
     private static final long serialVersionUID = -7996431489447641539L;
+
     @Column(name="RES_CODE")
     @ApiParam(value ="资源编码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true, mainkey = true)
@@ -45,9 +46,4 @@ public class MaterialSetTime extends BaseAPS {
     @ApiParam(value ="设置时间")
     @FieldAnnotation(notEmpty = true)
     private String time;
-
-//    @Column(name="PRIORITY")
-//    @ApiParam(value ="优先级")
-//    @FieldAnnotation(defaultValue = "10", mainkey = true)
-//    private Integer priority;
 }

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EOperInput;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,8 +30,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_OPER_INPUT")
 @Api("工序输入")
+@ClassLevelAnnotation(level = 4)
 public class OperInput extends BaseAPS {
     private static final long serialVersionUID = 6653235155693766804L;
+
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
@@ -70,21 +74,23 @@ public class OperInput extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EOperInput.Operation);
     }
 
     public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
+        this.operationId = oper != null ? oper.getId() : 0L;
         BeanRelation.set(this, EOperInput.Operation, oper);
     }
 
+    @JsonIgnore
     public Material getInputMaterial() {
         return BeanRelation.get(this, EOperInput.InputMaterial);
     }
 
     public void setInputMaterial(Material material) {
-        this.inputMaterialId = material != null ? material.getId() : 0l;
+        this.inputMaterialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EOperInput.InputMaterial, material);
     }
 

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

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EOperOutput;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,8 +29,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_OPER_OUTPUT")
 @Api("工序输出")
+@ClassLevelAnnotation(level = 4)
 public class OperOutput extends BaseAPS {
     private static final long serialVersionUID = 3185682762290147209L;
+
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
@@ -54,21 +58,23 @@ public class OperOutput extends BaseAPS {
     @FieldAnnotation(defaultValue = "0.0")
     private Double fixScrapCount;
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EOperOutput.Operation);
     }
 
     public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
+        this.operationId = oper != null ? oper.getId() : 0L;
         BeanRelation.set(this, EOperOutput.Operation, oper);
     }
 
+    @JsonIgnore
     public Material getOutputMaterial() {
         return BeanRelation.get(this, EOperOutput.OutputMaterial);
     }
 
     public void setOutputMaterial(Material material) {
-        this.outputMaterialId = material != null ? material.getId() : 0l;
+        this.outputMaterialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EOperOutput.OutputMaterial, material);
     }
 

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EOperResource;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,8 +30,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_OPER_RESOURCE")
 @Api("工序资源")
+@ClassLevelAnnotation(level = 4)
 public class OperResource extends BaseAPS {
     private static final long serialVersionUID = -8683889582369342606L;
+
     @Column(name="OPERATION_ID")
     @ApiParam(value ="工序")
     @FieldAnnotation(relation = "Operation", notEmpty = true, display = false)
@@ -83,21 +87,23 @@ public class OperResource extends BaseAPS {
     @ApiParam(value ="资源使用配套号")
     private String userMatchNumber;
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EOperResource.Operation);
     }
 
     public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
+        this.operationId = oper != null ? oper.getId() : 0L;
         BeanRelation.set(this, EOperResource.Operation, oper);
     }
 
+    @JsonIgnore
     public Resource getResource() {
         return BeanRelation.get(this, EOperResource.Resource);
     }
 
     public void setResource(Resource res) {
-        this.resourceId = res != null ? res.getId() : 0l;
+        this.resourceId = res != null ? res.getId() : 0L;
         BeanRelation.set(this, EOperResource.Resource, res);
     }
 

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EOperation;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,8 +30,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_OPERATION")
 @Api("工序")
+@ClassLevelAnnotation(level = 3)
 public class Operation extends BaseAPS {
     private static final long serialVersionUID = 4394179144091116858L;
+
     @Column(name="NUMBER")
     @ApiParam(value ="工序号")
     @FieldAnnotation(notEmpty = true)
@@ -59,22 +63,6 @@ public class Operation extends BaseAPS {
     @ApiParam(value ="固定报废数")
     private Double fixScrapCount;
 
-    @Column(name="RATIO")
-    @ApiParam(value ="分割比例")
-    private String ratio;
-
-    @Column(name="COUNT")
-    @ApiParam(value ="分割的工作个数")
-    private Integer count;
-
-    @Column(name="BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="分割批量")
-    private Double batch;
-
-    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="分割余数")
-    private Double remainder;
-
     @Column(name="CONS_TYPE")
     @ApiParam(value ="接续方式")
     @FieldAnnotation(defaultValue = "ES")
@@ -90,12 +78,13 @@ public class Operation extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
+    @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EOperation.ProductRouting);
     }
 
     public void setProductRouting(ProductRouting routing) {
-        this.productRoutingId = routing != null ? routing.getId() : 0l;
+        this.productRoutingId = routing != null ? routing.getId() : 0L;
         BeanRelation.set(this, EOperation.ProductRouting, routing);
     }
 
@@ -114,12 +103,13 @@ public class Operation extends BaseAPS {
         return BeanRelation.list(this, EOperation.OperResources);
     }
 
+    @JsonIgnore
     public StandOperation getStandOperation() {
         return BeanRelation.get(this, EOperation.StandOperation);
     }
 
     public void setStandOperation(StandOperation std) {
-        this.standOperationId = std != null ? std.getId() : 0l;
+        this.standOperationId = std != null ? std.getId() : 0L;
         BeanRelation.set(this, EOperation.StandOperation, std);
     }
 }

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EOrderFeedback;
 import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,7 +32,7 @@ public class OrderFeedback extends BaseAPS {
 
     @Column(name="ORDER_ID")
     @ApiParam(value ="顶层订单号")
-    @FieldAnnotation(relation = "Order", modify = false)
+    @FieldAnnotation(mainkey = true, relation = "Order")
     private Long orderId;
 
     @Column(name="ORDER_COUNT")
@@ -56,20 +57,19 @@ public class OrderFeedback extends BaseAPS {
 
     @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;
 
+    @JsonIgnore
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EOrderFeedback.Order);
     }
 
     public void setOrder(BaseOrder order) {
-        this.orderId = order != null ? order.getId() : 0l;
+        this.orderId = order != null ? order.getId() : 0L;
         BeanRelation.set(this, EOrderFeedback.Order, order);
     }
 }

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

@@ -25,6 +25,7 @@ import java.util.Date;
 @ExcludeImportExport
 public class OrderTree extends BaseAPS {
     private static final long serialVersionUID = -7505923374791695738L;
+
     @ApiParam(value ="物料编码")
     private String material;
 

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

@@ -10,6 +10,7 @@ import lombok.EqualsAndHashCode;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 import java.util.Date;
 
@@ -27,6 +28,8 @@ import java.util.Date;
 @Api("加班日历")
 public class OvertimeCalendar extends BaseAPS {
     private static final long serialVersionUID = -501715721073189464L;
+
+    @Lob
     @Column(name="RES_CODES")
     @ApiParam(value ="资源代码")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.MULTI_OBJECT, typeName = "Resource", notEmpty = true)

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.ExcludeImportExport;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EParentWork;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -31,8 +33,10 @@ import java.util.List;
 @Table(name = "APS_PARENT_WORK")
 @Api("父工作")
 @ExcludeImportExport
+@ClassLevelAnnotation(level = 5)
 public class ParentWork extends BaseAPS {
     private static final long serialVersionUID = 8792781216193806606L;
+
     @Column(name="count", columnDefinition = "decimal(18,8)")
     @ApiParam(value ="数量")
     private Double count;
@@ -42,6 +46,11 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Integer serialNumber = 0;
 
+    @Column(name="CONFIRM_SERIAL")
+    @ApiParam(value ="下发流水号")
+    @FieldAnnotation(property = false)
+    private Integer confirmSerial = 0;
+
     @Column(name="PRODUCT_ORDER_ID")
     @ApiParam(value ="订单")
     @FieldAnnotation(property = false)
@@ -52,21 +61,23 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operationId;
 
+    @JsonIgnore
     public BaseOrder getProductOrder() {
         return BeanRelation.get(this, EParentWork.ProductOrder);
     }
 
     public void setProductOrder(ProductOrder order) {
-        this.productOrderId = order != null ? order.getId() : 0l;
+        this.productOrderId = order != null ? order.getId() : 0L;
         BeanRelation.set(this, EParentWork.ProductOrder, order);
     }
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EParentWork.Operation);
     }
 
     public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
+        this.operationId = oper != null ? oper.getId() : 0L;
         BeanRelation.set(this, EParentWork.Operation, oper);
     }
 

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

@@ -1,10 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EPlanFeedback;
+import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
+import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -26,33 +30,53 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_PLAN_FEEDBACK")
 @Api("工作反馈")
+@MainKey(groups = {InsertGroup.class, UpdateGroup.class})
 public class PlanFeedback extends BaseAPS {
-
     private static final long serialVersionUID = 2520555825093741381L;
 
-    @Column(name="WORK_ID")
+    @Column(name = "WORK_ID")
-    @ApiParam(value ="工作")
+    @ApiParam(value = "工作")
-    @FieldAnnotation(property = false)
+    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Work")
     private Long workId;
 
-    @Column(name="STATUS")
+    @Column(name = "TOP_ORDER_ID")
-    @ApiParam(value ="状态")
+    @ApiParam(value = "顶层订单")
+    @FieldAnnotation(popSearch = true, mainkey = true, relation = "Order")
+    private Long topOrderId;
+
+    @Column(name = "STATUS")
+    @ApiParam(value = "状态")
     private ApsEnumUtil.FEED_BACK_STATUS status;
 
-    @Column(name="ACTUAL_COUNT")
+    @Column(name = "PLAN_COUNT")
-    @ApiParam(value ="实际完成数量")
+    @ApiParam(value = "计划完成数量")
+    private Double planCount;
+
+    @Column(name = "ACTUAL_COUNT")
+    @ApiParam(value = "实际完成数量")
     private Double actualCount;
 
-    @Column(name="REMARK")
+    @Column(name = "REMARK")
-    @ApiParam(value ="备注")
+    @ApiParam(value = "备注")
     private String remark;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EPlanFeedback.Work);
     }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EPlanFeedback.Work, work);
     }
+
+    @JsonIgnore
+    public BaseOrder getTopOrder() {
+        return BeanRelation.get(this, EPlanFeedback.TopOrder);
+    }
+
+    public void setTopOrder(BaseOrder topOrder) {
+        this.topOrderId = topOrder != null ? topOrder.getId() : 0L;
+        BeanRelation.set(this, EPlanFeedback.TopOrder, topOrder);
+    }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_PRIORITY_TYPE")
 @Api("优先级")
+@ClassLevelAnnotation(level = 0)
 public class PriorityType extends BaseAPS {
     private static final long serialVersionUID = 445577901076659576L;
 

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

@@ -0,0 +1,55 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
+import cn.estsh.i3plus.pojo.base.bean.BaseBean;
+import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.Date;
+
+/**
+ * @Description :产线
+ * @Reference :
+ * @Author : pantianhu
+ * @CreateDate : 2022-03-29 11:26
+ * @Modify:
+ **/
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_PRODUCT_LINE")
+@Api("产线信息")
+@ClassLevelAnnotation(level = 0)
+public class ProductLine extends BaseAPS {
+    private static final long serialVersionUID = 6900226668783322736L;
+
+    @Column(name="CODE")
+    @ApiParam(value ="编码")
+    @FieldAnnotation(popSearch = true, mainkey = true)
+    private String code;
+
+    @Column(name="NAME")
+    @ApiParam(value ="名称")
+    @FieldAnnotation(popSearch = true)
+    private String name;
+
+    @Column(name="TYPE")
+    @ApiParam(value ="产线类型")
+    private ApsEnumUtil.SANLUX_PRODUCT_TYPE type;
+
+    @Column(name="PRODUCT_QUALITY")
+    @ApiParam(value ="指定品质")
+    private String productQuality;
+
+    @Column(name="SHIFT_LIMIT_NUM")
+    @ApiParam(value ="多楔带限制模数")
+    private Integer shiftLimitNum;
+}

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

@@ -1,11 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EProductOrder;
 import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,8 +31,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_PRODUCT_ORDER")
 @Api("生产订单")
+@ClassLevelAnnotation(level = 3)
 public class ProductOrder extends BaseOrder {
     private static final long serialVersionUID = 6900226668783662736L;
+
     @Column(name="EST")
     @ApiParam(value ="最早开始时间")
     private Date est;
@@ -56,11 +60,6 @@ public class ProductOrder extends BaseOrder {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.OBJECT, typeName = "ProductRouting")
     private String specifyRouting;
 
-    @Column(name="RECALC_COUNT")
-    @ApiParam(value ="是否重新计算数量")
-    @FieldAnnotation(defaultValue = "true")
-    private Boolean recalcCount;
-
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;
@@ -95,10 +94,12 @@ public class ProductOrder extends BaseOrder {
 
     @Column(name="FINISH_COUNT")
     @ApiParam(value ="完工数")
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double finishCount;
 
     @Column(name="QUALIFIED_COUNT")
     @ApiParam(value ="检验合格数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double qualifiedCount;
 
     @Column(name="PRODUCT_ROUTING_ID")
@@ -111,12 +112,13 @@ public class ProductOrder extends BaseOrder {
     @FieldAnnotation(property = false)
     private Long srcInsertedOrder;
 
+    @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EProductOrder.ProductRouting);
     }
 
     public void setProductRouting(ProductRouting routing) {
-        this.productRoutingId = routing != null ? routing.getId() : 0l;
+        this.productRoutingId = routing != null ? routing.getId() : 0L;
         BeanRelation.set(this, EProductOrder.ProductRouting, routing);
     }
 

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
@@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -32,8 +34,10 @@ import java.util.List;
 @Table(name = "APS_PRODUCT_ROUTING")
 @Api("工艺路线")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+@ClassLevelAnnotation(level = 2)
 public class ProductRouting extends BaseAPS {
     private static final long serialVersionUID = 4905294866468216722L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -62,12 +66,18 @@ public class ProductRouting extends BaseAPS {
     @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
+    @Column(name="ROUTING_CHANGE")
+    @ApiParam(value ="工艺路径变更")
+    @FieldAnnotation(display = false)
+    private Boolean routingChange;
+
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EProductRouting.Material);
     }
 
     public void setMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.materialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EProductRouting.Material, material);
     }
 

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -26,8 +27,10 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_PURCHASE_ORDER")
 @Api("采购订单")
+@ClassLevelAnnotation(level = 3)
 public class PurchaseOrder extends BaseOrder {
     private static final long serialVersionUID = 4699381603433121631L;
+
     @Column(name="SPECIFY_TOP_ORDER")
     @ApiParam(value ="指定顶层订单")
     private String specifyTopOrder;
@@ -50,11 +53,6 @@ public class PurchaseOrder 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="AUTO_SUPPLY")
     @ApiParam(value ="物料计算时自动补充")
     @FieldAnnotation(defaultValue = "true")

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

@@ -35,6 +35,7 @@ import java.util.List;
 @Api("日历")
 public class ResCalendar extends BaseAPS {
     private static final long serialVersionUID = 8338930205816433211L;
+
     @Lob
     @Column(name="RES_CODES")
     @ApiParam(value ="资源编码")
@@ -61,6 +62,10 @@ public class ResCalendar extends BaseAPS {
     @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
+    @Column(name="SHIFT_NUMBER")
+    @ApiParam(value ="班次数量")
+    private Integer shiftNumber;
+
     @JsonBackReference
     public List<DayShift> getDayShifts() {
         return BeanRelation.list(this, EResCalendar.DayShifts);

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

@@ -3,6 +3,7 @@ package cn.estsh.i3plus.pojo.aps.bean;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
@@ -9,6 +10,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -18,7 +20,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;
 
 /**
@@ -34,8 +35,10 @@ import java.util.List;
 @Table(name = "APS_RESOURCE")
 @Api("资源")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+@ClassLevelAnnotation(level = 1)
 public class Resource extends BaseAPS {
     private static final long serialVersionUID = 3304084329600816457L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -80,14 +83,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,40 +98,48 @@ 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")
+    @Column(name="BIND_RESOURCE_ID")
-    @ApiParam(value ="时间圆整影响")
+    @ApiParam(value ="绑定资源")
-    @FieldAnnotation(multiEnumClass = ApsEnumUtil.EFFICIENCY_EFFECT.class)
+    @FieldAnnotation(relation = "Order", modify = false)
-    private Integer timeRound;
+    private Long bindResourceId;
-
-    @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;
+    @Column(name="PRODUCT_LINE_ID")
+    @ApiParam(value ="生产线")
+    @FieldAnnotation(relation = "ProductLine")
+    private Long productLineId;
 
+    @JsonIgnore
     public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {
-        this.workShopId = workShop != null ? workShop.getId() : 0l;
+        this.workShopId = workShop != null ? workShop.getId() : 0L;
         BeanRelation.set(this, EResource.WorkShop, workShop);
     }
 
+    @JsonIgnore
+    public ProductLine getProductLine() { return BeanRelation.get(this, EResource.ProductLine); }
+
+    public void setProductLine(ProductLine productLine) {
+        this.productLineId = productLine != null ? productLine.getId() : 0L;
+        BeanRelation.set(this, EResource.ProductLine, productLine);
+    }
+
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EResource.WorkPlans); }
+
+    @JsonIgnore
+    public Resource getBindResource() { return BeanRelation.get(this, EResource.BindResource); }
+
+    public void setBindResource(Resource bindResource) {
+        this.bindResourceId = bindResource != null ? bindResource.getId() : 0L;
+        BeanRelation.set(this, EResource.BindResource, bindResource);
+    }
+
+    @JsonBackReference
+    public List<Resource> getSubBindResources() { return BeanRelation.list(this, EResource.SubBindResources); }
 }

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

@@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.ERuleDetail;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,8 +30,8 @@ import javax.persistence.Table;
 @Api("规则明细")
 @ExcludeImportExport
 public class RuleDetail extends BaseAPS {
-
     private static final long serialVersionUID = -6433950357039396107L;
+
     @Column(name="TYPE")
     @ApiParam(value ="规则类型")
     private String type;
@@ -49,6 +50,7 @@ public class RuleDetail extends BaseAPS {
     @FieldAnnotation(relation = "Rule", display = false)
     private Long ruleId;
 
+    @JsonIgnore
     public RuleGroup getRuleGroup() { return BeanRelation.get(this, ERuleDetail.RuleGroup); }
 
     public void setRuleGroup(RuleGroup ruleGroup) {
@@ -56,6 +58,7 @@ public class RuleDetail extends BaseAPS {
         BeanRelation.set(this, ERuleDetail.RuleGroup, ruleGroup);
     }
 
+    @JsonIgnore
     public BaseRule getRule() { return BeanRelation.get(this, ERuleDetail.Rule); }
 
     public void setRule(BaseRule rule) {

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

@@ -32,6 +32,7 @@ import java.util.List;
 @ExcludeImportExport
 public class RuleGroup extends BaseAPS {
     private static final long serialVersionUID = 4741897751041891075L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     private String code;

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -27,8 +28,8 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_SAFE_STOCK_ORDER")
 @Api("安全库存订单")
+@ClassLevelAnnotation(level = 4)
 public class SafeStockOrder extends BaseOrder {
-
     private static final long serialVersionUID = 5944067344390531794L;
 
     @Column(name="ORDER_STATUS")
@@ -43,10 +44,12 @@ public class SafeStockOrder extends BaseOrder {
 
     @Column(name="FINISH_COUNT")
     @ApiParam(value ="完工数")
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double finishCount;
 
     @Column(name="QUALIFIED_COUNT")
     @ApiParam(value ="检验合格数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double qualifiedCount;
 
     @JsonIgnore
@@ -54,6 +57,7 @@ public class SafeStockOrder extends BaseOrder {
         return BeanRelation.get(this, EBaseOrder.Works);
     }
 
+    @JsonIgnore
     public Inventory getInventory() { return BeanRelation.get(this, ESafeStockOrder.Inventory); }
 
     public void setInventory(Inventory inventory) {

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
@@ -27,8 +28,10 @@ import java.util.Date;
 @Entity
 @Table(name = "APS_SALES_ORDER")
 @Api("销售订单")
+@ClassLevelAnnotation(level = 3)
 public class SalesOrder extends BaseOrder {
     private static final long serialVersionUID = -511784925441907538L;
+
     @Column(name="LOW_EST")
     @ApiParam(value ="底阶最早开始时间")
     private Date lowEst;
@@ -77,12 +80,12 @@ public class SalesOrder extends BaseOrder {
 
     @Column(name="FINISH_COUNT")
     @ApiParam(value ="完工数")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double finishCount;
 
     @Column(name="QUALIFIED_COUNT")
     @ApiParam(value ="检验合格数量")
-    @FieldAnnotation(modify = false)
+    @FieldAnnotation(modify = false, defaultValue = "0")
     private Double qualifiedCount;
 
     @Column(name="SERIAL_NUMBER")
@@ -90,6 +93,11 @@ public class SalesOrder extends BaseOrder {
     @FieldAnnotation(property = false)
     private Integer serialNumber = 0;
 
+    @Column(name="FORCE_COUNT")
+    @ApiParam(value ="强制完成数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
+    private Double forceCount;
+
     @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EBaseOrder.Works);

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

@@ -26,8 +26,8 @@ import java.util.Date;
 @Api("流水号")
 @ExcludeImportExport
 public class SerialNumber extends BaseAPS {
-
     private static final long serialVersionUID = 312483211086701109L;
+
     @Column(name="S_NUMBER")
     @ApiParam(value ="销售订单流水号")
     private Integer sNumber = 0;
@@ -52,6 +52,10 @@ public class SerialNumber extends BaseAPS {
     @ApiParam(value ="插单流水号")
     private Integer hNumber = 0;
 
+    @Column(name="Z_NUMBER")
+    @ApiParam(value ="补充订单流水号")
+    private Integer zNumber = 0;
+
     @Column(name="LAST_DATE")
     @ApiParam(value ="最后生成日期")
     private Date lastDate;

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

@@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EShippingTime;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -58,31 +59,35 @@ public class ShippingTime extends BaseAPS {
     @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
+    @JsonIgnore
     public Resource getPrevRes() {return BeanRelation.get(this, EShippingTime.PrevRes); }
 
     public  void setPrevRes(Resource res) {
-        this.prevResId = res != null ? res.getId() : 0l;
+        this.prevResId = res != null ? res.getId() : 0L;
         BeanRelation.set(this, EShippingTime.PrevRes, res);
     }
 
+    @JsonIgnore
     public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); }
 
     public void setPostRes(Resource res) {
-        this.postResId = res != null ? res.getId() : 0l;
+        this.postResId = res != null ? res.getId() : 0L;
         BeanRelation.set(this, EShippingTime.PostRes, res);
     }
 
+    @JsonIgnore
     public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);}
 
     public void setPrevStand(StandOperation stand) {
-        this.prevStandId = stand != null ? stand.getId() : 0l;
+        this.prevStandId = stand != null ? stand.getId() : 0L;
         BeanRelation.set(this, EShippingTime.PrevStand, stand);
     }
 
+    @JsonIgnore
     public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); }
 
     public void setPostStand(StandOperation stand) {
-        this.postStandId = stand != null ? stand.getId() : 0l;
+        this.postStandId = stand != null ? stand.getId() : 0L;
         BeanRelation.set(this, EShippingTime.PostStand, stand);
     }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
@@ -8,6 +9,7 @@ import cn.estsh.i3plus.pojo.aps.holders.EStandOperation;
 import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -30,8 +32,10 @@ import javax.persistence.Table;
 @Table(name = "APS_STAND_OPERATION")
 @Api("标准工序")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+@ClassLevelAnnotation(level = 1)
 public class StandOperation extends BaseAPS {
     private static final long serialVersionUID = -6869403951765771775L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true)
@@ -47,22 +51,6 @@ public class StandOperation extends BaseAPS {
     @FieldAnnotation(defaultValue = "POSITIVE")
     private ApsEnumUtil.DIRECTION direction;
 
-    @Column(name="RATIO")
-    @ApiParam(value ="分割比例")
-    private String ratio;
-
-    @Column(name="COUNT")
-    @ApiParam(value ="分割的工作个数")
-    private Integer count;
-
-    @Column(name="BATCH", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="分割批量")
-    private Double batch;
-
-    @Column(name="REMAINDER", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="分割余数")
-    private Double remainder;
-
     @Column(name="MIN_SPACE_TIME")
     @ApiParam(value ="最小时间间隔")
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
@@ -73,6 +61,22 @@ public class StandOperation extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String maxSpaceTime;
 
+    @Column(name="FLUSH_TIME_BLOCK")
+    @ApiParam(value ="基准时间间隔")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    // 刷新计划时将一天时间按块分割，后工作在本工作的下一时间块中排程。
+    private String flushTimeBlock;
+
+    @Column(name="BASE_TIME_LIMIT")
+    @ApiParam(value ="基准时间限制")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String baseTimeLimit;
+
+    @Column(name="OVER_SHIFT_SPLIT_LIMIT")
+    @ApiParam(value ="跨班次时间限制")
+    @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
+    private String overShiftSplitLimit;
+
     @Column(name="COMB_TYPE")
     @ApiParam(value ="生产组合方式")
     @FieldAnnotation(defaultValue = "MAX_ALL_RESOURCE")
@@ -87,10 +91,11 @@ public class StandOperation extends BaseAPS {
     @ApiParam(value ="工序类型")
     private ApsEnumUtil.SANLUX_OPERATION_TYPE type = ApsEnumUtil.SANLUX_OPERATION_TYPE.NORMAL;
 
+    @JsonIgnore
     public WorkShop getWorkShop() { return BeanRelation.get(this, EStandOperation.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {
-        this.workShopId = workShop != null ? workShop.getId() : 0l;
+        this.workShopId = workShop != null ? workShop.getId() : 0L;
         BeanRelation.set(this, EStandOperation.WorkShop, workShop);
     }
 }

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

@@ -0,0 +1,44 @@
+package cn.estsh.i3plus.pojo.aps.bean;
+
+import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
+import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+
+/**
+ * @author Jason
+ * @ClassName: SupplyOrder
+ * @Description: 补充订单
+ * @date 2021-12-30
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Entity
+@Table(name = "APS_SUPPLY_ORDER")
+@Api("补充订单")
+public class SupplyOrder extends BaseOrder {
+    private static final long serialVersionUID = -5829272956141252627L;
+
+    @Column(name="FINISH_COUNT")
+    @ApiParam(value ="完工数")
+    @FieldAnnotation(modify = false, defaultValue = "0")
+    private Double finishCount;
+
+    @Column(name="QUALIFIED_COUNT")
+    @ApiParam(value ="检验合格数量")
+    @FieldAnnotation(modify = false, defaultValue = "0")
+    private Double qualifiedCount;
+
+    @JsonIgnore
+    public Work getWork() {
+        return BeanRelation.get(this, EBaseOrder.Works);
+    }
+}

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

@@ -27,6 +27,7 @@ import java.util.Date;
 @Api("系统参数")
 public class SysParam extends BaseAPS {
     private static final long serialVersionUID = 3115620726438869596L;
+
     @Column(name="BASE_TIME")
     @ApiParam(value ="基准时间")
     private Date baseTime;
@@ -36,11 +37,6 @@ public class SysParam extends BaseAPS {
     @FieldAnnotation(defaultValue = "20")
     private Integer maxInterruptCount = 20;
 
-    @Column(name="TYPE")
-    @ApiParam(value ="工艺路径有效判断类型")
-    @FieldAnnotation(defaultValue = "CALC_LET_LT")
-    private ApsEnumUtil.ROUTING_VALID_TYPE type;
-
     @Column(name="RULE_GROUP_ID")
     @ApiParam(value ="规则组id")
     @FieldAnnotation(display = false)
@@ -69,4 +65,20 @@ public class SysParam extends BaseAPS {
     @Column(name="FOUR_FIRST_SUPPLY")
     @ApiParam(value ="是否牵纱补满模")
     private Boolean fourFirstSupply = false;
+
+    @Column(name="MAX_SPACE_LIMIT_DRAG")
+    @ApiParam(value ="间隔时间限制")
+    private Boolean maxSpaceLimitDrag = true;
+
+    @Column(name="DEFAULT_FEEDBACK")
+    @ApiParam(value ="自动提交前三道")
+    private Boolean defaultFeedback = true;
+
+    @Column(name="SAME_MATERIAL_INTERVAL")
+    @ApiParam(value ="相同物料选择间隔")
+    private String sameMaterialInterval;
+
+    @Column(name="MERGE_RATIO")
+    @ApiParam(value ="合并余数需求比列")
+    private Integer mergeRatio;
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.MainKey;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
@@ -11,6 +12,7 @@ import cn.estsh.i3plus.pojo.aps.validator.InsertGroup;
 import cn.estsh.i3plus.pojo.aps.validator.UpdateGroup;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -36,8 +38,10 @@ import java.util.List;
 @Table(name = "APS_WORK")
 @Api("工作")
 @MainKey(groups = {InsertGroup.class, UpdateGroup.class})
+@ClassLevelAnnotation(level = 6)
 public class Work extends BaseAPS {
     private static final long serialVersionUID = 6471740978550523187L;
+
     @Column(name="CODE")
     @ApiParam(value ="编码")
     @FieldAnnotation(popSearch = true, mainkey = true, modify = false)
@@ -128,10 +132,10 @@ public class Work extends BaseAPS {
     @ApiParam(value ="已分割的工作是否固定")
     private Boolean fixSplit;
 
-    @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)")
+//    @Column(name="NEED_PREV_COUNT", columnDefinition = "decimal(18,8)")
-    @ApiParam(value ="需要的前工作数量")
+//    @ApiParam(value ="需要的前工作数量")
-    @FieldAnnotation(display = false, modify = false)
+//    @FieldAnnotation(display = false, modify = false)
-    private Double needPrevCount;
+//    private Double needPrevCount;
 
     @Column(name="SCH_FAILED")
     @ApiParam(value ="是否排程失败")
@@ -171,59 +175,77 @@ public class Work extends BaseAPS {
     @ApiParam(value ="动态拆分工作ID")
     private Long originWorkId;
 
-    @Column(name="SUPPLY_WORK_CODE")
+//    @Column(name="SUPPLY_WORK_CODE")
-    @ApiParam(value ="补满模工作编码")
+//    @ApiParam(value ="补满模工作编码")
-    private String supplyWorkCode;
+//    private String supplyWorkCode;
 
-    @ApiParam(value ="工作左边界")
+    @ApiParam(value ="工作排序顺序")
-    private Date leftEdge;
+    private Integer workSeqNumber;
 
-    @ApiParam(value ="工作右边界")
+    @ApiParam(value ="工作品质顺序")
-    private Date rightEdge;
+    private Integer workSeqQuality;
 
-    @ApiParam(value ="工作排序顺序")
+    @Column(name="MOULD_ID")
-    private  Integer workSeqNumber;
+    @ApiParam(value ="模具能力id")
+    @FieldAnnotation(property = false)
+    private Long mouldId = 0L;
+
+    @Column(name="FEEDBACK_SPLIT")
+    @ApiParam(value ="是否报工拆分")
+    @FieldAnnotation(modify = false)
+    private Boolean feedbackSplit;
+
+    @Column(name="MOULD_NUM")
+    @ApiParam(value ="模具数量")
+    private Integer mouldNum;
+
+    @Column(name="MOULD_CODE")
+    @ApiParam(value ="模具编码")
+    private String mouldCode;
 
     // 排程时，找插入位置的评估值
     private transient double evaluateValue = 0;
-    private transient boolean supplyCount = false;
 
     // 排程时确定工作是正向排程还是逆向排程。
     private transient boolean positive = true;
 
+    @JsonIgnore
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }
 
     public void setOrder(BaseOrder order) {
-        this.orderId = order != null ? order.getId() : 0l;
+        this.orderId = order != null ? order.getId() : 0L;
         BeanRelation.set(this, EWork.Order, order);
     }
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EWork.Operation);
     }
 
     public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
+        this.operationId = oper != null ? oper.getId() : 0L;
         BeanRelation.set(this, EWork.Operation, oper);
     }
 
+    @JsonIgnore
     public Operation getOriginOperation() {
         return BeanRelation.get(this, EWork.OriginOperation);
     }
 
     public void setOriginOperation(Operation oper) {
-        this.originOperationId = oper != null ? oper.getId() : 0l;
+        this.originOperationId = oper != null ? oper.getId() : 0L;
         BeanRelation.set(this, EWork.OriginOperation, oper);
     }
 
+    @JsonIgnore
     public ParentWork getParentWork() {
         return BeanRelation.get(this, EWork.ParentWork);
     }
 
     public void setParentWork(ParentWork parentWork) {
-        this.parentWorkId = parentWork != null ? parentWork.getId() : 0l;
+        this.parentWorkId = parentWork != null ? parentWork.getId() : 0L;
         BeanRelation.set(this, EWork.ParentWork, parentWork);
     }
 
@@ -253,8 +275,8 @@ public class Work extends BaseAPS {
     }
 
     @JsonBackReference
-    public PlanFeedback getPlanFeedback() {
+    public List<PlanFeedback> getPlanFeedback() {
-        return BeanRelation.get(this, EWork.PlanFeedback);
+        return BeanRelation.list(this, EWork.PlanFeedback);
     }
 
     @JsonBackReference
@@ -268,6 +290,7 @@ public class Work extends BaseAPS {
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EWork.WorkPlans); }
 
+    @JsonIgnore
     public Resource getSpecifyResource() {
         return BeanRelation.get(this, EWork.SpecifyResource);
     }
@@ -287,6 +310,7 @@ public class Work extends BaseAPS {
     @JsonBackReference
     public List<Work> getDynSplitWorks() { return BeanRelation.list(this, EWork.DynSplitWorks); }
 
+    @JsonIgnore
     public Work getOriginWork() {
         return BeanRelation.get(this, EWork.OriginWork);
     }

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

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkInput;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -28,8 +30,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_WORK_INPUT")
 @Api("工作输入")
+@ClassLevelAnnotation(level = 7)
 public class WorkInput extends BaseAPS {
     private static final long serialVersionUID = 2654389476284740183L;
+
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
@@ -60,12 +64,13 @@ public class WorkInput extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operInputId;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EWorkInput.Work);
     }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkInput.Work, work);
     }
 
@@ -74,21 +79,23 @@ public class WorkInput extends BaseAPS {
         return BeanRelation.list(this, EWorkInput.WorkRelations);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EWorkInput.Material);
     }
 
     public void setMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.materialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EWorkInput.Material, material);
     }
 
+    @JsonIgnore
     public OperInput getOperInput() {
         return BeanRelation.get(this, EWorkInput.OperInput);
     }
 
     public void setOperInput(OperInput input) {
-        this.operInputId = input != null ? input.getId() : 0l;
+        this.operInputId = input != null ? input.getId() : 0L;
         BeanRelation.set(this, EWorkInput.OperInput, input);
     }
 }

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

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkOutput;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -29,9 +31,10 @@ import java.util.List;
 @Entity
 @Table(name = "APS_WORK_OUTPUT")
 @Api("工作输出")
+@ClassLevelAnnotation(level = 7)
 public class WorkOutput extends BaseAPS {
-
     private static final long serialVersionUID = 6031001499619328313L;
+
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
@@ -62,12 +65,13 @@ public class WorkOutput extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operOutputId;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EWorkOutput.Work);
     }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkOutput.Work, work);
     }
 
@@ -76,21 +80,23 @@ public class WorkOutput extends BaseAPS {
         return BeanRelation.list(this, EWorkOutput.WorkRelations);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EWorkOutput.Material);
     }
 
     public void setMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.materialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EWorkOutput.Material, material);
     }
 
+    @JsonIgnore
     public OperOutput getOperOutput() {
         return BeanRelation.get(this, EWorkOutput.OperOutput);
     }
 
     public void setOperOutput(OperOutput output) {
-        this.operOutputId = output != null ? output.getId() : 0l;
+        this.operOutputId = output != null ? output.getId() : 0L;
         BeanRelation.set(this, EWorkOutput.OperOutput, output);
     }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.RippleAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
@@ -7,6 +8,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkPlan;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -35,9 +37,10 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Table(name="APS_WORK_PLAN")
 @Api("工作计划")
+@ClassLevelAnnotation(level = 8)
 public class WorkPlan extends BaseAPS {
-
     private static final long serialVersionUID = 5489548115780676195L;
+
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
@@ -72,14 +75,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")
@@ -136,27 +139,42 @@ public class WorkPlan extends BaseAPS {
     @RippleAnnotation(dependence = {"PostPlan.resProduceEnd"}, method = "calcReverse")
     private Date resProduceEnd;
 
+    @ApiParam(value ="调整时间")
+    private Date adjustDate;
+
+    @Column(name="MOULD_CODE")
+    @ApiParam(value ="模具编码")
+    private String mouldCode;
+
+    @Column(name="LINE_PRIORITY")
+    @ApiParam(value ="产线优先级")
+    private String linePriority;
+
+    @JsonIgnore
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkPlan.Work, work);
     }
 
+    @JsonIgnore
     public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); }
 
     public void setResource(Resource resource) {
-        this.resourceId = resource != null ? resource.getId() : 0l;
+        this.resourceId = resource != null ? resource.getId() : 0L;
         BeanRelation.set(this, EWorkPlan.Resource, resource);
     }
 
+    @JsonIgnore
     public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); }
 
     public void setWorkResource(WorkResource workResource) {
-        this.workResourceId = workResource != null ? workResource.getId() : 0l;
+        this.workResourceId = workResource != null ? workResource.getId() : 0L;
         BeanRelation.set(this, EWorkPlan.WorkResource, workResource);
     }
 
+    @JsonIgnore
     public FurnacePlan getFurnacePlan() { return BeanRelation.get(this, EWorkPlan.FurnacePlan); }
 
     public void setFurnacePlan(FurnacePlan plan) {

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

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkRelation;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,8 +28,8 @@ import javax.persistence.Table;
 @Table(name = "APS_Work_Relation")
 @Api("工作关联")
 public class WorkRelation extends BaseAPS {
-
     private static final long serialVersionUID = -5824884364328962956L;
+
     @Column(name="MATERIAL_ID")
     @ApiParam(value ="物料")
     @FieldAnnotation(relation = "Material", modify = false)
@@ -97,66 +98,73 @@ public class WorkRelation extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long workOutputId;
 
+    @JsonIgnore
     public WorkInput getWorkInput() {
         return BeanRelation.get(this, EWorkRelation.WorkInput);
     }
 
     public void setWorkInput(WorkInput input) {
-        this.workInputId = input != null ? input.getId() : 0l;
+        this.workInputId = input != null ? input.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.WorkInput, input);
     }
 
+    @JsonIgnore
     public WorkOutput getWorkOutput() {
         return BeanRelation.get(this, EWorkRelation.WorkOutput);
     }
 
     public void setWorkOutput(WorkOutput output) {
-        this.workOutputId = output != null ? output.getId() : 0l;
+        this.workOutputId = output != null ? output.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.WorkOutput, output);
     }
 
+    @JsonIgnore
     public Work getPrevWork() {
         return BeanRelation.get(this, EWorkRelation.PrevWork);
     }
 
     public void setPrevWork(Work work) {
-        this.prevWorkId = work != null ? work.getId() : 0l;
+        this.prevWorkId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.PrevWork, work);
     }
 
+    @JsonIgnore
     public Work getPostWork() {
         return BeanRelation.get(this, EWorkRelation.PostWork);
     }
 
     public void setPostWork(Work work) {
-        this.postWorkId = work != null ? work.getId() : 0l;
+        this.postWorkId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.PostWork, work);
     }
 
+    @JsonIgnore
     public BaseOrder getPrevOrder() {
         return BeanRelation.get(this, EWorkRelation.PrevOrder);
     }
 
     public void setPrevOrder(BaseOrder order) {
-        this.prevOrderId = order != null ? order.getId() : 0l;
+        this.prevOrderId = order != null ? order.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.PrevOrder, order);
     }
 
+    @JsonIgnore
     public BaseOrder getPostOrder() {
         return BeanRelation.get(this, EWorkRelation.PostOrder);
     }
 
     public void setPostOrder(BaseOrder order) {
-        this.postOrderId = order != null ? order.getId() : 0l;
+        this.postOrderId = order != null ? order.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.PostOrder, order);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EWorkRelation.Material);
     }
 
     public void setMaterial(Material material) {
-        this.materialId = material != null ? material.getId() : 0l;
+        this.materialId = material != null ? material.getId() : 0L;
         BeanRelation.set(this, EWorkRelation.Material, material);
     }
 }

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

@@ -1,10 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EWorkResource;
 import cn.estsh.i3plus.pojo.base.enumutil.ApsEnumUtil;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@@ -27,9 +29,10 @@ import javax.validation.constraints.Min;
 @Entity
 @Table(name = "APS_WORK_RESOURCE")
 @Api("工作资源")
+@ClassLevelAnnotation(level = 7)
 public class WorkResource extends BaseAPS {
-
     private static final long serialVersionUID = 4791940404968841144L;
+
     @Column(name="WORK_ID")
     @ApiParam(value ="工作")
     @FieldAnnotation(relation = "Work")
@@ -102,32 +105,35 @@ public class WorkResource extends BaseAPS {
     @Column(name="RES_CAPACITY_ID")
     @ApiParam(value ="设备能力id")
     @FieldAnnotation(property = false)
-    private Long resCapacityId = 0l;
+    private Long resCapacityId = 0L;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EWorkResource.Work);
     }
 
     public void setWork(Work work) {
-        this.workId = work != null ? work.getId() : 0l;
+        this.workId = work != null ? work.getId() : 0L;
         BeanRelation.set(this, EWorkResource.Work, work);
     }
 
+    @JsonIgnore
     public Resource getResource() {
         return BeanRelation.get(this, EWorkResource.Resource);
     }
 
     public void setResource(Resource res) {
-        this.resourceId = res != null ? res.getId() : 0l;
+        this.resourceId = res != null ? res.getId() : 0L;
         BeanRelation.set(this, EWorkResource.Resource, res);
     }
 
+    @JsonIgnore
     public OperResource getOperResource() {
         return BeanRelation.get(this, EWorkResource.OperResource);
     }
 
     public void setOperResource(OperResource res) {
-        this.operResourceId = res != null ? res.getId() : 0l;
+        this.operResourceId = res != null ? res.getId() : 0L;
         BeanRelation.set(this, EWorkResource.OperResource, res);
     }
 }

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

@@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.bean;
 
+import cn.estsh.i3plus.pojo.aps.annotation.ClassLevelAnnotation;
 import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import io.swagger.annotations.Api;
@@ -23,6 +24,7 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "APS_WORK_SHOP")
 @Api("车间")
+@ClassLevelAnnotation(level = 0)
 public class WorkShop extends BaseAPS {
     private static final long serialVersionUID = 5627016086816721284L;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BaseAPS.java

@@ -5,6 +5,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiParam;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import javax.persistence.Column;
@@ -26,19 +27,18 @@ import java.util.HashMap;
 @ExcludeImportExport
 public abstract class BaseAPS extends BaseBean {
     private static final long serialVersionUID = -8638842158403944318L;
-    @JsonIgnore
+
     @Lob
     @FieldAnnotation(property = false)
     private HashMap<String, Object> customFields = new HashMap<>();
 
-    @Column(name="KEY")
     @ApiParam(value ="主键值")
-    @FieldAnnotation(display = false, modify = false)
+    @FieldAnnotation(display = false)
     @Transient
     private String key;
 
     @FieldAnnotation(property = false)
-    private transient Long updateId = 0l;
+    private transient Long updateId = 0L;
 
     public Object getCustomField(String code) {
         return customFields.get(code);
@@ -80,6 +80,8 @@ public abstract class BaseAPS extends BaseBean {
             return Double.valueOf((String) value);
         } else if(value.getClass() == Double.class) {
             return (Double)value;
+        } else if (value.getClass() == Integer.class) {
+            return ((Integer)value).doubleValue();
         }
         return null;
     }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java

@@ -17,10 +17,10 @@ import java.util.function.Consumer;
  * @Modify:
  **/
 public class BeanInfo {
-    private Class<? extends BaseBean> cls;
+    private final Class<? extends BaseBean> cls;
     private BeanInfo superBeanInfo;
-    private List<BeanInfo> childsBeanInfos = new ArrayList<>();
+    private final List<BeanInfo> childsBeanInfos = new ArrayList<>();
-    private Map<Enum<?>, RelationInfo> relations = new HashMap<>();
+    private final Map<Enum<?>, RelationInfo> relations = new HashMap<>();
 
     public BeanInfo(Class<? extends BaseBean> cls) {
         this.cls = cls;
@@ -97,14 +97,6 @@ public class BeanInfo {
         return (Class<T>)cls;
     }
 
-    public BeanInfo getRelationBeanInfo(Enum<?> holder) {
-        RelationInfo relaInfo = getRelationInfo(holder);
-        if (relaInfo != null) {
-            return  relaInfo.getBeanInfo();
-        }
-        return null;
-    }
-
     public BeanInfo getRelationBeanInfo(String name) {
         RelationInfo relaInfo = getRelationInfo(name);
         if (relaInfo != null) {
@@ -130,15 +122,6 @@ public class BeanInfo {
         return RELATION_TYPE.INVALID;
     }
 
-    public RELATION_TYPE getRelationType(String name) {
-        RelationInfo relaInfo = getRelationInfo(name);
-        if (relaInfo != null) {
-            return relaInfo.getType();
-        }
-
-        return RELATION_TYPE.INVALID;
-    }
-
     private void foreach(Consumer<RelationInfo> fun) {
         for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
             fun.accept(entry.getValue());
@@ -150,9 +133,7 @@ public class BeanInfo {
 
     public List<Enum<?>> getAllHolders() {
         List<Enum<?>> holders = new ArrayList<>();
-        foreach((RelationInfo info)->{
+        foreach((RelationInfo info)-> holders.add(info.getHolder()));
-            holders.add(info.getHolder());
-        });
         return holders;
     }
 
@@ -176,8 +157,8 @@ public class BeanInfo {
         return holders;
     }
 
-    private static Map<Class<? extends BaseBean>, BeanInfo> beanInfos = new HashMap<>();
+    private static final Map<Class<? extends BaseBean>, BeanInfo> beanInfos = new HashMap<>();
-    private static Map<String, BeanInfo> nameMapBeanInfos = new HashMap<>();
+    private static final Map<String, BeanInfo> nameMapBeanInfos = new HashMap<>();
     private static IMainKeyValidatorImpl mainKeyValidator;
 
     static {
@@ -220,13 +201,11 @@ public class BeanInfo {
     }
 
     public static BeanInfo getBeanInfo(Class<? extends BaseBean> cls) {
-        BeanInfo info = beanInfos.get(cls);
+        return beanInfos.get(cls);
-        return info;
     }
 
     public static BeanInfo getBeanInfo(String name) {
-        BeanInfo info = nameMapBeanInfos.get(name);
+        return nameMapBeanInfos.get(name);
-        return info;
     }
 
     public static Class<? extends BaseBean> getSuperClass(Class<? extends BaseBean> cls) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelation.java

@@ -12,7 +12,6 @@ import java.util.function.Predicate;
  * @Reference :
  * @Author : jason.niu
  * @CreateDate : 2019-09-17
- * @Modify:
  **/
 public class BeanRelation {
     Map<Class<? extends BaseBean>, Map<Long, Map<Enum<?>, List<BaseBean>>>> caches = new HashMap<>();
@@ -23,9 +22,9 @@ public class BeanRelation {
         }
     }
 
-    private static Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
+    private static final Map<Long, BeanRelation> relations = new ConcurrentHashMap<>();
     private static BeanRelation get() {
-        Long userId = 0l;
+        Long userId = 0L;
         BeanRelation relation = relations.get(userId);
         if (relation == null) {
             synchronized (BeanRelation.class) {
@@ -41,6 +40,12 @@ public class BeanRelation {
         return relation;
     }
 
+    public static void clear() {
+        for (Map.Entry<Class<? extends BaseBean>, Map<Long, Map<Enum<?>, List<BaseBean>>>> entry : get().caches.entrySet()) {
+            entry.getValue().clear();
+        }
+    }
+
     private static Map<Enum<?>, List<BaseBean>> createRelation(Class<? extends BaseBean> cls) {
         Map<Enum<?>, List<BaseBean>> result = new HashMap<>();
         BeanInfo beanInfo = BeanInfo.getBeanInfo(cls);
@@ -56,7 +61,8 @@ public class BeanRelation {
     public static Map<Enum<?>, List<BaseBean>> get(BaseBean bean) {
         Map<Enum<?>, List<BaseBean>> temp = get().caches.get(bean.getClass()).get(bean.getId());
         if (temp == null) {
-            synchronized (bean.getClass()) {
+            synchronized (BaseBean.class) {
+                temp = get().caches.get(bean.getClass()).get(bean.getId());
                 if (temp == null) {
                     temp = createRelation(bean.getClass());
                     get().caches.get(bean.getClass()).put(bean.getId(), temp);
@@ -214,8 +220,8 @@ public class BeanRelation {
         return result;
     }
 
-    private final static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self, Predicate<T> pred,
+    private static <T extends BaseBean> boolean lastListImpl(List<T> result, BaseBean bean, BaseBean self, Predicate<T> pred,
-                                                                   Enum<?>[] holders, int index) {
+                                                             Enum<?>[] holders, int index) {
         if (index >= holders.length) {
             if (self == bean) {
                 return false;
@@ -270,10 +276,6 @@ public class BeanRelation {
 
     /**
      * 设值两个对象之间的关联
-     *
-     * @param bean
-     * @param holder
-     * @param relaBean
      */
     public static void set(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
         if (bean == null || holder == null) {
@@ -309,11 +311,6 @@ public class BeanRelation {
 
     /**
      * 建立对象之间双向引用实现
-     *
-     * @param bean
-     * @param holder
-     * @param relaBean
-     * @param reverseHolder
      */
     private static void setImpl(BaseBean bean, Enum<?> holder, BaseBean relaBean, Enum<?> reverseHolder) {
         get(bean).get(holder).add(relaBean);
@@ -324,8 +321,6 @@ public class BeanRelation {
 
     /**
      * 移除对象所有关系
-     *
-     * @param bean
      */
     public static void remove(BaseBean bean) {
         if (bean == null) {
@@ -342,9 +337,6 @@ public class BeanRelation {
 
     /**
      * 移除关联
-     *
-     * @param bean
-     * @param holder
      */
     public static void remove(BaseBean bean, Enum<?> holder) {
         if (bean == null || holder == null) {
@@ -365,10 +357,6 @@ public class BeanRelation {
 
     /**
      * 移除关联的指定对象
-     *
-     * @param bean
-     * @param holder
-     * @param relaBean
      */
     public static void remove(BaseBean bean, Enum<?> holder, BaseBean relaBean) {
         if (bean == null || holder == null) {
@@ -383,11 +371,14 @@ public class BeanRelation {
     }
 
     /**
+     * 移除关联关系中的对象，并不会移除关联的对象的关系
+     */
+    public static void erase(BaseBean bean) {
+        get().caches.get(bean.getClass()).remove(bean.getId());
+    }
+
+    /**
      * 按指定路径，递归调用lambda表达式，当lambda表达式返回false或路径存在循环则退出递归。
-     * @param bean
-     * @param fun
-     * @param holders
-     * @param <T>
      */
     public static <T extends BaseBean> void recursion(BaseBean bean, Predicate<T> fun, Enum<?>... holders) {
         if (holders.length == 0) {
@@ -398,14 +389,9 @@ public class BeanRelation {
 
     /**
      * 按指定路径，递归调用实现。采用广度优先搜索。
-     * @param bean
-     * @param fun
-     * @param holders
-     * @param index
-     * @param <T>
      */
-    private final static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
+    private static <T extends BaseBean> void recursionImpl(BaseBean bean, Predicate<T> fun,
-                                                                      Enum<?>[] holders, int index) {
+                                                           Enum<?>[] holders, int index) {
         if (index >= holders.length) {
             if (!fun.test((T) bean)) {
                 return;
@@ -415,7 +401,7 @@ public class BeanRelation {
 
         List<BaseBean> relaBeans = list(bean, holders[index]);
         for (BaseBean relaBean : relaBeans) {
-            if (relaBean.getId() != bean.getId()) {
+            if (!relaBean.getId().equals(bean.getId())) {
                 recursionImpl(relaBean, fun, holders, index + 1);
             }
         }

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanRelationUtil.java

@@ -9,7 +9,6 @@ import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.parsers.SAXParser;
 import javax.xml.parsers.SAXParserFactory;
 import java.io.File;
-import java.io.FileFilter;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.JarURLConnection;
@@ -24,11 +23,7 @@ public class BeanRelationUtil {
 
     static class XMLReader extends DefaultHandler {
         private BeanInfo firstInfo = null;
-        private Enum<?> firstHolder = null;
+
-        private BeanInfo secondInfo = null;
-        private Enum<?> secondHolder = null;
-        private RELATION_TYPE type = RELATION_TYPE.INVALID;
-        private boolean owner = false;
         public void startElement(String uri, String localName, String nodeName, Attributes attributes) throws SAXException {
             if (nodeName.equalsIgnoreCase("Class")) {
                 final String name = attributes.getValue("name");
@@ -49,8 +44,8 @@ public class BeanRelationUtil {
                 if (firstSignName == null) {
                     throw new SAXException("Relation节点缺少field属性");
                 }
-                this.firstHolder = this.firstInfo.getHolder(firstSignName);
+                Enum<?> firstHolder = this.firstInfo.getHolder(firstSignName);
-                if (this.firstHolder == null) {
+                if (firstHolder == null) {
                     throw new SAXException("未定义枚举标识" + firstSignName);
                 }
 
@@ -58,46 +53,44 @@ public class BeanRelationUtil {
                 if (secondFactoryName == null) {
                     throw new SAXException("Relation节点缺少name属性");
                 }
-                this.secondInfo = BeanInfo.getBeanInfo(secondFactoryName);
+                BeanInfo secondInfo = BeanInfo.getBeanInfo(secondFactoryName);
-                if (this.secondInfo == null) {
+                if (secondInfo == null) {
                     throw new SAXException("未找到" + secondFactoryName + "的类定义");
                 }
 
                 String secondSignName = attributes.getValue("reverse");
+                Enum<?> secondHolder = null;
                 if (secondSignName != null) {
-                    this.secondHolder = this.secondInfo.getHolder(secondSignName);
+                    secondHolder = secondInfo.getHolder(secondSignName);
-                    if (this.secondHolder == null) {
+                    if (secondHolder == null) {
                         throw new SAXException(secondFactoryName + "类未定义枚举标识" + secondSignName);
                     }
-                } else {
-                    this.secondHolder = null;
                 }
 
                 String typeName = attributes.getValue("type");
                 if (typeName == null) {
                     throw new SAXException("Relation节点缺少type属性");
                 }
-                this.type = RELATION_TYPE.valueOf(typeName);
+                RELATION_TYPE type = RELATION_TYPE.valueOf(typeName);
 
                 String ownerName = attributes.getValue("owner");
-                if (ownerName == null) {
+                boolean owner = false;
-                    this.owner = false;
+                if (ownerName != null) {
-                } else {
+                    owner = ownerName.equalsIgnoreCase("true");
-                    this.owner = ownerName.equalsIgnoreCase("true") ? true : false;
                 }
 
-                RelationInfo firstData = this.getSignData(firstInfo, this.firstHolder);
+                RelationInfo firstData = this.getSignData(firstInfo, firstHolder);
-                firstData.setBeanInfo(this.secondInfo);
+                firstData.setBeanInfo(secondInfo);
-                firstData.setType(this.type);
+                firstData.setType(type);
-                firstData.setOwner(this.owner);
+                firstData.setOwner(owner);
-                firstData.setReverseHolder(this.secondHolder);
+                firstData.setReverseHolder(secondHolder);
 
-                if (this.secondHolder != null) {
+                if (secondHolder != null) {
-                    RelationInfo secondData = this.getSignData(secondInfo, this.secondHolder);
+                    RelationInfo secondData = this.getSignData(secondInfo, secondHolder);
                     secondData.setBeanInfo(this.firstInfo);
                     secondData.setOwner(false);
-                    secondData.setReverseHolder(this.firstHolder);
+                    secondData.setReverseHolder(firstHolder);
-                    switch (this.type) {
+                    switch (type) {
                         case MULTI_TO_MULTI:
                             secondData.setType(RELATION_TYPE.MULTI_TO_MULTI);
                             break;
@@ -165,8 +158,7 @@ public class BeanRelationUtil {
                     }
                 }
             }
-        } catch (IOException e) {
+        } catch (IOException ignored) {
-            return;
         }
     }
 
@@ -176,13 +168,10 @@ public class BeanRelationUtil {
             return;
         }
 
-        File[] dirFiles = dir.listFiles(new FileFilter() {
+        File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".xml"));
-
+        if (dirFiles == null) {
-            @Override
+            return;
-            public boolean accept(File file) {
+        }
-                return file.isDirectory() || file.getName().endsWith(".xml");
-            }
-        });
 
         for (File file : dirFiles) {
             if (file.isDirectory()) {
@@ -190,7 +179,7 @@ public class BeanRelationUtil {
             } else {
                 try {
                     loadXMLConfigure(file.getCanonicalPath());
-                } catch (IOException e) {
+                } catch (IOException ignored) {
                 }
             }
         }
@@ -215,33 +204,30 @@ public class BeanRelationUtil {
 
     /**
      * 加载本地开发环境中的xml配置文件。
-     * @param xmlPath
      */
     private static void loadXMLConfigure(String xmlPath) {
         SAXParserFactory sf = SAXParserFactory.newInstance();
         try {
             SAXParser sp = sf.newSAXParser();
             sp.parse(new InputSource(xmlPath), new XMLReader());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
+        } catch (ParserConfigurationException | SAXException | IOException ignored) {
         }
     }
 
     /**
      * 加载jar中的xml配置文件。
-     * @param is
      */
     private static void loadXMLConfigure(InputStream is) {
         SAXParserFactory sf = SAXParserFactory.newInstance();
         try {
             SAXParser sp = sf.newSAXParser();
             sp.parse(new InputSource(is), new XMLReader());
-        } catch (ParserConfigurationException | SAXException | IOException e) {
+        } catch (ParserConfigurationException | SAXException | IOException ignored) {
         }
     }
 
     /**
      * 将指定包下的类加载到内存中
-     * @param packName
      */
     public static List<Class<?>> loadClass(String packName) {
         List<Class<?>> clses = new ArrayList<>();
@@ -274,13 +260,10 @@ public class BeanRelationUtil {
             return;
         }
 
-        File[] dirFiles = dir.listFiles(new FileFilter() {
+        File[] dirFiles = dir.listFiles(file -> file.isDirectory() || file.getName().endsWith(".class"));
-
+        if (dirFiles == null) {
-            @Override
+            return;
-            public boolean accept(File file) {
+        }
-                return file.isDirectory() || file.getName().endsWith(".class");
-            }
-        });
 
         for (File file : dirFiles) {
             if (file.isDirectory()) {

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/converter/CustomDateDeserializer.java

@@ -20,7 +20,7 @@ public class CustomDateDeserializer extends JsonDeserializer<Date> {
         if (!StringUtils.isEmpty(text)) {
             try {
                 return DATETIME_FORMATOR.parse(text);
-            } catch (ParseException e) {
+            } catch (ParseException ignored) {
             }
         }
         return null;

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 订单关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EBaseOrder {
     Works,
     Material,

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 规则关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EBaseRule {
 }

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

@@ -1,4 +1,11 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 班次关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EDayShift {
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导出明细关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EExportDetail {
     Project
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导出关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EExportProject {
     Link,
     Details

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

@@ -1,5 +1,14 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 炉计划关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EFurnacePlan {
-    WorkPlans
+    WorkPlans,
+    MergePlan,
+    OriginMergePlan,
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导入明细关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EImportDetail {
     Project,
     Fields

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导入字段关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EImportField {
     ImportDetail
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 导入关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EImportProject {
     Link,
     Details

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 插单关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInsertedOrder {
     ProductRouting
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 计算中间结果明细
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInterMediateDetail {
     Result
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 计算中间结果
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInterMediateResult {
     Work,
     Resource,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 库存关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EInventory {
     SafeStockOrders
 }

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

@@ -1,8 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 物料关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EMaterial {
-    Group,
-    Childs,
     ProductRoutings,
     OperInputs,
     OperOutputs,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 物料交期承诺
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EMaterialDeliveryPromise {
     Material,
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序输入关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperInput {
     Operation,
     InputMaterial,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序输出关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperOutput {
     Operation,
     OutputMaterial,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序资源关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperResource {
     Operation,
     Resource,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工序关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOperation {
     ProductRouting,
     OperInputs,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 成品检验报工关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EOrderFeedback {
     Order
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 父工作关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EParentWork {
     ProductOrder,
     Operation,

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

@@ -1,5 +1,13 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工作报工关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EPlanFeedback {
-    Work
+    Work,
+    TopOrder,
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 生产订单关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EProductOrder {
     ProductRouting,
     ParentWorks

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 工艺路线关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EProductRouting {
     Material,
     Operations,

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 资源日历关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EResCalendar {
     DayShifts,
     Resources

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

@@ -1,6 +1,16 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 资源关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EResource {
     WorkShop,
-    WorkPlans
+    WorkPlans,
+    BindResource,
+    SubBindResources,
+    ProductLine
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 规则明细关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum ERuleDetail {
     RuleGroup,
     Rule

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 规则组合关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum ERuleGroup {
     Details
 }

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

@@ -1,5 +1,12 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 安全库存关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum ESafeStockOrder {
     Inventory
 }

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

@@ -1,8 +1,15 @@
 package cn.estsh.i3plus.pojo.aps.holders;
 
+/**
+ * @Description : 运输时间关系标识
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2020-06-11
+ * @Modify:
+ **/
 public enum EShippingTime {
-    PrevRes,    // 前资源
+    PrevRes,
-    PostRes,    // 后资源
+    PostRes,
-    PrevStand,  // 前标准工序
+    PrevStand,
-    PostStand   // 后标准工序
+    PostStand
 }