From 019cb91a4c285704eeb197f4ae1197202429107d Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 26 Dec 2019 09:51:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=9C=80=E6=B1=82=EF=BC=9A1329?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 111 +++++++-------------- .../i3plus/pojo/mes/bean/MesButtonStatus.java | 18 +--- .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 23 +++++ 3 files changed, 61 insertions(+), 91 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 2a2e426..9c4d8f6 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 @@ -12,6 +12,41 @@ import com.fasterxml.jackson.annotation.JsonFormat; public class MesEnumUtil { + /** + * JIS发运模式类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum MES_JIS_PATTERN_TYPE { + ONE(10, "一套发运"), + TRUE(20, "多套发运"), + FALSE(30, "单产品多套发运"); + + private int value; + private String description; + + MES_JIS_PATTERN_TYPE(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; + } + } /** * 是否解析 @@ -2386,82 +2421,6 @@ public class MesEnumUtil { } /** - * mes按钮状态配置 判断符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_JUDGE_FLAG { - - EQUAL("=", "等于"), - NOT_EQUAL("!=", "不等于"), - GREATER_THAN(">", "大于"), - NOT_LESS_THAN(">=", "大于大于"), - LESS_THAN("<", "小于"), - NOT_GREATER_THAN("<=", "小于等于"); - - private String value; - private String description; - - MES_BUTTON_STATUS_JUDGE_FLAG(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; - } - } - - /** - * mes按钮状态配置 逻辑符号 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_BUTTON_STATUS_LOGIC_FLAG { - - AND("&&", "逻辑与"), - OR("||", "逻辑或"); - - private String value; - private String description; - - MES_BUTTON_STATUS_LOGIC_FLAG(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; - } - } - - /** * MesWorkOrder实体对应的approvalStatus值 审批状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java index 5c7d7ae..1b7c85c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesButtonStatus.java @@ -37,21 +37,9 @@ public class MesButtonStatus extends BaseBean { @ApiParam("实体类名称") private String ClassName; - @Column(name = "STATUS_FIELD") - @ApiParam("状态字段") - private String statusField; - - @Column(name = "JUDGE_FLAG") - @ApiParam("判断符合") - private String judgeFlag; - - @Column(name = "STATUS_VALUE") - @ApiParam("状态值") - private String statusValue; - - @Column(name = "LOGIC_FLAG") - @ApiParam("逻辑符合") - private String logicFlag; + @Column(name = "APPEND_HQL") + @ApiParam("拼接HQL") + private String appendHql; @Column(name = "STATUS_DESC") @ApiParam("描述") 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 b9eb3ec..8d904cf 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 @@ -2097,4 +2097,27 @@ public class MesHqlPack { } return packBean; } + + /** + * JIS发运模式 + * @param jisPattern + * @param organizeCode + * @return + */ + public static DdlPackBean getJisPatternCondition(MesJisPattern jisPattern, String organizeCode) { + DdlPackBean packBean = getAllBaseDataByNormalPro(jisPattern, organizeCode); + if (!StringUtils.isEmpty(jisPattern.getPatternNo())) { + DdlPreparedPack.getStringLikerPack(jisPattern.getPatternNo(), "patternNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getTopNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getTopNo(), "topNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getHandleNo())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getHandleNo(), "handleNo", packBean); + } + if (!StringUtils.isEmpty(jisPattern.getPatternType())) { + DdlPreparedPack.getNumEqualPack(jisPattern.getPatternType(), "patternType", packBean); + } + return packBean; + } }