diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java index f71827c..cf31941 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java @@ -348,7 +348,7 @@ public class ImppEnumUtil { * 2.UNREAD:未读 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_STATUS{ + public enum MESSAGE_STATUS { READ(1,"已读","fa cell-fa fa-file-text"), UNREAD(2,"未读","fa cell-fa fa-file-o"); @@ -357,10 +357,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_STATUS() { + MESSAGE_STATUS() { } - USER_MESSAGE_STATUS(int value, String name, String description) { + MESSAGE_STATUS(int value, String name, String description) { this.value = value; this.name = name; this.description = description; @@ -415,7 +415,7 @@ public class ImppEnumUtil { * 2.STATION_LETTER:站内信 */ @JsonFormat(shape = JsonFormat.Shape.OBJECT) - public enum USER_MESSAGE_TYPE{ + public enum MESSAGE_TYPE { MAIL(1,"邮件","邮件"), LETTER(2,"站内信","站内信"); @@ -424,10 +424,10 @@ public class ImppEnumUtil { private String name; private String description; - USER_MESSAGE_TYPE() { + MESSAGE_TYPE() { } - USER_MESSAGE_TYPE(int value, String name, String description) { + MESSAGE_TYPE(int value, String name, String description) { this.value = value; this.name = name; this.description = description; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java index ddaef4e..7bc50c5 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java @@ -31,19 +31,19 @@ public class SysConfig extends BaseBean { @Column(name="NAME") @ApiParam(value ="名称") private String name; - + @Column(name="CONFIG_TYPE") @ApiParam(value ="配置类型ID(枚举:1.系统配置...)" , example ="-1") private Integer configType; - + @Column(name="CONFIG_CODE") @ApiParam(value ="配置代码") private String configCode; - + @Column(name="CONFIG_VALUE") @ApiParam(value ="配置值") private String configValue; - + @Column(name="CONFIG_DESCRIPTION") @ApiParam(value ="配置描述") private String configDescription; diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java index 00aa85b..e805f03 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java @@ -35,11 +35,11 @@ public class SysMessage extends BaseBean { private String messageTitle; @Column(name="MESSAGE_TYPE") - @ApiParam(value ="消息类型(枚举:1.通知,2.站内信)" , example ="-1") + @ApiParam(value ="消息类型(枚举:ImppEnumUtil.MESSAGE_TYPE)" , example ="-1") private Integer messageType; @Column(name="MESSAGE_CONTENT_TYPE") - @ApiParam(value ="消息内容类型(枚举:1.HTML,2.TEXT)" , example ="-1") + @ApiParam(value ="消息内容类型(枚举:ImppEnumUtil.MESSAGE_CONTENT_TYPE)" , example ="-1") private Integer messageContentType; @Column(name="MESSAGE_CONTENT") diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java index d3e74f8..76f209f 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java @@ -385,11 +385,11 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //仓库代码 - HqlPack.getNumEqualPack(wmsZones.getWhNo(), "whNo", result); + HqlPack.getStringEqualPack(wmsZones.getWhNo(), "whNo", result); //库存地代码 - HqlPack.getNumEqualPack(wmsZones.getAreaNo(), "areaNo", result); + HqlPack.getStringEqualPack(wmsZones.getAreaNo(), "areaNo", result); //存储区代码 - HqlPack.getNumEqualPack(wmsZones.getZoneNo(), "zoneNo", result); + HqlPack.getStringEqualPack(wmsZones.getZoneNo(), "zoneNo", result); getStringBuilderPack(wmsZones, result); @@ -406,7 +406,7 @@ public class WmsHqlPack { StringBuffer result = new StringBuffer(); //客户编号 - HqlPack.getNumEqualPack(basCustomer.getCustNo(), "custNo", result); + HqlPack.getStringEqualPack(basCustomer.getCustNo(), "custNo", result); //客户简称 HqlPack.getStringLikerPack(basCustomer.getCustName(), "custName", result); //客户全称