From d64a8fd31c26b8b9e3a7510a12cbc7d450fe3720 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:11:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 35 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesStepParam.java | 4 +++ 2 files changed, 39 insertions(+) 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 98ad82a..363e667 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 @@ -3126,6 +3126,41 @@ public class MesEnumUtil { } /** + * 工步参数 是否必填 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_STEP_PARAM_IS_NEED { + TRUE(1, "是"), + FALSE(2, "否"); + + private int value; + private String description; + + MES_STEP_PARAM_IS_NEED(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; + } + } + + /** * mes工作单元参数类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index cd1bd7f..99c4596 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -65,6 +65,10 @@ public class MesStepParam extends BaseBean implements Serializable { @ApiParam("参数对象") private String objectCode; + @Column(name = "IS_NEED") + @ApiParam("是否必填") + private Integer isNeed = 1; + @Column(name = "TYPE") @ApiParam("type") private Integer type = 0; From 2b522ca15de14e354e0574c8cbb9e45871afcc74 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 3 Dec 2020 17:14:21 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E6=AD=A5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java index 99c4596..1a6f5b7 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesStepParam.java @@ -66,7 +66,7 @@ public class MesStepParam extends BaseBean implements Serializable { private String objectCode; @Column(name = "IS_NEED") - @ApiParam("是否必填") + @ApiParam("是否必需") private Integer isNeed = 1; @Column(name = "TYPE")