From 1f5f0448ddc779162e88f7fccc4cfbc2165a135e Mon Sep 17 00:00:00 2001 From: yxw Date: Tue, 24 Oct 2023 15:57:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9E=9A=E4=B8=BE=EF=BC=9A?= =?UTF-8?q?=E6=93=8D=E4=BD=9C=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/mes/pcn/pojo/util/MesPcnExtConstWords.java | 5 +- .../ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java | 113 ++++++++++++++++----- 2 files changed, 90 insertions(+), 28 deletions(-) diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java index 98c800d..ce90e2a 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtConstWords.java @@ -854,7 +854,7 @@ public class MesPcnExtConstWords { public static final String TORQUE_SPEC_VALUE = "torqueSpecValue"; //本体条码上线 - public static final String NOUMENON_SN_POP_UP_ONLINE = "NOUMENON_SN_POP_UP_ONLINE"; + public static final String NOUMENON_SN_POP_UP_ONLINE_MODULE = "NOUMENON_SN_POP_UP_ONLINE_MODULE"; //本体条码下线 public static final String NOUMENON_SN_LINE_OFF = "NOUMENON_SN_LINE_OFF"; @@ -872,4 +872,7 @@ public class MesPcnExtConstWords { public static final String CUR_EXEC_WORK_ORDER = "CUR_EXEC_WORK_ORDER"; //强制放行 public static final String EXECUTE_OUT = "EXECUTE_OUT"; + + //是否解冻 + public static final String IS_UNFREEZE = "isUnfreeze"; } diff --git a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java index f124ce6..439c31d 100644 --- a/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java +++ b/modules/i3plus-ext-mes-pcn-pojo/src/main/java/cn/estsh/i3plus/ext/mes/pcn/pojo/util/MesPcnExtEnumUtil.java @@ -917,7 +917,11 @@ public class MesPcnExtEnumUtil { SPE_ENVIRONMENT(50, "特殊环境"), FIVE_S(60, "5S"), CHECK(70, "检查"), - ELSE(80, "其他"); + ELSE(80, "其他"), + ONTOLOGY_LOGISTICS(90, "本体物流"), + ONTOLOGY_U_PART(100, "本体U部品"), + ONTOLOGY_ASSEMBLE(110, "本体组装"), + ONTOLOGY_CHECK(120, "本体检查"); private int value; private String description; @@ -3351,18 +3355,17 @@ public class MesPcnExtEnumUtil { } /** - * mes 管理码使用状态 + * 管理码与工单条码关系状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MANAGE_USE_STATUS { - - LEISURE(10, "空闲"), - OCCUPY(20, "占用"); + public enum MC_RECORD_SN_STATUS { + CREATE(10, "上线"), + OFFLINE(20, "下线"); private int value; private String description; - MANAGE_USE_STATUS(int value, String description) { + MC_RECORD_SN_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -3385,29 +3388,38 @@ public class MesPcnExtEnumUtil { return tmp; } - public static Integer descriptionOfValue(String description) { - Integer tmp = null; + public static String valueOf(int val) { + String tmp = null; for (int i = 0; i < values().length; i++) { - if (values()[i].description.equals(description)) { - tmp = values()[i].value; + if (values()[i].value == val) { + tmp = values()[i].description; } } return tmp; } + + public static MC_RECORD_SN_STATUS getByValue(int value) { + for (MC_RECORD_SN_STATUS produceSnStatus : values()) { + if (produceSnStatus.getValue() == value) { + return produceSnStatus; + } + } + return null; + } } /** - * 管理码与工单条码关系状态 + * 管理码与工单条码关系质量状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MC_RECORD_SN_STATUS { - CREATE(10, "上线"), - OFFLINE(20, "下线"); + public enum MC_RECORD_SN_QC_STATUS { + TRUE(10, "合格"), + FALSE(20, "不合格"); private int value; private String description; - MC_RECORD_SN_STATUS(int value, String description) { + MC_RECORD_SN_QC_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -3440,8 +3452,8 @@ public class MesPcnExtEnumUtil { return tmp; } - public static MC_RECORD_SN_STATUS getByValue(int value) { - for (MC_RECORD_SN_STATUS produceSnStatus : values()) { + public static MC_RECORD_SN_QC_STATUS getByValue(int value) { + for (MC_RECORD_SN_QC_STATUS produceSnStatus : values()) { if (produceSnStatus.getValue() == value) { return produceSnStatus; } @@ -3451,17 +3463,17 @@ public class MesPcnExtEnumUtil { } /** - * 管理码与工单条码关系质量状态 + * 条码操作类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MC_RECORD_SN_QC_STATUS { - TRUE(10, "合格"), - FALSE(20, "不合格"); + public enum SN_OPERATE_TYPE { + QUALIFIED(10, "合格"), + REPAIR(20, "返修"); private int value; private String description; - MC_RECORD_SN_QC_STATUS(int value, String description) { + SN_OPERATE_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -3494,13 +3506,60 @@ public class MesPcnExtEnumUtil { return tmp; } - public static MC_RECORD_SN_QC_STATUS getByValue(int value) { - for (MC_RECORD_SN_QC_STATUS produceSnStatus : values()) { - if (produceSnStatus.getValue() == value) { - return produceSnStatus; + public static SN_OPERATE_TYPE getByValue(int value) { + for (SN_OPERATE_TYPE snOperateType : values()) { + if (snOperateType.getValue() == value) { + return snOperateType; + } + } + return null; + } + } + + /** + * 是否解冻 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum IS_UNFREEZE { + + BIND(10, "已解冻"), + UNTYING(20, "未解冻"); + + private int value; + private String description; + + IS_UNFREEZE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static IS_UNFREEZE getByValue(int value) { + for (IS_UNFREEZE isUnfreeze : values()) { + if (isUnfreeze.getValue() == value) { + return isUnfreeze; } } return null; } + + + 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; + } + } }