From aea18f89c6f0bf7bb84b81d55cc4eafe04889f87 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 29 Sep 2019 14:36:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AE=89=E7=81=AF=E6=94=BE=E8=A1=8C?= =?UTF-8?q?=E8=AF=B4=E6=98=8E=E5=AD=97=E6=AE=B5=E7=BB=B4=E6=8A=A4openInfo?= =?UTF-8?q?=EF=BC=8C=20=E5=AE=89=E7=81=AF=E5=93=8D=E5=BA=94=E9=80=9A?= =?UTF-8?q?=E7=9F=A5=E6=A0=87=E8=AF=86=E5=AD=97=E6=AE=B5signSendFlag?= =?UTF-8?q?=E7=BB=B4=E6=8A=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java | 2 +- .../main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java index 674dd65..dbdc07e 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageQueue.java @@ -392,7 +392,7 @@ public class AndonManageQueue extends BaseBean { * @param workCellCode * @param workCellNameRdd * @param alarmCode - * @param ecCode + * @param ecCodec * @param ecNameRdd * @param emCode * @param emNameRdd diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java index b7aef8e..d66158f 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/bean/AndonManageRecord.java @@ -268,6 +268,10 @@ public class AndonManageRecord extends BaseBean { @ApiParam(value = "放行说明") private String openInfo; + @Column(name = "SIGN_SEND_FLAG") + @ApiParam(value = "响应已通知标识") + private String signSendFlag; + // 是否转呼 public Integer getIsShiftCall() { return this.isShiftCall == null ? 0 : this.isShiftCall; From 81d86d1bd2ac5ea4b8b99b33c644e35e457a5a05 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sun, 29 Sep 2019 17:22:10 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename modules/{i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java => i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java} (88%) diff --git a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java similarity index 88% rename from modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java rename to modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java index 9957a5f..ff3329d 100644 --- a/modules/i3plus-pojo-model/src/main/java/cn/estsh/i3plus/pojo/model/wms/wmsCSOrderDetailsModel.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java @@ -1,11 +1,10 @@ -package cn.estsh.i3plus.pojo.model.wms; +package cn.estsh.i3plus.pojo.wms.bean.iotio; import lombok.Data; import java.io.Serializable; - @Data -public class wmsCSOrderDetailsModel implements Serializable { +public class WmsCSOrderDetailsModel implements Serializable { /****** From ff272afe2c18c1b4725e975992f0e89227f3e127 Mon Sep 17 00:00:00 2001 From: crish <570360737@qq.com> Date: Sun, 29 Sep 2019 17:57:13 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java index e356a41..e955336 100644 --- a/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java +++ b/modules/i3plus-pojo-andon/src/main/java/cn/estsh/i3plus/pojo/andon/sqlpack/AndonHqlPack.java @@ -163,7 +163,7 @@ public class AndonHqlPack { */ public static DdlPackBean packHqlMesWorkCell(MesWorkCell mesWorkCell){ DdlPackBean result = new DdlPackBean(); - + DdlPreparedPack.getStringEqualPack(mesWorkCell.getOrganizeCode(), "organizeCode", result); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCenterCode(), "workCenterCode", result); DdlPreparedPack.getStringEqualPack(mesWorkCell.getWorkCellCode(), "workCellCode", result); getStringBuilderPack(mesWorkCell, result); From 4fc72ca358135a97c1dfadc9a4e6137b90ab0d78 Mon Sep 17 00:00:00 2001 From: lbwgithub <你的邮箱1002117856@qq.com> Date: Sun, 29 Sep 2019 19:57:20 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=9D=A1=E7=A0=81=E6=A8=A1=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../estsh/i3plus/pojo/wms/bean/iotio/WmsCSOrderDetailsModel.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git 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 index ff3329d..6e2b61d 100644 --- 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; + + /****** * * 库位编码 From 10ce1e165ecf9c90a65aa0985a03f600990ea593 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 29 Sep 2019 20:56:16 +0800 Subject: [PATCH 5/6] add order spread to aps --- .../cn/estsh/i3plus/pojo/aps/bean/BaseOrder.java | 8 ++++ .../estsh/i3plus/pojo/aps/bean/ExportProject.java | 2 + .../estsh/i3plus/pojo/aps/bean/ImportProject.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Inventory.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Material.java | 8 ++++ .../cn/estsh/i3plus/pojo/aps/bean/OperInput.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/OperOutput.java | 2 + .../estsh/i3plus/pojo/aps/bean/OperResource.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/Operation.java | 5 ++ .../cn/estsh/i3plus/pojo/aps/bean/ParentWork.java | 53 ++++++++++++++++++++++ .../estsh/i3plus/pojo/aps/bean/ProductOrder.java | 9 ++++ .../estsh/i3plus/pojo/aps/bean/ProductRouting.java | 3 ++ .../estsh/i3plus/pojo/aps/bean/PurchaseOrder.java | 6 +++ .../cn/estsh/i3plus/pojo/aps/bean/SalesOrder.java | 2 + .../java/cn/estsh/i3plus/pojo/aps/bean/Work.java | 7 +++ .../cn/estsh/i3plus/pojo/aps/bean/WorkInput.java | 2 + .../cn/estsh/i3plus/pojo/aps/bean/WorkOutput.java | 2 + .../cn/estsh/i3plus/pojo/aps/common/BeanInfo.java | 40 +++++++++++----- .../estsh/i3plus/pojo/aps/common/DateDuration.java | 16 +++---- .../estsh/i3plus/pojo/aps/enums/MATERIAL_TYPE.java | 3 +- .../estsh/i3plus/pojo/aps/holders/EParentWork.java | 6 +++ .../i3plus/pojo/aps/holders/EProductOrder.java | 3 +- .../cn/estsh/i3plus/pojo/aps/holders/EWork.java | 1 + .../pojo/aps/repository/ParentWorkRepository.java | 9 ++++ .../src/main/resources/relations/BaseOrder.xml | 2 - .../src/main/resources/relations/ParentWork.xml | 5 ++ .../src/main/resources/relations/ProductOrder.xml | 2 + 27 files changed, 181 insertions(+), 23 deletions(-) create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java create mode 100644 modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/repository/ParentWorkRepository.java create mode 100644 modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml 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 cf27632..074435b 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 @@ -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") @@ -60,6 +63,7 @@ public class BaseOrder extends BaseCode { @FieldAnnotation(property = false) private Long materialId; + @JsonBackReference public List 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 getPrevRelations() { return BeanRelation.list(this, EBaseOrder.PrevRelations); } + @JsonBackReference public List getPostRelations() { return BeanRelation.list(this, EBaseOrder.PostRelations); } + @JsonBackReference public List getUpperOrders() { return BeanRelation.list(this, EBaseOrder.UpperOrders); } + @JsonBackReference public List getLowerOrders() { return BeanRelation.list(this, EBaseOrder.LowerOrders); } diff --git 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 index 27d70a9..458c9a5 100644 --- 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 getDetails() { return BeanRelation.list(this, EExportProject.Details); } diff --git 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 index 731a820..35e8af3 100644 --- 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 getDetails() { return BeanRelation.list(this, EImportProject.Details); } diff --git 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 index 54d7fc4..89699c0 100644 --- 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); } diff --git 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 index a42d97e..fc3af62 100644 --- 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 getProductRoutings() { return BeanRelation.list(this, EMaterial.ProductRoutings); } + @JsonBackReference public List getOperInputs() { return BeanRelation.list(this, EMaterial.OperInputs); } + @JsonBackReference public List getOperOutputs() { return BeanRelation.list(this, EMaterial.OperOutputs); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EMaterial.WorkInputs); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EMaterial.WorkOutputs); } + @JsonBackReference public List getWorkRelations() { return BeanRelation.list(this, EMaterial.WorkRelations); } + @JsonBackReference public List getOrders() { return BeanRelation.list(this, EMaterial.Orders); } diff --git 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 index 1ad9690..ef5aac9 100644 --- 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 getWorkInputs() { return BeanRelation.list(this, EOperInput.WorkInputs); } diff --git 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 index 41a13fa..5e98d6e 100644 --- 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 getWorkOutputs() { return BeanRelation.list(this, EOperOutput.WorkOutputs); } diff --git 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 index f0859f7..b56b850 100644 --- 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 getWorkResources() { return BeanRelation.list(this, EOperResource.WorkResources); } 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 4f6513a..9c6b580 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 @@ -6,6 +6,7 @@ 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; @@ -96,14 +97,17 @@ public class Operation extends BaseAPS { BeanRelation.set(this, EOperation.ProductRouting, routing); } + @JsonBackReference public List getOperInputs() { return BeanRelation.list(this, EOperation.OperInputs); } + @JsonBackReference public List getOperOutputs() { return BeanRelation.list(this, EOperation.OperOutputs); } + @JsonBackReference public List getOperResources() { return BeanRelation.list(this, EOperation.OperResources); } @@ -117,6 +121,7 @@ public class Operation extends BaseAPS { 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 new file mode 100644 index 0000000..d066cc9 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ParentWork.java @@ -0,0 +1,53 @@ +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; + + 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); + } + + @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/ProductOrder.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/ProductOrder.java index 64f17c0..23bcbe8 100644 --- 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 getParentWorks() { return BeanRelation.list(this, EProductOrder.ParentWorks); } } diff --git 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 index ed21d2d..7cf68ed 100644 --- 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 getOperations() { return BeanRelation.list(this, EProductRouting.Operations); } + @JsonBackReference public List getProductOrders() { return BeanRelation.list(this, EProductRouting.ProductOrders); } diff --git 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 index b1676d8..eab91d2 100644 --- 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); } diff --git 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 index f5a85dd..e74a116 100644 --- 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); } 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 2dc7c4b..44daa75 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 @@ -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; @@ -115,22 +116,27 @@ public class Work extends BaseCode { BeanRelation.set(this, EWork.Order, order); } + @JsonBackReference public List getWorkResources() { return BeanRelation.list(this, EWork.WorkResources); } + @JsonBackReference public List getWorkInputs() { return BeanRelation.list(this, EWork.WorkInputs); } + @JsonBackReference public List getWorkOutputs() { return BeanRelation.list(this, EWork.WorkOutputs); } + @JsonBackReference public List getWorkRelationInputs() { return BeanRelation.list(this, EWork.WorkRelationInputs); } + @JsonBackReference public List getWorkRelationOutputs() { return BeanRelation.list(this, EWork.WorkRelationOutputs); } @@ -144,6 +150,7 @@ public class Work extends BaseCode { 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/bean/WorkInput.java b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/bean/WorkInput.java index 2a5dc70..c74f140 100644 --- 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 getWorkRelations() { return BeanRelation.list(this, EWorkInput.WorkRelations); } diff --git 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 index 16ce459..49116dd 100644 --- 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 getWorkRelations() { return BeanRelation.list(this, EWorkOutput.WorkRelations); } diff --git 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 index 016d92e..a0f477b 100644 --- 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 cls; @@ -103,6 +104,14 @@ public class BeanInfo { return null; } + public Class 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> getAllHolders() { - List> holders = new ArrayList<>(); + private void foreach(Consumer fun) { for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - holders.add(entry.getKey()); + fun.accept(entry.getValue()); + } + if (this.superBeanInfo != null) { + this.superBeanInfo.foreach(fun); } + } + + public List> getAllHolders() { + List> holders = new ArrayList<>(); + foreach((RelationInfo info)->{ + holders.add(info.getHolder()); + }); return holders; } public List> getOwnerHolders() { List> owners = new ArrayList<>(); - for (Map.Entry, 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> getNormalSigns() { List> holders = new ArrayList<>(); - for (Map.Entry, RelationInfo> entry : relations.entrySet()) { - if (!entry.getValue().isOwner()) { - holders.add(entry.getKey()); + foreach((RelationInfo info)->{ + if (!info.isOwner()) { + holders.add(info.getHolder()); } - } + }); return holders; } diff --git 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 index f68cc74..af5476a 100644 --- 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"); } diff --git 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 index 373afaf..89f6644 100644 --- 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 // 虚拟件 } 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 new file mode 100644 index 0000000..aa66b75 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/java/cn/estsh/i3plus/pojo/aps/holders/EParentWork.java @@ -0,0 +1,6 @@ +package cn.estsh.i3plus.pojo.aps.holders; + +public enum EParentWork { + ProductOrder, + Works +} diff --git 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 index 9ad0f8a..5b2f068 100644 --- 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 } diff --git 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 index 507848d..59568c1 100644 --- 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, diff --git 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 new file mode 100644 index 0000000..f71fb80 --- /dev/null +++ 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 { +} diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/BaseOrder.xml index 65c1fe1..3b1c1f3 100644 --- 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 @@ - - \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml new file mode 100644 index 0000000..5db40d1 --- /dev/null +++ b/modules/i3plus-pojo-aps/src/main/resources/relations/ParentWork.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml b/modules/i3plus-pojo-aps/src/main/resources/relations/ProductOrder.xml index 40fa8d7..983dd3b 100644 --- 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 @@ + + \ No newline at end of file From 82fe491bd33951e2f142e51d3bc07d4796505a3f Mon Sep 17 00:00:00 2001 From: WYnneaoapc Date: Mon, 30 Sep 2019 09:25:26 +0800 Subject: [PATCH 6/6] =?UTF-8?q?#1050=20=E5=B7=A5=E4=BD=8D=E7=9B=91?= =?UTF-8?q?=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 3 +- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 93 ++++++++++++++++++++++ .../cn/estsh/i3plus/pojo/mes/pcn/bean/MesPlc.java | 4 + .../i3plus/pojo/mes/pcn/bean/MesProdRouteCfg.java | 4 + .../estsh/i3plus/pojo/mes/pcn/bean/MesRoute.java | 5 ++ .../pojo/mes/pcn/model/PlcCacheKeyModel.java | 5 +- .../pojo/mes/pcn/model/StationRequestBean.java | 4 + .../pcn/repository/MesWcEquipmentRepository.java | 13 +++ .../i3plus/pojo/mes/bean/MesProdRouteCfg.java | 4 + .../cn/estsh/i3plus/pojo/mes/bean/MesRoute.java | 4 + 10 files changed, 135 insertions(+), 4 deletions(-) create mode 100644 modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/repository/MesWcEquipmentRepository.java diff --git 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 index 6795c79..13a75d7 100644 --- 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; diff --git 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 index 1fba6f6..c40458a 100644 --- 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; + } + } + } diff --git 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 index 64a9e9c..f25e3b5 100644 --- 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; } diff --git 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 index d76b0d8..8295380 100644 --- 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; } diff --git 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 index 1a2949f..315c1f4 100644 --- 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; } diff --git 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 index ef2610f..46c84c5 100644 --- 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; } diff --git 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 index 9ee5b73..cf69df3 100644 --- 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; } diff --git 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 new file mode 100644 index 0000000..e1e757d --- /dev/null +++ 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 { +} diff --git 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 index d66c490..8ef8f1e 100644 --- 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; } diff --git 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 index fadd550..603403b 100644 --- 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; }