From bf71cd07d014c2071fb20da2e5cddadb41da6050 Mon Sep 17 00:00:00 2001 From: "jhforever.wang@estsh.com" Date: Thu, 16 Jan 2020 21:41:53 +0800 Subject: [PATCH] =?UTF-8?q?JIS=E5=8F=91=E8=BF=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 7 ++-- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 46 +++------------------- .../i3plus/pojo/mes/pcn/bean/MesPatternJis.java | 28 ++++++------- .../i3plus/pojo/mes/pcn/bean/MesQueueJis.java | 5 +++ .../pojo/mes/pcn/bean/MesQueueJisDetail.java | 4 ++ .../i3plus/pojo/mes/pcn/model/QueueJisModel.java | 20 ++++++++-- .../pojo/mes/pcn/model/StationResultBean.java | 3 ++ .../estsh/i3plus/pojo/mes/bean/MesPatternJis.java | 28 ++++++------- .../i3plus/pojo/mes/bean/MesQueueJisDetail.java | 4 ++ .../estsh/i3plus/pojo/mes/sqlpack/MesHqlPack.java | 4 +- 10 files changed, 73 insertions(+), 76 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 067cb20..a5c7c54 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 @@ -50,14 +50,14 @@ public class MesEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); private int value; private String description; - MES_JIS_PATTERN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -3419,7 +3419,8 @@ public class MesEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; 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 674878a..8baa6a5 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 @@ -16,49 +16,14 @@ public class MesPcnEnumUtil { * JIS发运模式类型 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_PATTERN_TYPE { + public enum JIS_PATTERN_TYPE { ONE_PROD(10, "单产品发运"), MANY_PROD(20, "多产品发运"); 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; - } - } - - /** - * JIS发运是否按主队列顺序扫描 - */ - @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_JIS_SCAN_TYPE { - TRUE(10, "是"), - FALSE(20, "否"); - - private int value; - private String description; - - MES_JIS_SCAN_TYPE(int value, String description) { + JIS_PATTERN_TYPE(int value, String description) { this.value = value; this.description = description; } @@ -86,7 +51,7 @@ public class MesPcnEnumUtil { * JIS发运队列状态 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum MES_QUEUE_JIS_STATUS { + public enum JIS_QUEUE_STATUS { TRUE(10, "已发运"), FALSE(20, "未发运"); @@ -94,7 +59,7 @@ public class MesPcnEnumUtil { private int value; private String description; - MES_QUEUE_JIS_STATUS(int value, String description) { + JIS_QUEUE_STATUS(int value, String description) { this.value = value; this.description = description; } @@ -2516,7 +2481,8 @@ public class MesPcnEnumUtil { EXP_TEXT("exp_text", "异常文本"), FILE("file", "定制内容文件"), IMAGE("image", "图片"), - BUTTON("button", "按钮"); + BUTTON("button", "按钮"), + TABLES("tables", "多个表格"); private String value; private String description; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java index 6635e25..293fc07 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesPatternJis.java @@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理套数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java index b833dfc..c08acfd 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJis.java @@ -12,6 +12,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; /** * @Description :JIS发运队列 @@ -61,4 +62,8 @@ public class MesQueueJis extends BaseBean { @ApiParam("工作单元代码") private String workCellCode; + @Transient + @ApiParam("颜色") + private String color; + } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java index e8243ed..86cddfb 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesQueueJisDetail.java @@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("明细整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java index 7a32f8b..b0cb953 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/QueueJisModel.java @@ -42,24 +42,37 @@ public class QueueJisModel implements Serializable { @ApiParam("产品条码") private String serialNumber; + @ApiParam("明细整体状态") + private Integer finalStatus; + @ApiParam("状态名称") private String statusName; @ApiParam("明细状态名称") private String detailStatusName; + @ApiParam("明细整体状态名称") + private Integer finalStatusName; + + @ApiParam("颜色") + private String color; + public String getStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.status); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.status); } public String getDetailStatusName() { - return MesPcnEnumUtil.MES_QUEUE_JIS_STATUS.valueOfDescription(this.detailStatus); + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.detailStatus); + } + + public String getFinalStatusName() { + return MesPcnEnumUtil.JIS_QUEUE_STATUS.valueOfDescription(this.finalStatus); } public QueueJisModel() { } - public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber) { + public QueueJisModel(String jisNo, String vinCode, String carNo, Double seq, Integer status, String prodCfgCode, String partNo, String partNameRdd, String produceCategoryCode, Integer detailStatus, String serialNumber, Integer finalStatus) { this.jisNo = jisNo; this.vinCode = vinCode; this.carNo = carNo; @@ -71,6 +84,7 @@ public class QueueJisModel implements Serializable { this.produceCategoryCode = produceCategoryCode; this.detailStatus = detailStatus; this.serialNumber = serialNumber; + this.finalStatus = finalStatus; } } diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java index e86fd56..978fd4b 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/model/StationResultBean.java @@ -49,4 +49,7 @@ public class StationResultBean implements Serializable { @ApiParam("图片路径") private String imageUrl; + + @ApiParam("多个数据集") + private List> stationResultBeans; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java index b7a7b64..87400b0 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesPatternJis.java @@ -38,29 +38,29 @@ public class MesPatternJis extends BaseBean { @ApiParam("模式名称") private String patternName; - @Lob - @Column(name = "RULE") - @ApiParam("规则") - private String rule; + @Column(name = "QUEUE_NO") + @ApiParam("显示主队列数") + private Integer queueNo; + + @Column(name = "HANDLE_NO") + @ApiParam("一次处理队列数") + private Integer handleNo; @Column(name = "PATTERN_DESC") @ApiParam("描述") private String patternDesc; - @Column(name = "TOP_NO") - @ApiParam("一次显示TOP数") - private Integer topNo; - - @Column(name = "HANDLE_NO") - @ApiParam("一次处理套数") - private Integer handleNo; + @Column(name = "PRODUCE_CTGY_CODE") + @ApiParam("产品类型组") + private String produceCategoryCode; @Column(name = "PATTERN_TYPE") @ApiParam("模式类型") private Integer patternType; - @Column(name = "SCAN_TYPE") - @ApiParam("是否按主队列顺序扫描") - private Integer scanType; + @Lob + @Column(name = "RULE") + @ApiParam("规则") + private String rule; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java index db45636..03f8870 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJisDetail.java @@ -49,6 +49,10 @@ public class MesQueueJisDetail extends BaseBean { @ApiParam("状态") private Integer status; + @Column(name = "FINAL_STATUS") + @ApiParam("发运整体状态") + private Integer finalStatus; + @Column(name = "SERIAL_NUMBER") @ApiParam("产品条码") private String serialNumber; 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 dbf4e42..9a46d75 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 @@ -2105,8 +2105,8 @@ public class MesHqlPack { if (!StringUtils.isEmpty(patternJis.getPatternNo())) { DdlPreparedPack.getStringLikerPack(patternJis.getPatternNo(), "patternNo", packBean); } - if (!StringUtils.isEmpty(patternJis.getTopNo())) { - DdlPreparedPack.getNumEqualPack(patternJis.getTopNo(), "topNo", packBean); + if (!StringUtils.isEmpty(patternJis.getQueueNo())) { + DdlPreparedPack.getNumEqualPack(patternJis.getQueueNo(), "queueNo", packBean); } if (!StringUtils.isEmpty(patternJis.getHandleNo())) { DdlPreparedPack.getNumEqualPack(patternJis.getHandleNo(), "handleNo", packBean);