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 3673841..cf2bec1 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 @@ -428,6 +428,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } @@ -714,6 +724,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -1308,7 +1328,10 @@ public class MesEnumUtil { MES_SHIFT(180, "班次"), MES_SHIFT_GROUP(190, "班组"), MES_WORK_CELL_PARAM_CFG(200, "工作单元参数配置"), - MES_STATION_BOM(210, "工位BOM表"); + MES_STATION_BOM(210, "工位BOM表"), + MES_DATA_OBJECT(220, "数据对象"), + MES_OBJECT_CFG(230, "对象结构"), + MES_WC_CHECK(240, "开线检查"); private int value; private String description; @@ -3479,6 +3502,16 @@ public class MesEnumUtil { } return tmp; } + + public static String descriptionOfValue(String description) { + String tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** @@ -3525,6 +3558,16 @@ public class MesEnumUtil { } return tmp; } + + public static Integer descriptionOfValue(String description) { + Integer tmp = null; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(description)) { + tmp = values()[i].value; + } + } + return tmp; + } } /** diff --git a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java index ca13bc4..fc8ee12 100644 --- a/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes-pcn/src/main/java/cn/estsh/i3plus/pojo/mes/pcn/bean/MesObjectCfg.java @@ -45,7 +45,7 @@ public class MesObjectCfg extends BaseBean { @Column(name = "FIELD_LENGTH") @ApiParam("列长度") - private String fieldLength; + private Integer fieldLength; @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性") diff --git a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java index b38c717..a5ccc00 100644 --- a/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java +++ b/modules/i3plus-pojo-mes/src/main/java/cn/estsh/i3plus/pojo/mes/bean/MesObjectCfg.java @@ -45,7 +45,7 @@ public class MesObjectCfg extends BaseBean { @Column(name = "FIELD_LENGTH") @ApiParam("列长度") - private String fieldLength; + private Integer fieldLength; @Column(name = "POJO_ATTR") @ApiParam("对应的pojo属性")