From be354e6dd3b97453359da6657445932ffa42fcfb Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 15 Nov 2018 19:11:13 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../i3plus/pojo/base/enumutil/WmsEnumUtil.java | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1507622..7566c76 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -346,4 +346,59 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 库位类型 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum LOCATE_TYPE { + COLLECT_LOCATE(10, "I", "收货库"), + BASICS_LOCATE(20, "P", "基础库"), + maneuver_LOCATE(30, "R", "机动库"), + COMBINATION_LOCATE(40, "D", "组合库"), + LINE_LOCATE(50, "L", "线边库"), + NC_LOCATE(60, "N", "NC库"); + + private int value; + private String code; + private String description; + + LOCATE_TYPE(int value, String code, String description) { + this.value = value; + this.code = code; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return description; + } + + public String getCode() { + return code; + } + + 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; + } + + public static int descOf(String desc) { + int tmp = 1; + for (int i = 0; i < values().length; i++) { + if (values()[i].description.equals(desc)) { + tmp = values()[i].value; + } + } + return tmp; + } + } } From d5b71f274fcfd34bf697cf5ade271644ad17088c Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 15 Nov 2018 19:42:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=95=E5=85=83=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=B7=A5=E5=85=B7=E7=B1=BB=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java | 2 ++ .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java index 1507622..c1670af 100644 --- a/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java +++ b/modules/i3plus-pojo-base/src/main/java/cn/estsh/i3plus/pojo/base/enumutil/WmsEnumUtil.java @@ -283,6 +283,8 @@ public class WmsEnumUtil { } } + + /** * 消息队列，队列名称 * 1: success_queue 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 8feb7dd..7d57076 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 @@ -4,6 +4,7 @@ import cn.estsh.i3plus.pojo.base.bean.BaseBean; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.WmsEnumUtil; import cn.estsh.i3plus.pojo.base.tool.HqlPack; +import cn.estsh.i3plus.pojo.base.tool.SqlPack; import cn.estsh.i3plus.pojo.wms.bean.*; import org.apache.commons.lang3.StringUtils; @@ -24,13 +25,14 @@ public class WmsHqlPack { */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { + // 判断工厂代码是否为空 if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); - } else if (bean.getIsValid() > 0) { - hqlStr.append(" and model.isValid = " + bean.getIsValid()); + SqlPack.getStringEqualPack(bean.getOrganizeCode(), "organizeCode", hqlStr); } - hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + // 封装有效状态和删除状态 + SqlPack.getNumEqualPack(bean.getIsValid(), "isValid", hqlStr); + SqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", hqlStr); return hqlStr.toString(); } @@ -113,11 +115,9 @@ public class WmsHqlPack { HqlPack.getNumEqualPack(wmsPOMaster.getPoStatus(), "poStatus", result); HqlPack.getStringLikerPack(wmsPOMaster.getVendorNo(), "vendorNo", result); HqlPack.getStringLikerPack(wmsPOMaster.getSrc(), "src", result); -// HqlPack.getNumEqualPack(wmsPOMaster.getIsValid(), "isValid", result); -// HqlPack.getNumEqualPack(wmsPOMaster.getIsDeleted(), "isDeleted", result); + HqlPack.getStringEqualPack(wmsPOMaster.getIsAsn(), "isAsn", result); getStringBuilderPack(wmsPOMaster, result); - return result.toString(); }