From 82158d82830c39a385c6c77952863e768f710410 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 9 Jul 2020 20:05:41 +0800 Subject: [PATCH 1/2] [bug 9238 9096] --- .../java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java | 4 ++++ .../java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java index c0d1436..3bfe3b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesProdRouteOptParam.java @@ -78,6 +78,10 @@ public class MesProdRouteOptParam extends BaseBean implements Serializable { @ApiParam("是否执行 1=是 2=否") private Integer isActive; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java index 7eab5e8..5a75ba4 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesRouteProcessStep.java @@ -58,6 +58,10 @@ public class MesRouteProcessStep extends BaseBean implements Serializable { @ApiParam("工步参数值") private String paramValue; + @Column(name = "STEP_DISPLAY_NAME") + @ApiParam("工步展示名称") + private String stepDisplayName; + @Transient @Column(name = "PARAM_ATTRIBUTE") @ApiParam("参数属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java index 8adee52..4d37f07 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/StepModel.java @@ -73,6 +73,9 @@ public class StepModel implements Serializable { @ApiParam("参数代码") private String paramCode; + @ApiParam("工步展示名称") + private String stepDisplayName; + /** * 工作单元代码 */ @@ -83,7 +86,7 @@ public class StepModel implements Serializable { } public StepModel(String stepCode, String stepName, String stepText, String stepType, String stepObject, - String routeCode, String processCode, Integer stepSeq, String paramCode, String workCellCode) { + String routeCode, String processCode, Integer stepSeq, String paramCode, String stepDisplayName, String workCellCode) { this.stepCode = stepCode; this.stepName = stepName; this.stepText = stepText; @@ -93,6 +96,7 @@ public class StepModel implements Serializable { this.processCode = processCode; this.stepSeq = stepSeq; this.paramCode = paramCode; + this.stepDisplayName = stepDisplayName; this.workCellCode = workCellCode; } } From 8e99ae38e6bd69c69ee28a27d6bbd33f50b65703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E5=86=9B=E8=B6=85?= Date: Thu, 9 Jul 2020 21:51:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=A4=A9=E6=B4=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2e23a27..55b9a05 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 @@ -718,7 +718,7 @@ public class MesPcnEnumUtil { DEFECTED(20, "不合格"), SCRAPED(30, "报废"), DISMANTLED(40, "已拆解"), - PRE_CHECK(50, "待检测"); + PRE_CHECK(5, "待检测"); private int value; private String description;