From 5fd619ac799c1dc824ca979848e6a5e8180c94c5 Mon Sep 17 00:00:00 2001 From: jokelone Date: Fri, 8 Nov 2019 20:36:33 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90bug=EF=BC=9A5791=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=8D=95=E6=98=8E=E7=BB=86=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 95 ++++++++++++++++++++++ .../estsh/i3plus/pojo/mes/bean/MesObjectCfg.java | 4 + .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 11 ++- 3 files changed, 108 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 4ab5bdd..ab235ea 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 @@ -14,6 +14,101 @@ public class MesEnumUtil { /** + * Mes 对象结构是否保存 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum ORGANIZATION_INIT_DATA { + + MES_CONFIG("MesConfig", "MES_CONFIG", "配置表"), + MES_NUMBER_RULE("MesNumberRule", "MES_NUMBER_RULE", "编码规则表"), + MES_STEP("MesStep", "MES_STEP", "工步"), + MES_STEP_PARAM("MesStepParam", "MES_STEP_PARAM", "工步参数表"), + MES_PCN_SYNC_CFG("MesPcnSyncCfg", "MES_PCN_SYNC_CFG", "同步配置"), + MES_BUTTON_STATUS("MesButtonStatus", "MES_BUTTON_STATUS", "按钮状态配置表"), + MES_WORK_CELL_PARAM("MesWorkCellParam", "MES_WORK_CELL_PARAM", "工作单元参数"), + MES_STATUS_CFG("MesStatusCfg", "MES_STATUS_CFG", "状态配置"), + MES_EVENT("MesEvent", "MES_EVENT", "事件清单"), + MES_METHOD("MesMethod", "MES_METHOD", "方法清单"), + MES_ACTION("MesAction", "MES_ACTION", "动作"), + MES_EVENT_ACTION("MesEventAction", "MES_EVENT_ACTION", "事件动作配置"), + MES_ACTION_METHOD("MesActionMethod", "MES_ACTION_METHOD", "动作方法配置"); + + private String value; + private String code; + private String description; + + ORGANIZATION_INIT_DATA(String value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public String getValue() { + return value; + } + + public String getDescription() { + return description; + } + // 根据value返回枚举类型,主要在switch中使用 + public static ORGANIZATION_INIT_DATA getByValue(String value) { + for (ORGANIZATION_INIT_DATA mesInsertExcel : values()) { + if (mesInsertExcel.getValue().equals(value)) { + return mesInsertExcel; + } + } + return null; + } + + public static String valueOfDescription(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value.equals(val)) { + tmp = values()[i].description; + } + } + return tmp; + } + } + + /** + * Mes 对象结构是否保存 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum OBJECT_CFG_IS_SAVE { + + SAVE(1, "存储"), + NO_SAVE(2, "不存储"); + + private int value; + private String description; + + OBJECT_CFG_IS_SAVE(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + 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; + } + } + + + /** * Mes 客户订单来源 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index b294abe..b38c717 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -51,4 +51,8 @@ public class MesObjectCfg extends BaseBean { @ApiParam("对应的pojo属性") private String pojoAttr; + @Column(name = "IS_SAVE") + @ApiParam("是否存储") + private Integer isSave; + } 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 514f70f..a7666ba 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 @@ -1718,11 +1718,14 @@ public class MesHqlPack { if (!StringUtils.isEmpty(mesCustOrder.getPartNo())) { DdlPreparedPack.getStringLikerPack(mesCustOrder.getPartNo(), "partNo", packBean); } + if (!StringUtils.isEmpty(mesCustOrder.getOrderNo())) { + DdlPreparedPack.getStringLikerPack(mesCustOrder.getOrderNo(), "orderNo", packBean); + } if (!StringUtils.isEmpty(mesCustOrder.getCustCode())) { - DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustCode(), "custCode", packBean); + DdlPreparedPack.getStringLikerPack(mesCustOrder.getCustCode(), "custCode", packBean); } if (!StringUtils.isEmpty(mesCustOrder.getCustOrderNo())) { - DdlPreparedPack.getStringEqualPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean); + DdlPreparedPack.getStringLikerPack(mesCustOrder.getCustOrderNo(), "custOrderNo", packBean); } if (!StringUtils.isEmpty(mesCustOrder.getCreateUser())) { DdlPreparedPack.getStringLikerPack(mesCustOrder.getCreateUser(), "createUser", packBean); @@ -1737,6 +1740,10 @@ public class MesHqlPack { mesCustOrder.getOrderTimeStart(), mesCustOrder.getOrderTimeEnd(), "orderDate", packBean, true); + DdlPreparedPack.timeBuilder( + mesCustOrder.getCreateDateTimeStart(), + mesCustOrder.getCreateDateTimeEnd(), + "createDatetime", packBean, true); return packBean; } }