From 72502a863bb3b65e68a31ff129c7e70b6734585d Mon Sep 17 00:00:00 2001 From: "joke.wang" Date: Sat, 19 Sep 2020 19:32:21 +0800 Subject: [PATCH] Fix Bug #11490 --- .../i3plus/pojo/base/enumutil/MesEnumUtil.java | 6 ++- .../i3plus/pojo/base/enumutil/MesPcnEnumUtil.java | 55 +++++++++++++++++++++- .../pojo/mes/bean/MesQueueJitActualDetail.java | 2 +- .../pojo/mes/bean/MesWorkCellPointGroup.java | 4 ++ .../i3plus/pojo/mes/model/QueueOrderModel.java | 5 +- 5 files changed, 67 insertions(+), 5 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 69d0cb2..769dc34 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 @@ -3326,7 +3326,8 @@ public class MesEnumUtil { REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), - SPARE_RETURN_REPAIR(140, "客退备件返修"); + SPARE_RETURN_REPAIR(140, "客退备件返修"), + HOP_SEQ_ORDER(150, "跳序工单"); private int value; private String description; @@ -6658,7 +6659,8 @@ public class MesEnumUtil { @JsonFormat(shape = JsonFormat.Shape.OBJECT) public enum GROUP_SIDE { POSITIVE(10, "A", "正面"), - REVERSE_SIDE(20, "B", "背面"); + REVERSE_SIDE(20, "B", "背面"), + SPECIAL_SIDE(30, "C", "特殊件"); private Integer value; private String code; 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 ebde426..c076230 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 @@ -1915,7 +1915,8 @@ public class MesPcnEnumUtil { REPRODUCTION_RMS(110, "重新生产-报工"), REPRODUCTION_NOT_RMS(120, "重新生产-不报工"), REVERSE_SPRAY_ORDER(130, "反喷工单"), - SPARE_RETURN_REPAIR(140, "客退备件返修"); + SPARE_RETURN_REPAIR(140, "客退备件返修"), + HOP_SEQ_ORDER(150, "跳序工单"); private int value; private String description; @@ -5374,4 +5375,56 @@ public class MesPcnEnumUtil { } } + /** + * 队列 料架摆放位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_SIDE { + POSITIVE(10, "A", "正面"), + REVERSE_SIDE(20, "B", "背面"), + SPECIAL_SIDE(30, "C", "特殊件"); + + private Integer value; + private String code; + private String description; + + GROUP_SIDE(Integer value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public Integer getValue() { + return value; + } + + public String getCode() { + return code; + } + + public String getDescription() { + return description; + } + + public static String codeOfDescription(String code) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].code.equals(code)) { + tmp = values()[i].description; + } + } + return tmp; + } + + 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; + } + } + } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java index ca86eb4..f0f5944 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueJitActualDetail.java @@ -110,7 +110,7 @@ public class MesQueueJitActualDetail extends BaseBean implements Serializable { @Column(name = "IS_EMPTY") @ApiParam("是否放空") - private Integer isEmpty; + private Integer isEmpty = 2; @Transient @ApiParam("工单类型") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java index 91a7275..719ae64 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesWorkCellPointGroup.java @@ -75,6 +75,10 @@ public class MesWorkCellPointGroup extends BaseBean implements Serializable { @ApiParam("过程条码") private String serialNumber; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + @Transient @ApiParam("显示颜色") private String color; diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java index b16d1f9..5268375 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/model/QueueOrderModel.java @@ -336,7 +336,8 @@ public class QueueOrderModel implements Serializable { } // getQueueOrderBySerialNumber - public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType) { + public QueueOrderModel(Long id, String queueGroupNo, String jitLotNo, String vinCode, String organizeCode, String produceCategoryCode, String workType, + String partNo, String prodCfgTypeCode) { this.id = id; this.queueGroupNo = queueGroupNo; this.jitLotNo = jitLotNo; @@ -344,6 +345,8 @@ public class QueueOrderModel implements Serializable { this.organizeCode = organizeCode; this.produceCategoryCode = produceCategoryCode; this.workType = workType; + this.partNo = partNo; + this.prodCfgTypeCode = prodCfgTypeCode; } // getQueueJitActualJitSeq