diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java index 95b173e..3ff3798 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/CommonEnumUtil.java @@ -102,6 +102,11 @@ public class CommonEnumUtil { EAM_PAD(109, 8500, 28, 211000000L, "eam-pad", "设备信息管理服务pad"), /** + * 能源管理系统 + */ + EMS(37, 8450, 31, 170000000L, "i3ems", "能源管理系统 "), + + /** * SWEB调用 */ SWEB_VENDOR(666,8810,0,0,"sweb-vendor","供应商客户端服务"), diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java index 8b7d700..7204267 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPartItemCheck.java @@ -81,6 +81,6 @@ public class WmsPartItemCheck extends BaseBean { @Column(name = "INPUT_METHOD") @ApiParam("录入方式") - @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.NUMBER, isRequire = 2) - private Integer inputMethod; + @DynamicField(webFieldType = CommonEnumUtil.FIELD_TYPE.TEXT, isRequire = 2) + private String inputMethod; }