Merge remote-tracking branch 'origin/dev' into dev

6 years ago · 01ea2f511c
parent 77a8cdebd5 16bb46df55
commit 01ea2f511c
42 changed files with 436 additions and 52 deletions
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java
@ -5,11 +5,13 @@ import cn.estsh.i3plus.pojo.aps.common.BaseAPS;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EBaseOrder;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

 import javax.persistence.Column;
+import javax.persistence.MappedSuperclass;
 import java.util.Date;
 import java.util.List;

@ -21,6 +23,7 @@ import java.util.List;
 * @Modify:
 **/
@Data
+@MappedSuperclass
@Api("订单基类")
 public class BaseOrder extends BaseCode {
    @Column(name="COUNT")
@ -31,12 +34,12 @@ public class BaseOrder extends BaseCode {
    @ApiParam(value ="优先级")
    private Integer priority;

-    @Column(name="最晚结束时刻")
-    @ApiParam(value ="工作筛选")
+    @Column(name="LET")
+    @ApiParam(value ="最晚结束时刻")
    private Date let;

-    @Column(name="最早开始时刻计算值")
-    @ApiParam(value ="工作筛选")
+    @Column(name="CALC_EST")
+    @ApiParam(value ="最早开始时刻计算值")
    private Date calcEst;

    @Column(name="CALC_LET")
@ -60,6 +63,7 @@ public class BaseOrder extends BaseCode {
    @FieldAnnotation(property = false)
    private Long materialId;

+    @JsonBackReference
    public List<Work> getWorks() {
        return BeanRelation.list(this, EBaseOrder.Works);
    }
@ -73,18 +77,22 @@ public class BaseOrder extends BaseCode {
        BeanRelation.set(this, EBaseOrder.Material, material);
    }

+    @JsonBackReference
    public List<WorkRelation> getPrevRelations() {
        return BeanRelation.list(this, EBaseOrder.PrevRelations);
    }

+    @JsonBackReference
    public List<WorkRelation> getPostRelations() {
        return BeanRelation.list(this, EBaseOrder.PostRelations);
    }

+    @JsonBackReference
    public List<BaseOrder> getUpperOrders() {
        return BeanRelation.list(this, EBaseOrder.UpperOrders);
    }

+    @JsonBackReference
    public List<BaseOrder> getLowerOrders() {
        return BeanRelation.list(this, EBaseOrder.LowerOrders);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ExportProject.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.EExportProject;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
@ -45,6 +46,7 @@ public class ExportProject extends BaseAPS {
        BeanRelation.set(this, EExportProject.Link, link);
    }

+    @JsonBackReference
    public List<ExportDetail> getDetails() {
        return BeanRelation.list(this, EExportProject.Details);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ImportProject.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.EImportProject;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -43,6 +44,7 @@ public class ImportProject extends BaseAPS {
        BeanRelation.set(this, EImportProject.Link, link);
    }

+    @JsonBackReference
    public List<ImportDetail> getDetails() {
        return BeanRelation.list(this, EImportProject.Details);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Inventory.java
@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;

 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;
@ -38,6 +39,7 @@ public class Inventory extends BaseOrder {
    @ApiParam(value ="多余量")
    private Double excessCount;

+    @JsonIgnore
    public Work getWork() {
        return BeanRelation.get(this, EBaseOrder.Works);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Material.java
@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.enums.MATERIAL_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.PREPARE_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.REPLENISHMENT_TYPE;
 import cn.estsh.i3plus.pojo.aps.holders.EMaterial;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -107,30 +108,37 @@ public class Material extends BaseCode {
    @ApiParam(value ="最大库存数量")
    private Double maxStockCount;

+    @JsonBackReference
    public List<ProductRouting> getProductRoutings() {
        return BeanRelation.list(this, EMaterial.ProductRoutings);
    }

+    @JsonBackReference
    public List<OperInput> getOperInputs() {
        return BeanRelation.list(this, EMaterial.OperInputs);
    }

+    @JsonBackReference
    public List<OperOutput> getOperOutputs() {
        return BeanRelation.list(this, EMaterial.OperOutputs);
    }

+    @JsonBackReference
    public List<WorkInput> getWorkInputs() {
        return BeanRelation.list(this, EMaterial.WorkInputs);
    }

+    @JsonBackReference
    public List<WorkOutput> getWorkOutputs() {
        return BeanRelation.list(this, EMaterial.WorkOutputs);
    }

+    @JsonBackReference
    public List<WorkRelation> getWorkRelations() {
        return BeanRelation.list(this, EMaterial.WorkRelations);
    }

+    @JsonBackReference
    public List<BaseOrder> getOrders() {
        return BeanRelation.list(this, EMaterial.Orders);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperInput.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.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.holders.EOperInput;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -78,6 +79,7 @@ public class OperInput extends BaseAPS {
        BeanRelation.set(this, EOperInput.Material, material);
    }

+    @JsonBackReference
    public List<WorkInput> getWorkInputs() {
        return BeanRelation.list(this, EOperInput.WorkInputs);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperOutput.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.EOperOutput;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -65,6 +66,7 @@ public class OperOutput extends BaseAPS {
        BeanRelation.set(this, EOperOutput.Material, material);
    }

+    @JsonBackReference
    public List<WorkOutput> getWorkOutputs() {
        return BeanRelation.list(this, EOperOutput.WorkOutputs);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/OperResource.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.enums.USE_TYPE;
 import cn.estsh.i3plus.pojo.aps.holders.EOperResource;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -86,6 +87,7 @@ public class OperResource extends BaseAPS {
        BeanRelation.set(this, EOperResource.Resource, res);
    }

+    @JsonBackReference
    public List<WorkResource> getWorkResources() {
        return BeanRelation.list(this, EOperResource.WorkResources);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Operation.java
@ -6,10 +6,10 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.CONSTRAINT_TYPE;
 import cn.estsh.i3plus.pojo.aps.enums.TAIL_DEAL;
 import cn.estsh.i3plus.pojo.aps.holders.EOperation;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
-import org.springframework.context.annotation.Bean;

 import javax.persistence.Column;
 import javax.persistence.Entity;
@ -96,15 +96,18 @@ public class Operation extends BaseAPS {
        BeanRelation.set(this, EOperation.ProductRouting, routing);
    }

+    @JsonBackReference
    public List<OperInput> getOperInputs() {
        return BeanRelation.list(this, EOperation.OperInputs);
    }

+    @JsonBackReference
    public List<OperOutput> getOperOutputs() {
        return BeanRelation.list(this, EOperation.OperOutputs);
    }

-    public List<Resource> getOperResources() {
+    @JsonBackReference
+    public List<OperResource> getOperResources() {
        return BeanRelation.list(this, EOperation.OperResources);
    }

@ -116,8 +119,4 @@ public class Operation extends BaseAPS {
        this.standOperationId = std != null ? std.getId() : 0l;
        BeanRelation.set(this, EOperation.StandOperation, std);
    }
-
-    public List<Work> getWorks() {
-        return BeanRelation.list(this, EOperation.Works);
-    }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java
@ -0,0 +1,67 @@
+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.aps.common.BeanRelation;
+import cn.estsh.i3plus.pojo.aps.holders.EParentWork;
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.Table;
+import java.util.List;
+
+/**
+ * @Description :父工作
+ * 父工作用于记录工作分割前的信息。
+ * 生产订单应关联父工作，父工作关联多个工作。
+ * @Reference :
+ * @Author : jason.niu
+ * @CreateDate : 2019-09-17
+ * @Modify:
+ **/
+@Data
+@Entity
+@Table(name = "APS_PARENT_WORK")
+@Api("父工作")
+public class ParentWork extends BaseAPS {
+    @Column(name="count")
+    @ApiParam(value ="数量")
+    private Double count;
+
+    @Column(name="PRODUCT_ORDER_ID")
+    @ApiParam(value ="订单")
+    @FieldAnnotation(property = false)
+    private Long productOrderId;
+
+    @Column(name="OPERATION_ID")
+    @ApiParam(value ="工序")
+    @FieldAnnotation(property = false)
+    private Long operationId;
+
+    public BaseOrder getProductOrder() {
+        return BeanRelation.get(this, EParentWork.ProductOrder);
+    }
+
+    public void setProductOrder(ProductOrder order) {
+        this.productOrderId = order != null ? order.getId() : 0l;
+        BeanRelation.set(this, EParentWork.ProductOrder, order);
+    }
+
+    public Operation getOperation() {
+        return BeanRelation.get(this, EParentWork.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EParentWork.Operation, oper);
+    }
+
+    @JsonBackReference
+    public List<Work> getWorks() {
+        return BeanRelation.list(this, EParentWork.Works);
+    }
+}
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java
@ -4,6 +4,7 @@ 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 com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -12,6 +13,7 @@ import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
 import java.util.Date;
+import java.util.List;

 /**
 * @Description :生产订单
@ -85,6 +87,10 @@ public class ProductOrder extends BaseOrder {
    @ApiParam(value ="缺少量")
    private Double lackCount;

+    @Column(name="AUTO_SUPPLY")
+    @ApiParam(value ="物料计算时自动补充")
+    private Boolean autoSupply;
+
    @Column(name="PRODUCT_ROUTING_ID")
    @ApiParam(value ="工艺路线")
    @FieldAnnotation(property = false)
@ -98,4 +104,7 @@ public class ProductOrder extends BaseOrder {
        this.productRoutingId = routing != null ? routing.getId() : 0l;
        BeanRelation.set(this, EProductOrder.ProductRouting, routing);
    }
+
+    @JsonBackReference
+    public List<ParentWork> getParentWorks() { return BeanRelation.list(this, EProductOrder.ParentWorks); }
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductRouting.java
@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.annotation.FieldAnnotation;
 import cn.estsh.i3plus.pojo.aps.common.BaseCode;
 import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.holders.EProductRouting;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -52,10 +53,12 @@ public class ProductRouting extends BaseCode {
        BeanRelation.set(this, EProductRouting.Material, material);
    }

+    @JsonBackReference
    public List<Operation> getOperations() {
        return BeanRelation.list(this, EProductRouting.Operations);
    }

+    @JsonBackReference
    public List<ProductOrder> getProductOrders() {
        return BeanRelation.list(this, EProductRouting.ProductOrders);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/PurchaseOrder.java
@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;

 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;
@ -46,6 +47,11 @@ public class PurchaseOrder extends BaseOrder {
    @ApiParam(value ="多余量")
    private Double excessCount;

+    @Column(name="AUTO_SUPPLY")
+    @ApiParam(value ="物料计算时自动补充")
+    private Boolean autoSupply;
+
+    @JsonIgnore
    public Work getWork() {
        return BeanRelation.get(this, EBaseOrder.Works);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java
@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.bean;

 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;
@ -43,6 +44,7 @@ public class SalesOrder extends BaseOrder {
    @ApiParam(value ="提前期计算值")
    private String calcLeadTime;

+    @JsonIgnore
    public Work getWork() {
        return BeanRelation.get(this, EBaseOrder.Works);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/Work.java
@ -6,6 +6,7 @@ import cn.estsh.i3plus.pojo.aps.common.BeanRelation;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_STATUS;
 import cn.estsh.i3plus.pojo.aps.enums.WORK_TYPE;
 import cn.estsh.i3plus.pojo.aps.holders.EWork;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -106,6 +107,11 @@ public class Work extends BaseCode {
    @FieldAnnotation(property = false)
    private Long operationId;

+    @Column(name="PARENT_WORK_ID")
+    @ApiParam(value ="父工作")
+    @FieldAnnotation(property = false)
+    private Long parentWorkId;
+
    public BaseOrder getOrder() {
        return BeanRelation.get(this, EWork.Order);
    }
@ -115,35 +121,50 @@ public class Work extends BaseCode {
        BeanRelation.set(this, EWork.Order, order);
    }

+    public Operation getOperation() {
+        return BeanRelation.get(this, EWork.Operation);
+    }
+
+    public void setOperation(Operation oper) {
+        this.operationId = oper != null ? oper.getId() : 0l;
+        BeanRelation.set(this, EWork.Operation, oper);
+    }
+
+    public ParentWork getParentWork() {
+        return BeanRelation.get(this, EWork.ParentWork);
+    }
+
+    public void setParentWork(ParentWork parentWork) {
+        this.parentWorkId = parentWork != null ? parentWork.getId() : 0l;
+        BeanRelation.set(this, EWork.ParentWork, parentWork);
+    }
+
+    @JsonBackReference
    public List<WorkResource> getWorkResources() {
        return BeanRelation.list(this, EWork.WorkResources);
    }

+    @JsonBackReference
    public List<WorkInput> getWorkInputs() {
        return BeanRelation.list(this, EWork.WorkInputs);
    }

+    @JsonBackReference
    public List<WorkOutput> getWorkOutputs() {
        return BeanRelation.list(this, EWork.WorkOutputs);
    }

+    @JsonBackReference
    public List<WorkRelation> getWorkRelationInputs() {
        return BeanRelation.list(this, EWork.WorkRelationInputs);
    }

+    @JsonBackReference
    public List<WorkRelation> getWorkRelationOutputs() {
        return BeanRelation.list(this, EWork.WorkRelationOutputs);
    }

-    public Operation getOperation() {
-        return BeanRelation.get(this, EWork.Operation);
-    }
-
-    public void setOperation(Operation oper) {
-        this.operationId = oper != null ? oper.getId() : 0l;
-        BeanRelation.set(this, EWork.Operation, oper);
-    }
-
+    @JsonBackReference
    public List<PlanFeedback> getPlanFeedbacks() {
        return BeanRelation.list(this, EWork.PlanFeedbacks);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.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.EWorkInput;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -62,6 +63,7 @@ public class WorkInput extends BaseAPS {
        BeanRelation.set(this, EWorkInput.Work, work);
    }

+    @JsonBackReference
    public List<WorkRelation> getWorkRelations() {
        return BeanRelation.list(this, EWorkInput.WorkRelations);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkOutput.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.EWorkOutput;
+import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;
@ -63,6 +64,7 @@ public class WorkOutput extends BaseAPS {
        BeanRelation.set(this, EWorkOutput.Work, work);
    }

+    @JsonBackReference
    public List<WorkRelation> getWorkRelations() {
        return BeanRelation.list(this, EWorkOutput.WorkRelations);
    }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/BeanInfo.java
@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.aps.enums.FIELD_TYPE;
 import cn.estsh.i3plus.pojo.base.bean.BaseBean;

 import java.util.*;
+import java.util.function.Consumer;

 public class BeanInfo {
    private Class<? extends BaseBean> cls;
@ -103,6 +104,14 @@ public class BeanInfo {
        return null;
    }

+    public Class<? extends BaseBean> getRelationClass(Enum<?> holder) {
+        RelationInfo relaInfo = getRelationInfo(holder);
+        if (relaInfo != null) {
+            return relaInfo.getBeanInfo().getBeanClass();
+        }
+        return null;
+    }
+
    public RELATION_TYPE getRelationType(Enum<?> holder) {
        RelationInfo relaInfo = getRelationInfo(holder);
        if (relaInfo != null) {
@ -120,31 +129,40 @@ public class BeanInfo {
        return RELATION_TYPE.INVALID;
    }

-    public List<Enum<?>> getAllHolders() {
-        List<Enum<?>> holders = new ArrayList<>();
+    private void foreach(Consumer<RelationInfo> fun) {
        for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
-            holders.add(entry.getKey());
+            fun.accept(entry.getValue());
+        }
+        if (this.superBeanInfo != null) {
+            this.superBeanInfo.foreach(fun);
        }
+    }
+
+    public List<Enum<?>> getAllHolders() {
+        List<Enum<?>> holders = new ArrayList<>();
+        foreach((RelationInfo info)->{
+            holders.add(info.getHolder());
+        });
        return holders;
    }

    public List<Enum<?>> getOwnerHolders() {
        List<Enum<?>> owners = new ArrayList<>();
-        for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
-            if (entry.getValue().isOwner()) {
-                owners.add(entry.getKey());
-            }
+        foreach((RelationInfo info)->{
+            if (info.isOwner()) {
+                owners.add(info.getHolder());
            }
+        });
        return owners;
    }

    public List<Enum<?>> getNormalSigns() {
        List<Enum<?>> holders = new ArrayList<>();
-        for (Map.Entry<Enum<?>, RelationInfo> entry : relations.entrySet()) {
-            if (!entry.getValue().isOwner()) {
-                holders.add(entry.getKey());
-            }
+        foreach((RelationInfo info)->{
+            if (!info.isOwner()) {
+                holders.add(info.getHolder());
            }
+        });
        return holders;
    }

--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/common/DateDuration.java
@ -25,7 +25,7 @@ public class DateDuration {

    public static final double PRECISION = 0.00001;
    private String value;
-    private int time = 0;
+    private long time = 0;
    private double rate = 0.0;
    private boolean bValid = false;

@ -60,7 +60,7 @@ public class DateDuration {
     * 对于无效的时间区间，返回0。单位为秒。
     * @return
     */
-    public int getTime() {
+    public long getTime() {
        return this.time;
    }

@ -68,7 +68,7 @@ public class DateDuration {
     * 设置新的时间区间。
     * @return
     */
-    public void setTime(int time) {
+    public void setTime(long time) {
        this.time = time;
    }

@ -92,25 +92,25 @@ public class DateDuration {
            return "0S";
        }

-        int iMaxTimeUnit = 4;
+        long iMaxTimeUnit = 4;
        StringBuffer strExtraString = new StringBuffer();
-        int extraTime = this.time;
+        long extraTime = this.time;
        if (iMaxTimeUnit >= 4) {
-            int i = extraTime / 86400;
+            long i = extraTime / 86400;
            if (i > 0) {
                strExtraString.append(i).append("D");
            }
            extraTime -= i * 86400;
        }
        if (iMaxTimeUnit >= 3) {
-            int i = extraTime / 3600;
+            long i = extraTime / 3600;
            if (i > 0) {
                strExtraString.append(i).append("H");
            }
            extraTime -= i * 3600;
        }
        if (iMaxTimeUnit >= 2) {
-            int i = extraTime / 60;
+            long i = extraTime / 60;
            if (i > 0) {
                strExtraString.append(i).append("M");
            }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java
@ -10,5 +10,6 @@ package cn.estsh.i3plus.pojo.aps.enums;
 public enum MATERIAL_TYPE {
    PRODUCT,        // 成品
    HALF_PRODUCT,   // 半成品
-    RAW_MATERIAL    // 原材料
+    RAW_MATERIAL,    // 原材料
+    VIRTUAL         // 虚拟件
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EOperation.java
@ -5,6 +5,5 @@ public enum EOperation {
    OperInputs,
    OperOutputs,
    OperResources,
-    StandOperation,
-    Works
+    StandOperation
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java
@ -0,0 +1,7 @@
+package cn.estsh.i3plus.pojo.aps.holders;
+
+public enum EParentWork {
+    ProductOrder,
+    Operation,
+    Works
+}
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EProductOrder.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.aps.holders;

 public enum EProductOrder {
-    ProductRouting
+    ProductRouting,
+    ParentWorks
 }
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EWork.java
@ -2,6 +2,7 @@ package cn.estsh.i3plus.pojo.aps.holders;

 public enum EWork {
    Order,
+    ParentWork,
    WorkResources,
    WorkInputs,
    WorkOutputs,
--- a/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java
+++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java
@ -0,0 +1,9 @@
+package cn.estsh.i3plus.pojo.aps.repository;
+
+import cn.estsh.i3plus.pojo.aps.bean.ParentWork;
+import org.springframework.data.repository.CrudRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ParentWorkRepository extends CrudRepository<ParentWork, Long> {
+}
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml
@ -8,6 +8,4 @@
    </Relation>
    <Relation field="PostRelations" name="WorkRelation" reverse="PostOrder" type="ONE_TO_MULTI" owner="false">
    </Relation>
-    <Relation field="UpperOrders" name="BaseOrder" reverse="LowerOrders" type="MULTI_TO_MULTI" owner="false">
-    </Relation>
 </Class>
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Class name="ParentWork">
+    <Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
+    </Relation>
+    <Relation field="Works" name="Work" reverse="ParentWork" type="ONE_TO_MULTI" owner="true">
+    </Relation>
+</Class>
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml
@ -1,3 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Class name="ProductOrder" extends="BaseOrder">
+    <Relation field="ParentWorks" name="ParentWork" reverse="ProductOrder" type="ONE_TO_MULTI" owner="true">
+    </Relation>
 </Class>
--- a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
+++ b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml
@ -10,7 +10,7 @@
    </Relation>
    <Relation field="WorkRelationInputs" name="WorkRelation" reverse="PostWork" type="ONE_TO_MULTI" owner="false">
    </Relation>
-    <Relation field="Operation" name="Operation" reverse="Works" type="MULTI_TO_ONE" owner="false">
+    <Relation field="Operation" name="Operation" type="MULTI_TO_ONE" owner="false">
    </Relation>
    <Relation field="PlanFeedback" name="PlanFeedback" reverse="Work" type="ONE_TO_MULTI" owner="true">
    </Relation>
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesEnumUtil.java
@ -905,7 +905,8 @@ public class MesEnumUtil {
        STEP_CONTENT("stepContent", "工步内容"),
        MODULE_CONTENT("moduleContent", "组件内容"),
        CUSTOM_COMPONENT("customComponent", "定制内容"),
-        TASK_COMPLETE("taskComplete", "整个扫描完成");
+        TASK_COMPLETE("taskComplete", "整个扫描完成"),
+        RENEW_REQUEST_PARAMS("renewRequestParams","回传刷新StationResultBean");

        private String value;
        private String description;
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java
@ -1160,4 +1160,97 @@ public class MesPcnEnumUtil {
        }
    }

+    /**
+     * MesRoute 流程的类型
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTE_TYPE {
+
+        SCAN(10, "扫描流程"),
+        MONITOR(20, "监控流程");
+
+        private int value;
+        private String description;
+
+        ROUTE_TYPE(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
+    /**
+     * redis过期时间
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum EXPIRE_TIME {
+
+        NEVER(-1, "不过期"),
+        ONE_HOUR(3600, "一小时"),
+        ONE_MIN(60, "一分钟");
+
+        private int value;
+        private String description;
+
+        EXPIRE_TIME(int value, String description) {
+            this.value = value;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public static String valueOfDescription(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription2(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description.equals("已审批") ? "审批" : values()[i].description;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
--- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
+++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java
@ -3351,7 +3351,10 @@ public class WmsEnumUtil {
    public enum INVENTORY_DIFFERENCE_TYPE {
        INVENTORY_FLAT(10, "INVENTORY_FLAT", "盘平"),
        INVENTORY_LOSSES(20, "INVENTORY_LOSSES", "盘亏"),
-        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢");
+        INVENTORY_WIN(30, "INVENTORY_WIN", "盘赢"),
+        INVENTORY_DIS(40, "INVENTORY_DIS", "库位不一致"),
+        INVENTORY_FIT(50, "INVENTORY_FIT", "库位一致"),
+        INVENTORY_WITHOUT(60, "INVENTORY_WITHOUT", "未盘");

        private int value;
        private String code;
@ -3633,4 +3636,61 @@ public class WmsEnumUtil {
        }
    }
    
+    
+    /**
+     * 物流规则 处理模式
+     */
+    @JsonFormat(shape = JsonFormat.Shape.OBJECT)
+    public enum ROUTING_RULE_MODE {
+        CREATE_TASK(10, "CREATE_TASK", "生成任务"),
+        AUTO_OPT(20, "AUTO_OPT", "自动操作"),
+    	MENU_OPT(30, "MENU_OPT", "手工操作"),
+    	AUTO_OPT_NON_TRANS(40, "AUTO_OPT_NON_TRANS", "自动操作无交易");
+        private int value;
+        private String code;
+        private String description;
+
+        ROUTING_RULE_MODE(int value, String code, String description) {
+            this.value = value;
+            this.code = code;
+            this.description = description;
+        }
+
+        public int getValue() {
+            return value;
+        }
+
+        public String getDescription() {
+            return description;
+        }
+
+        public String getCode() {
+            return code;
+        }
+
+        public static String valueOf(int val) {
+            String tmp = null;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].value == val) {
+                    tmp = values()[i].description;
+                }
+            }
+            return tmp;
+        }
+
+        public static String valueOfDescription(int val) {
+            return valueOf(val);
+        }
+
+        public static int descOf(String desc) {
+            int tmp = 1;
+            for (int i = 0; i < values().length; i++) {
+                if (values()[i].description.equals(desc)) {
+                    tmp = values()[i].value;
+                }
+            }
+            return tmp;
+        }
+    }
+
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java
@ -78,4 +78,8 @@ public class MesPlc extends BaseBean {
    @Column(name = "ENABLED")
    @ApiParam("是否启用 0 false 1 true")
    private Integer enabled;
+
+    @Column(name = "PLC_CFG")
+    @ApiParam("PLC的值的设定")
+    private String plcCfg;
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java
@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean {
    @Column(name = "ROUTE_CODE")
    @ApiParam("流程代码")
    private String routeCode;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java
@ -38,4 +38,9 @@ public class MesRoute extends BaseBean {
    @Column(name = "POSITION")
    @ApiParam("GOJS位置")
    private String position;
+
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/PlcCacheKeyModel.java
@ -21,14 +21,13 @@ public class PlcCacheKeyModel {

    private String tag;

-    public PlcCacheKeyModel(String channel, String device, String tag) {
-        this.channel = channel;
+    public PlcCacheKeyModel( String device, String tag) {
        this.device = device;
        this.tag = tag;
    }

    public String getPlcCacheKey() {
-        return channel + ":" + device + ":" + tag;
+        return device + ":" + tag;
    }


--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationRequestBean.java
@ -1,5 +1,6 @@
 package cn.estsh.i3plus.pojo.mes.pcn.model;

+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiParam;
 import lombok.Data;

@ -57,4 +58,7 @@ public class StationRequestBean implements Serializable {
     */
    @ApiParam("业务类型")
    private String busiType;
+
+    @ApiParam("工单号")
+    private String workOrderNo;
 }
--- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java
+++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java
@ -0,0 +1,13 @@
+package cn.estsh.i3plus.pojo.mes.pcn.repository;
+
+
+import cn.estsh.i3plus.pojo.base.jpa.dao.BaseRepository;
+import cn.estsh.i3plus.pojo.mes.pcn.bean.MesWcEquipment;
+
+/**
+ * @Author: Wynne.Lu
+ * @CreateDate: 2019/9/28 12:04 PM
+ * @Description:
+ **/
+public interface MesWcEquipmentRepository extends BaseRepository<MesWcEquipment,Long> {
+}
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteCfg.java
@ -38,4 +38,8 @@ public class MesProdRouteCfg extends BaseBean {
    @Column(name = "ROUTE_CODE")
    @ApiParam("流程代码")
    private String routeCode;
+
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }
--- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
+++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRoute.java
@ -38,4 +38,8 @@ public class MesRoute extends BaseBean {
    @Column(name = "POSITION")
    @ApiParam("GOJS位置")
    private String position;
+    
+    @Column(name = "ROUTE_TYPE")
+    @ApiParam("流程类型 10-扫描类型 20-监控类型")
+    private Integer routeType;
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java
@ -92,11 +92,14 @@ public class WmsBom extends BaseBean {
        return this.itemQty == null ? 0 : this.itemQty.doubleValue();
    }

-    public WmsBom(){}
-    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum) {
+    public WmsBom() {
+    }
+
+    public WmsBom(String itemPartNo, String itemPartNam, String itemUnit, String bomNum, Double itemQty) {
        this.itemPartNo = itemPartNo;
        this.itemPartNam = itemPartNam;
        this.itemUnit = itemUnit;
        this.bomNum = bomNum;
+        this.itemQty = itemQty;
    }
 }
--- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
+++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java
@ -7,6 +7,14 @@ import java.io.Serializable;
 public class WmsCSOrderDetailsModel implements Serializable {


+
+    /******
+     *
+     *  工厂代码
+     */
+    public String  organizeCode;
+
+
    /******
     *
     * 库位编码