From 9ee2901346da9e3025ae6932b00dc3ea37bc8a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B1=AA=E4=BA=91=E6=98=8A?= Date: Mon, 12 Aug 2019 18:23:27 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8?= =?UTF-8?q?=E5=88=86=E7=BB=84=20=E4=BC=98=E5=8C=96redis=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=94=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/ImppEnumUtil.java | 35 +++++++++++ .../i3plus/pojo/platform/bean/SysDictionary.java | 5 ++ .../i3plus/pojo/platform/sqlpack/CoreHqlPack.java | 70 ++++++++++++++-------- 3 files changed, 84 insertions(+), 26 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 4a39acd..82b0e3c 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 @@ -1152,4 +1152,39 @@ public class ImppEnumUtil { return tmp; } } + + + /** + * 字典分组 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum DICTIONARY_GROUP { + SYSTEM(1, "系统字典"), + EXTERNAL(2, "外部人员"); + private int value; + private String description; + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + private DICTIONARY_GROUP(int value, String description) { + this.value = value; + this.description = description; + } + + 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; + } + } } diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java index 32929c7..5122623 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/bean/SysDictionary.java @@ -45,6 +45,11 @@ public class SysDictionary extends BaseBean { @ApiParam(value ="字典所属模块") private Integer dictionarySoftType; + //枚举 ImppEnumUtil.DICTIONARY_GROUP + @Column(name="DICTIONARY_GROUP") + @ApiParam(value ="字典分组") + private Integer dictionaryGroup; + // 根节点-1 @Column(name="PARENT_ID") @ApiParam(value ="父节点" , example = "-1") diff --git a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java index bcff699..2d777b9 100644 --- a/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java +++ b/modules/i3plus-pojo-platform/src/main/java/cn/estsh/i3plus/pojo/platform/sqlpack/CoreHqlPack.java @@ -316,24 +316,24 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionary(SysDictionary dictionary) { - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryPage(SysDictionary dictionary) { + DdlPackBean result = new DdlPackBean(); // hql拼接 - HqlPack.getStringLikerPack(dictionary.getName(), "name", result); - HqlPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); + DdlPreparedPack.getStringLikerPack(dictionary.getName(), "name", result); + DdlPreparedPack.getStringLikerPack(dictionary.getDictionaryCode(), "dictionaryCode", result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(), "dictionarySoftType", result); // 默认查询非顶级字典 if (dictionary.getParentId() == null || dictionary.getParentId() < 1){ - HqlPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); + DdlPreparedPack.getNumNOEqualPack(CommonEnumUtil.PARENT.DEFAULT.getValue(), "parentId", result); } - HqlPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); - HqlPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(), "parentId", result); + DdlPreparedPack.getStringLikerPack(dictionary.getParentCodeRdd(),"parentCodeRdd", result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -550,20 +550,20 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionaryCode(SysDictionary dictionary){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryCode(SysDictionary dictionary){ + DdlPackBean result = new DdlPackBean(); // and - HqlPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryCode(),"dictionaryCode",result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not - HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -571,20 +571,20 @@ public class CoreHqlPack { * @param dictionary * @return */ - public static String packHqlSysDictionaryValue(SysDictionary dictionary){ - StringBuffer result = new StringBuffer(); + public static DdlPackBean packHqlSysDictionaryValue(SysDictionary dictionary){ + DdlPackBean result = new DdlPackBean(); // and - HqlPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); - HqlPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); - HqlPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); + DdlPreparedPack.getStringEqualPack(dictionary.getDictionaryValue(),"dictionaryValue",result); + DdlPreparedPack.getNumEqualPack(dictionary.getParentId(),"parentId",result); + DdlPreparedPack.getNumEqualPack(dictionary.getDictionarySoftType(),"dictionarySoftType",result); // not - HqlPack.getNumNOEqualPack(dictionary.getId(),"id",result); + DdlPreparedPack.getNumNOEqualPack(dictionary.getId(),"id",result); // 添加默认排序 - HqlPack.getOrderDefault(dictionary); + DdlPreparedPack.getOrderDefault(dictionary); - return result.toString(); + return result; } /** @@ -932,4 +932,22 @@ public class CoreHqlPack { return packBean; } + + /** + * 按条件查询字典 + * @param sysDictionary + * @return + */ + public static DdlPackBean packHqlSysDictionary(SysDictionary sysDictionary){ + DdlPackBean packBean = new DdlPackBean(); + + DdlPreparedPack.getStringEqualPack(sysDictionary.getName(), "name", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getDictionaryCode(), "dictionaryCode", packBean); + DdlPreparedPack.getStringEqualPack(sysDictionary.getParentCodeRdd(), "parentCodeRdd", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getParentId(),"parentId",packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionarySoftType(), "dictionarySoftType", packBean); + DdlPreparedPack.getNumEqualPack(sysDictionary.getDictionaryGroup(),"dictionaryGroup",packBean); + + return packBean; + } } \ No newline at end of file From b604c5d9a026716d2d0f0d369f2064d96311039b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 13 Aug 2019 11:32:18 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BA=A4=E6=98=93=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java index 610d8e5..281e113 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsTransQuan.java @@ -143,10 +143,14 @@ public class WmsTransQuan extends BaseBean { @ApiParam(value = "报废数量", example = "0") private Double scrapQty; - @Transient - @ApiParam("交易类型") + @Column(name="TRANS_TYPE_NAME") + @ApiParam(value ="交易名称") private String transTypeName; + /*@Transient + @ApiParam("交易类型") + private String transTypeName;*/ + @Transient @ApiParam("仓库名称") private String warehouseName; From ff52a412d4296f23d3f8568d86ad2bc9a4cf19b6 Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 13 Aug 2019 13:48:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BA=93=E5=AD=98=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=8C=96=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 8330f08..30eeaec 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 @@ -334,7 +334,7 @@ public class WmsHqlPack { DdlPackBean result = new DdlPackBean(); //查询参数封装 - DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringRightLikerPack(wmsTransType.getTransTypeCode(), "transTypeCode", result); DdlPreparedPack.getStringLikerPack(wmsTransType.getTransTypeName(), "transTypeName", result); DdlPreparedPack.getNumEqualPack(wmsTransType.getAgId(), "agId", result); @@ -922,6 +922,7 @@ public class WmsHqlPack { DdlPreparedPack.getStringLikerPack(wmsTransQuan.getMoveNo(), "moveNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getPartNo(), "partNo", result); DdlPreparedPack.getStringEqualPack(wmsTransQuan.getLocateNo(), "locateNo", result); + DdlPreparedPack.getStringEqualPack(wmsTransQuan.getTransTypeName(), "transTypeName", result); getStringBuilderPack(wmsTransQuan, result);