From 980cb2a56b45e5e6504f9463b62ad27d765f42f2 Mon Sep 17 00:00:00 2001 From: Jason Date: Mon, 30 Sep 2019 16:50:05 +0800 Subject: [PATCH] add product order spread to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 +++--- .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 8 +----- .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 14 ++++++++++ .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 32 ++++++++++++++++------ .../estsh/i3plus/pojo/aps/holders/EOperation.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 1 + .../src/main/resources/relations/ParentWork.xml | 2 ++ .../src/main/resources/relations/Work.xml | 2 +- 8 files changed, 47 insertions(+), 23 deletions(-) diff --git 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 index 074435b..a6f4432 100644 --- 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 @@ -34,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") diff --git 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 index 9c6b580..620909a 100644 --- 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 @@ -10,7 +10,6 @@ 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; @@ -108,7 +107,7 @@ public class Operation extends BaseAPS { } @JsonBackReference - public List getOperResources() { + public List getOperResources() { return BeanRelation.list(this, EOperation.OperResources); } @@ -120,9 +119,4 @@ public class Operation extends BaseAPS { this.standOperationId = std != null ? std.getId() : 0l; BeanRelation.set(this, EOperation.StandOperation, std); } - - @JsonBackReference - public List getWorks() { - return BeanRelation.list(this, EOperation.Works); - } } diff --git 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 index d066cc9..a81d45f 100644 --- 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 @@ -37,6 +37,11 @@ public class ParentWork extends BaseAPS { @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); } @@ -46,6 +51,15 @@ public class ParentWork extends BaseAPS { 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 getWorks() { return BeanRelation.list(this, EParentWork.Works); diff --git 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 index 44daa75..ee20430 100644 --- 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 @@ -107,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); } @@ -116,6 +121,24 @@ 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 getWorkResources() { return BeanRelation.list(this, EWork.WorkResources); @@ -141,15 +164,6 @@ public class Work extends BaseCode { 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 getPlanFeedbacks() { return BeanRelation.list(this, EWork.PlanFeedbacks); diff --git 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 index 42f06cc..85a4795 100644 --- 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 } diff --git 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 index aa66b75..334c388 100644 --- 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 @@ -2,5 +2,6 @@ package cn.estsh.i3plus.pojo.aps.holders; public enum EParentWork { ProductOrder, + Operation, Works } diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml index 5db40d1..9572cad 100644 --- a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml @@ -1,5 +1,7 @@ + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/Work.xml index 1bb7816..5bb1d26 100644 --- 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 @@ - +