diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 06d2317..fb73d5e 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -6610,4 +6610,61 @@ public class WmsEnumUtil { return valueOf(val); } } + + + /** + * 返修、挑选状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum BOM_TYPE { + INIT(10, "PART", "物料"), + BE_HANDLE(20, "OUT", "委外"), + FINISH(30, "UTENSIL", "器具"); + + private int value; + private String code; + private String description; + + BOM_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + public static String valueOf(int val) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].value == val) { + tmp = values()[i].description; + } + } + return tmp; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + + public static String valueOfDescription(int val) { + return valueOf(val); + } + } } diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java index c87d03b..14d7a05 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBom.java @@ -112,6 +112,14 @@ public class WmsBom extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String terminalNo; + + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo; diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java index 6475e26..3456584 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsBomHistory.java @@ -115,6 +115,13 @@ public class WmsBomHistory extends BaseBean { @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) private String newBomVersion; + @Column(name = "BOM_TYPE") + @ApiParam(value = "BOM类型") + @ColumnDefault("10") + @DynamicField(webFieldType = WmsEnumUtil.FIELD_TYPE.SELECT, isRequire = 1) + @AnnoOutputColumn(refClass = WmsEnumUtil.BOM_TYPE.class, refForeignKey = "value", value = "description") + private Integer bomType; + @ApiParam(value = "目标存储区") @Transient public String destZoneNo;