From 1f84c2f8aa10709748b6e476ee2efc482e204feb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Wed, 26 May 2021 11:20:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=9015872=2020027--PCN=E7=AB=AF=E5=B7=A5?= =?UTF-8?q?=E4=BD=8D=E6=89=AB=E6=8F=8F=E5=A2=9E=E5=8A=A0=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=A4=8D=E6=A0=B8=E5=B7=A5=E6=AD=A5=EF=BC=8C=E6=A0=A1=E9=AA=8C?= =?UTF-8?q?=E9=87=87=E9=9B=86=E7=9A=84=E6=95=B0=E6=8D=AE=E5=AE=8C=E6=95=B4?= =?UTF-8?q?=E6=80=A7=E5=92=8C=E6=95=B0=E6=8D=AE=E8=B4=A8=E9=87=8F=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=88=E6=A0=BC--2021-05-22=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 70 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 10 ++++ 2 files changed, 80 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 7072531..cc07b12 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 @@ -6653,4 +6653,74 @@ public class MesPcnEnumUtil { } } + /** + * 工位等级 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_WORK_CELL_GRADE { + ORDINARY(10, "普通工位"), + MONITOR(20, "监听工位"); + + private int value; + private String description; + + MES_WORK_CELL_GRADE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + + /** + * 质检取值字段类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum QC_FILED_TYPE { + NUMBER(10, "数字"), + STRING(20, "字符串"); + + private int value; + private String description; + + QC_FILED_TYPE(int value, String description) { + this.value = value; + this.description = description; + } + + public static String valueOfDescription(Integer value) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == value) { + tmp = values()[i].description; + } + } + return tmp; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + } + } 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 6cb1b26..b759a7d 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 @@ -3815,4 +3815,14 @@ public class MesHqlPack { DdlPreparedPack.getNumEqualPack(mesPartSpecific.getIsValid(), "isValid", packBean); return packBean; } + + public static DdlPackBean getMesDbDataCheck(MesDbDataCheck mesDbDataCheck) { + DdlPackBean packBean = getAllBaseData(mesDbDataCheck.getOrganizeCode()); + DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getWorkCenterCode(), "workCenterCode", packBean); + DdlPreparedPack.getStringEqualPack(mesDbDataCheck.getPartNo(), "partNo", packBean); + DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getObjectCode(), "objectCode", packBean); + DdlPreparedPack.getStringLikerPack(mesDbDataCheck.getQcFiledCode(), "qcFiledCode", packBean); + DdlPreparedPack.getNumEqualPack(mesDbDataCheck.getIsValid(), "isValid", packBean); + return packBean; + } }