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 ce238d6..cc7e9ae 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 @@ -6640,4 +6640,55 @@ public class MesEnumUtil { return tmp; } } + + /** + * 队列 料架摆放位置 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum GROUP_SIDE { + POSITIVE(10, "A", "正面"), + REVERSE_SIDE(20, "B", "背面"); + + 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/MesJitIssueCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java index 7bfc2e8..25b58db 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesJitIssueCfg.java @@ -36,7 +36,7 @@ public class MesJitIssueCfg extends BaseBean implements Serializable { private String custPlantCode; @Column(name = "QTY") - @ApiParam("数量") + @ApiParam("配置数量") private Integer qty; @Column(name = "THRESHOLD_QTY") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java index a459fb4..1c1795f 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupCount.java @@ -11,6 +11,7 @@ import org.hibernate.annotations.DynamicUpdate; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.persistence.Transient; import java.io.Serializable; /** @@ -46,4 +47,8 @@ public class MesQueueGroupCount extends BaseBean implements Serializable { @Column(name = "CNT_QTY") @ApiParam("累计数") private Integer cntQty; + + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; } diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java index c9e3f4f..dd39bd2 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueGroupRule.java @@ -14,7 +14,7 @@ import javax.persistence.Table; import java.io.Serializable; /** - * @Description :MES_QUEUE_GROUP_COUNT + * @Description : * @Reference : * @Author : joke * @CreateDate : 2020-03-06 10:16 上午 diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java index 5aba4be..394d96c 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesQueueOrderDetail.java @@ -116,6 +116,10 @@ public class MesQueueOrderDetail extends BaseBean implements Serializable { @ApiParam("已生产数量") private Double finsihQty; + @Column(name = "GROUP_SIDE") + @ApiParam("料架摆放位置") + private String groupSide; + @Transient @ApiParam("Vin") private String vinCode;