From 1a72c16f14523747fb0e7f0e048e68c708e98dad Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Fri, 22 May 2020 16:15:00 +0800 Subject: [PATCH] Finish Task #1890 Cost:8h --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 36 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesCachaQueue.java | 4 +++ 2 files changed, 40 insertions(+) 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 71cc67b..fb50e69 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 @@ -3680,4 +3680,40 @@ public class MesPcnEnumUtil { } } + + /** + * 数据复核 校验模式 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum VERIFY_MODE { + PART_NO("10", "按物料号匹配"), + WORK_CENTER_CODE("20", "按产线匹配"); + + private String value; + private String description; + + VERIFY_MODE(String value, String description) { + this.value = value; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOfDescription(String val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java index a3b9f8b..e250191 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesCachaQueue.java @@ -46,4 +46,8 @@ public class MesCachaQueue extends BaseBean implements Serializable { @ApiParam("物料号") private String partNo; + @Column(name = "WORK_CENTER_CODE") + @ApiParam("生产线") + private String workCenterCode; + }