From 55de940f7c86f90e30f3e4faafe3fd120b434ea1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 2 Jun 2020 11:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=901926=20=E7=9B=B2=E6=A3=80=E5=B7=A5?= =?UTF-8?q?=E6=AD=A5=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 46 ++++++++++++++++++ .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 56 ++++++++++++++++++++++ .../i3plus/pojo/mes/bean/MesBlindHistory.java | 4 ++ .../i3plus/pojo/mes/bean/MesBlindTopicSetting.java | 2 +- .../i3plus/pojo/mes/bean/MesQueueOrderDetail.java | 4 ++ .../i3plus/pojo/mes/model/GenSerialNoModel.java | 6 +++ .../i3plus/pojo/mes/model/MesBlindProbleModel.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 3 +- 8 files changed, 123 insertions(+), 2 deletions(-) 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 53b6bb0..b11a545 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 @@ -6147,4 +6147,50 @@ public class MesEnumUtil { return valueOf(val); } } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + 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; + } + } } 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 4ab41c0..4315afc 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 @@ -612,6 +612,16 @@ public class MesPcnEnumUtil { return tmp; } + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + public static MES_MATCH_TYPE getByValue(int value) { for (MES_MATCH_TYPE mesMatchType : values()) { if (mesMatchType.getValue() == value) { @@ -3939,4 +3949,50 @@ public class MesPcnEnumUtil { return valueOf(val); } } + + /** + * 盲检类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum TOPIC_TYPE { + COLOUR(10, "零件颜色"), + GRADE(20, "等级"), + TO_CONFIGURE(30, "配置"); + + private int value; + private String description; + + TOPIC_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java index cba882b..2f35bf8 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindHistory.java @@ -60,4 +60,8 @@ public class MesBlindHistory extends BaseBean implements Serializable { @ApiParam("工作中心代码") private String workCenterCode; + @Transient + @ApiParam("主队列编号") + private String orderNo; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java index 91ddc09..b82bbae 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesBlindTopicSetting.java @@ -51,7 +51,7 @@ public class MesBlindTopicSetting extends BaseBean implements Serializable { private Integer topicType; @Column(name = "QTY") - @ApiParam("答案数量") + @ApiParam("错误答案数量") private Integer qty; @Column(name = "WORK_CELL_CODE") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 948b1f9..fa0e97b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -160,6 +160,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("年度型") private String modelYear; + @Transient + @ApiParam("主队列状态") + private Integer masterStatus; + public double getQueueSeqVal() { return this.queueSeq == null ? 0.0d : this.queueSeq; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java index 28b8235..c130f5b 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/GenSerialNoModel.java @@ -82,6 +82,12 @@ public class GenSerialNoModel { @ApiParam("当前编号") private String currentNumber; + @ApiParam("物料类型3") + private String categoryCode3; + + @ApiParam("零件号后4位") + private String partNoAfterFour; + public GenSerialNoModel(String ruleCode) { this.ruleCode = ruleCode; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java index af48ce8..8944231 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/MesBlindProbleModel.java @@ -32,4 +32,8 @@ public class MesBlindProbleModel extends BaseBean { @ApiParam(value = "正确答案") private String rightKey; + + @ApiParam(value = "工厂代码") + private String organizeCode; + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java index fc23a2e..07ac37c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java @@ -2903,10 +2903,11 @@ public class MesHqlPack { public static DdlPackBean getMesBlindTopicSetting(MesBlindTopicSetting mesBlindTopicSetting) { DdlPackBean packBean = getAllBaseData(mesBlindTopicSetting.getOrganizeCode()); - DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode()", packBean); + DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicCode(), "topicCode", packBean); DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getTopicDesc(), "topicDesc", packBean); DdlPreparedPack.getStringLikerPack(mesBlindTopicSetting.getWorkCellCode(), "workCellCode", packBean); DdlPreparedPack.getStringEqualPack(mesBlindTopicSetting.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getTopicType(), "topicType", packBean); DdlPreparedPack.getNumEqualPack(mesBlindTopicSetting.getIsValid(), "isValid", packBean); return packBean; }