功能测试完成

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/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;
@@ -120,6 +121,7 @@ public class BaseOrder extends BaseAPS {
         return BeanRelation.list(this, EBaseOrder.Works);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EBaseOrder.Material);
     }
@@ -139,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/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;
@@ -57,6 +58,7 @@ public class ExportDetail extends BaseAPS {
     @FieldAnnotation(relation = "Project")
     private Long projectId;
 
+    @JsonIgnore
     public ExportProject getProject() {
         return BeanRelation.get(this, EExportDetail.Project);
     }

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

@@ -46,6 +46,7 @@ public class ExportProject extends BaseAPS {
     @ApiParam(value ="当前执行的明细名称")
     private transient String curDetailName;
 
+    @JsonIgnore
     public DataLink getLink() {
         return BeanRelation.get(this, EExportProject.Link);
     }

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,6 +32,7 @@ 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;
 
@@ -56,6 +59,7 @@ public class FurnacePlan extends BaseAPS {
     @JsonBackReference
     public List<WorkPlan> getWorkPlans() { return BeanRelation.list(this, EFurnacePlan.WorkPlans); }
 
+    @JsonIgnore
     public FurnacePlan getMergePlan() {
         return BeanRelation.get(this, EFurnacePlan.MergePlan);
     }

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/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;
@@ -123,6 +124,7 @@ public class ImportDetail extends BaseAPS {
     @FieldAnnotation(property = false)
     private transient ImportDataModel model;
 
+    @JsonIgnore
     public ImportProject getProject() {
         return BeanRelation.get(this, EImportDetail.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;
@@ -83,6 +84,7 @@ public class ImportField extends BaseAPS {
     @FieldAnnotation(relation = "ImportDetail", notEmpty = true)
     private Long importDetailId;
 
+    @JsonIgnore
     public ImportDetail getImportDetail() {
         return BeanRelation.get(this, EImportField.ImportDetail);
     }

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;
@@ -45,6 +46,7 @@ public class ImportProject extends BaseAPS {
     @ApiParam(value ="当前执行的明细名称")
     private transient String curDetailName;
 
+    @JsonIgnore
     public DataLink getLink() {
         return BeanRelation.get(this, EImportProject.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;
 
@@ -58,6 +60,7 @@ public class InsertedOrder extends BaseOrder  {
     @ApiParam(value ="备注")
     private String remark;
 
+    @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EInsertedOrder.ProductRouting);
     }

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,6 +42,7 @@ 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) {

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,6 +47,7 @@ public class InterMediateResult extends BaseAPS {
     @ApiParam(value ="评估值")
     private Double evaluateValue;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EInterMediateResult.Work);
     }
@@ -55,6 +57,7 @@ public class InterMediateResult extends BaseAPS {
         BeanRelation.set(this, EInterMediateResult.Work, work);
     }
 
+    @JsonIgnore
     public Resource getResource() { return BeanRelation.get(this, EInterMediateResult.Resource); }
 
     public void setResource(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;
 

modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.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.annotation.RippleAnnotation;
@@ -12,6 +13,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,6 +37,7 @@ 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;
 
@@ -208,6 +211,7 @@ 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) {

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;
@@ -43,6 +44,7 @@ public class MaterialDeliveryPromise extends BaseBean {
     @FieldAnnotation(relation = "Material", notEmpty = true)
     private Long materialId;
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EMaterialDeliveryPromise.Material);
     }

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,6 +30,7 @@ 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;
 
@@ -71,6 +74,7 @@ public class OperInput extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EOperInput.Operation);
     }
@@ -80,6 +84,7 @@ public class OperInput extends BaseAPS {
         BeanRelation.set(this, EOperInput.Operation, oper);
     }
 
+    @JsonIgnore
     public Material getInputMaterial() {
         return BeanRelation.get(this, EOperInput.InputMaterial);
     }

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,6 +29,7 @@ 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;
 
@@ -55,6 +58,7 @@ public class OperOutput extends BaseAPS {
     @FieldAnnotation(defaultValue = "0.0")
     private Double fixScrapCount;
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EOperOutput.Operation);
     }
@@ -64,6 +68,7 @@ public class OperOutput extends BaseAPS {
         BeanRelation.set(this, EOperOutput.Operation, oper);
     }
 
+    @JsonIgnore
     public Material getOutputMaterial() {
         return BeanRelation.get(this, EOperOutput.OutputMaterial);
     }

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,6 +30,7 @@ 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;
 
@@ -84,6 +87,7 @@ public class OperResource extends BaseAPS {
     @ApiParam(value ="资源使用配套号")
     private String userMatchNumber;
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EOperResource.Operation);
     }
@@ -93,6 +97,7 @@ public class OperResource extends BaseAPS {
         BeanRelation.set(this, EOperResource.Operation, oper);
     }
 
+    @JsonIgnore
     public Resource getResource() {
         return BeanRelation.get(this, EOperResource.Resource);
     }

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,6 +30,7 @@ import java.util.List;
 @Entity
 @Table(name = "APS_OPERATION")
 @Api("工序")
+@ClassLevelAnnotation(level = 3)
 public class Operation extends BaseAPS {
     private static final long serialVersionUID = 4394179144091116858L;
 
@@ -75,6 +78,7 @@ public class Operation extends BaseAPS {
     @FieldAnnotation(editType = ApsEnumUtil.EDIT_TYPE.DURATION)
     private String minSpaceTime;
 
+    @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EOperation.ProductRouting);
     }
@@ -99,6 +103,7 @@ public class Operation extends BaseAPS {
         return BeanRelation.list(this, EOperation.OperResources);
     }
 
+    @JsonIgnore
     public StandOperation getStandOperation() {
         return BeanRelation.get(this, EOperation.StandOperation);
     }

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;
@@ -62,6 +63,7 @@ public class OrderFeedback extends BaseAPS {
     @ApiParam(value ="累加合格数量")
     private Double addQualifiedCount;
 
+    @JsonIgnore
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EOrderFeedback.Order);
     }

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,6 +33,7 @@ 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;
 
@@ -58,6 +61,7 @@ public class ParentWork extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operationId;
 
+    @JsonIgnore
     public BaseOrder getProductOrder() {
         return BeanRelation.get(this, EParentWork.ProductOrder);
     }
@@ -67,6 +71,7 @@ public class ParentWork extends BaseAPS {
         BeanRelation.set(this, EParentWork.ProductOrder, order);
     }
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EParentWork.Operation);
     }

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

@@ -8,6 +8,7 @@ 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;
@@ -59,6 +60,7 @@ public class PlanFeedback extends BaseAPS {
     @ApiParam(value ="备注")
     private String remark;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EPlanFeedback.Work);
     }
@@ -68,6 +70,7 @@ public class PlanFeedback extends BaseAPS {
         BeanRelation.set(this, EPlanFeedback.Work, work);
     }
 
+    @JsonIgnore
     public BaseOrder getTopOrder() { return BeanRelation.get(this, EPlanFeedback.TopOrder); }
 
     public void setTopOrder(BaseOrder 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/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,6 +31,7 @@ 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;
 
@@ -109,6 +112,7 @@ public class ProductOrder extends BaseOrder {
     @FieldAnnotation(property = false)
     private Long srcInsertedOrder;
 
+    @JsonIgnore
     public ProductRouting getProductRouting() {
         return BeanRelation.get(this, EProductOrder.ProductRouting);
     }

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,6 +34,7 @@ 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;
 
@@ -63,6 +66,7 @@ public class ProductRouting extends BaseAPS {
     @FieldAnnotation(defaultValue = "10")
     private Integer priority;
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EProductRouting.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 ="资源编码")

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;
@@ -33,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)
@@ -104,6 +108,7 @@ public class Resource extends BaseAPS {
     @FieldAnnotation(relation = "Order", modify = false)
     private Long bindResourceId;
 
+    @JsonIgnore
     public WorkShop getWorkShop() { return BeanRelation.get(this, EResource.WorkShop); }
 
     public void setWorkShop(WorkShop workShop) {
@@ -114,6 +119,7 @@ public class Resource extends BaseAPS {
     @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) {

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,6 +28,7 @@ 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;
 
@@ -55,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;

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;

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,6 +59,7 @@ 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) {
@@ -65,6 +67,7 @@ public class ShippingTime extends BaseAPS {
         BeanRelation.set(this, EShippingTime.PrevRes, res);
     }
 
+    @JsonIgnore
     public Resource getPostRes() { return BeanRelation.get(this, EShippingTime.PostRes); }
 
     public void setPostRes(Resource res) {
@@ -72,6 +75,7 @@ public class ShippingTime extends BaseAPS {
         BeanRelation.set(this, EShippingTime.PostRes, res);
     }
 
+    @JsonIgnore
     public StandOperation getPrevStand() { return BeanRelation.get(this, EShippingTime.PrevStand);}
 
     public void setPrevStand(StandOperation stand) {
@@ -79,6 +83,7 @@ public class ShippingTime extends BaseAPS {
         BeanRelation.set(this, EShippingTime.PrevStand, stand);
     }
 
+    @JsonIgnore
     public StandOperation getPostStand() { return BeanRelation.get(this, EShippingTime.PostStand); }
 
     public void setPostStand(StandOperation 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)
@@ -77,6 +81,7 @@ 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) {

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;

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,6 +38,7 @@ 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;
 
@@ -195,6 +198,7 @@ public class Work extends BaseAPS {
     // 排程时确定工作是正向排程还是逆向排程。
     private transient boolean positive = true;
 
+    @JsonIgnore
     public BaseOrder getOrder() {
         return BeanRelation.get(this, EWork.Order);
     }
@@ -204,6 +208,7 @@ public class Work extends BaseAPS {
         BeanRelation.set(this, EWork.Order, order);
     }
 
+    @JsonIgnore
     public Operation getOperation() {
         return BeanRelation.get(this, EWork.Operation);
     }
@@ -213,6 +218,7 @@ public class Work extends BaseAPS {
         BeanRelation.set(this, EWork.Operation, oper);
     }
 
+    @JsonIgnore
     public Operation getOriginOperation() {
         return BeanRelation.get(this, EWork.OriginOperation);
     }
@@ -222,6 +228,7 @@ public class Work extends BaseAPS {
         BeanRelation.set(this, EWork.OriginOperation, oper);
     }
 
+    @JsonIgnore
     public ParentWork getParentWork() {
         return BeanRelation.get(this, EWork.ParentWork);
     }
@@ -272,6 +279,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);
     }
@@ -291,6 +299,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,6 +64,7 @@ public class WorkInput extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operInputId;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EWorkInput.Work);
     }
@@ -74,6 +79,7 @@ public class WorkInput extends BaseAPS {
         return BeanRelation.list(this, EWorkInput.WorkRelations);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EWorkInput.Material);
     }
@@ -83,6 +89,7 @@ public class WorkInput extends BaseAPS {
         BeanRelation.set(this, EWorkInput.Material, material);
     }
 
+    @JsonIgnore
     public OperInput getOperInput() {
         return BeanRelation.get(this, EWorkInput.OperInput);
     }

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,6 +65,7 @@ public class WorkOutput extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long operOutputId;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EWorkOutput.Work);
     }
@@ -76,6 +80,7 @@ public class WorkOutput extends BaseAPS {
         return BeanRelation.list(this, EWorkOutput.WorkRelations);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EWorkOutput.Material);
     }
@@ -85,6 +90,7 @@ public class WorkOutput extends BaseAPS {
         BeanRelation.set(this, EWorkOutput.Material, material);
     }
 
+    @JsonIgnore
     public OperOutput getOperOutput() {
         return BeanRelation.get(this, EWorkOutput.OperOutput);
     }

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,6 +37,7 @@ 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;
 
@@ -139,6 +142,7 @@ public class WorkPlan extends BaseAPS {
     @ApiParam(value ="调整时间")
     private Date adjustDate;
 
+    @JsonIgnore
     public Work getWork() { return BeanRelation.get(this, EWorkPlan.Work); }
 
     public void setWork(Work work) {
@@ -146,6 +150,7 @@ public class WorkPlan extends BaseAPS {
         BeanRelation.set(this, EWorkPlan.Work, work);
     }
 
+    @JsonIgnore
     public Resource getResource() { return BeanRelation.get(this, EWorkPlan.Resource); }
 
     public void setResource(Resource resource) {
@@ -153,6 +158,7 @@ public class WorkPlan extends BaseAPS {
         BeanRelation.set(this, EWorkPlan.Resource, resource);
     }
 
+    @JsonIgnore
     public WorkResource getWorkResource() { return BeanRelation.get(this, EWorkPlan.WorkResource); }
 
     public void setWorkResource(WorkResource workResource) {
@@ -160,6 +166,7 @@ public class WorkPlan extends BaseAPS {
         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,6 +98,7 @@ public class WorkRelation extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long workOutputId;
 
+    @JsonIgnore
     public WorkInput getWorkInput() {
         return BeanRelation.get(this, EWorkRelation.WorkInput);
     }
@@ -106,6 +108,7 @@ public class WorkRelation extends BaseAPS {
         BeanRelation.set(this, EWorkRelation.WorkInput, input);
     }
 
+    @JsonIgnore
     public WorkOutput getWorkOutput() {
         return BeanRelation.get(this, EWorkRelation.WorkOutput);
     }
@@ -115,6 +118,7 @@ public class WorkRelation extends BaseAPS {
         BeanRelation.set(this, EWorkRelation.WorkOutput, output);
     }
 
+    @JsonIgnore
     public Work getPrevWork() {
         return BeanRelation.get(this, EWorkRelation.PrevWork);
     }
@@ -124,6 +128,7 @@ public class WorkRelation extends BaseAPS {
         BeanRelation.set(this, EWorkRelation.PrevWork, work);
     }
 
+    @JsonIgnore
     public Work getPostWork() {
         return BeanRelation.get(this, EWorkRelation.PostWork);
     }
@@ -133,6 +138,7 @@ public class WorkRelation extends BaseAPS {
         BeanRelation.set(this, EWorkRelation.PostWork, work);
     }
 
+    @JsonIgnore
     public BaseOrder getPrevOrder() {
         return BeanRelation.get(this, EWorkRelation.PrevOrder);
     }
@@ -142,6 +148,7 @@ public class WorkRelation extends BaseAPS {
         BeanRelation.set(this, EWorkRelation.PrevOrder, order);
     }
 
+    @JsonIgnore
     public BaseOrder getPostOrder() {
         return BeanRelation.get(this, EWorkRelation.PostOrder);
     }
@@ -151,6 +158,7 @@ public class WorkRelation extends BaseAPS {
         BeanRelation.set(this, EWorkRelation.PostOrder, order);
     }
 
+    @JsonIgnore
     public Material getMaterial() {
         return BeanRelation.get(this, EWorkRelation.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")
@@ -104,6 +107,7 @@ public class WorkResource extends BaseAPS {
     @FieldAnnotation(property = false)
     private Long resCapacityId = 0L;
 
+    @JsonIgnore
     public Work getWork() {
         return BeanRelation.get(this, EWorkResource.Work);
     }
@@ -113,6 +117,7 @@ public class WorkResource extends BaseAPS {
         BeanRelation.set(this, EWorkResource.Work, work);
     }
 
+    @JsonIgnore
     public Resource getResource() {
         return BeanRelation.get(this, EWorkResource.Resource);
     }
@@ -122,6 +127,7 @@ public class WorkResource extends BaseAPS {
         BeanRelation.set(this, EWorkResource.Resource, res);
     }
 
+    @JsonIgnore
     public OperResource getOperResource() {
         return BeanRelation.get(this, EWorkResource.OperResource);
     }

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

@@ -27,7 +27,6 @@ import java.util.HashMap;
 public abstract class BaseAPS extends BaseBean {
     private static final long serialVersionUID = -8638842158403944318L;
 
-    @JsonIgnore
     @Lob
     @FieldAnnotation(property = false)
     private HashMap<String, Object> customFields = new HashMap<>();

modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ApsEnumUtil.java

@@ -365,6 +365,7 @@ public class ApsEnumUtil {
         POST_SET_TIME("POST_SET_TIME", "后设置时间"),
         WORK_WAIT_TIME("WORK_WAIT_TIME", "工作等待时间"),
         WAIT_TIME_LIMIT("WAIT_TIME_LIMIT", "等待时间限制"),
+        WAIT_END_SUB_LEFT("WAIT_END_SUB_LEFT", "工作结束时间减去左边界"),
         RES_BALANCE("RES_BALANCE", "资源均衡度"),
         SAME_MATERIAL("SAME_MATERIAL", "相同物料"),
         SAME_ORDER("SAME_ORDER", "相同订单"),