From 0400daa0f8936b5d874f7194d76a326fa422ab44 Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 22 Nov 2018 14:45:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=98=9F=E5=88=97?= =?UTF-8?q?=E8=B0=83=E6=95=B4=20=E7=B3=BB=E7=BB=9F=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E7=AE=A1=E7=90=86=20=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/platform/bean/SysConfig.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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; From 43ebe4be721e3feb32c651fad6712cbba9ccac98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 22 Nov 2018 14:49:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=E5=8C=B9=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 4609c69..9f306ed 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); //客户全称 From 4229601ddb45a42b5396b5315131f728927e9ceb Mon Sep 17 00:00:00 2001 From: "yunhao.wang" Date: Thu, 22 Nov 2018 15:34:54 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/ImppEnumUtil.java | 12 ++++++------ .../java/cn/estsh/i3plus/pojo/platform/bean/SysMessage.java | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) 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/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")