From 612c919e5fb56a4e186c3f0a122df1429fff51c6 Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Tue, 22 Sep 2020 21:23:33 +0800 Subject: [PATCH] =?UTF-8?q?bypass=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 48 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesQueueJitActual.java | 8 ++++ 2 files changed, 56 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 63ea616..5043169 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 @@ -5512,4 +5512,52 @@ public class MesPcnEnumUtil { return tmp; } } + + /** + * 产品位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCE_CATEGORY_NAME { + + FL("FL", "前右"), + FR("FR", "前左"), + RL("RL", "后左"), + RR("RR", "后右"); + + private String description; + private String value; + + PRODUCE_CATEGORY_NAME(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; + } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java index e438425..926b291 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActual.java @@ -170,4 +170,12 @@ public class MesQueueJitActual extends BaseBean implements Serializable { @ApiParam(value = "零件号") public String partNo; + @Transient + @ApiParam(value = "客户零件号") + public String custPartNo; + + @Transient + @ApiParam(value = "qty") + public Integer qty; + }