From eb2ac7a40880ba6986239700350ba32580a75fb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 15 Nov 2018 10:25:59 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 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 6676ae7..beaa558 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 @@ -488,10 +488,7 @@ public class WmsHqlPack { //客户全称 HqlPack.getStringLikerPack(basCustomer.getCustDesc(), "custDesc", result); - HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result); - HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), - "isDeleted", result); + getStringBuilderPack(basCustomer, result); return result.toString(); } @@ -504,15 +501,14 @@ public class WmsHqlPack { public static String packHqlWmsShippingFlag(WmsShippingFlag wmsShippingFlag) { StringBuffer result = new StringBuffer(); - //有效性,删除标记 - HqlPack.getNumEqualPack(wmsShippingFlag.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); //供应商编号 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagNo(), "flagNo", result); //供应商简称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagName(), "flagName", result); //供应商全称 HqlPack.getStringLikerPack(wmsShippingFlag.getFlagDesc(), "flagDesc", result); + getStringBuilderPack(wmsShippingFlag, result); + return result.toString(); } @@ -656,8 +652,8 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(wmsFGInStock.getCustNo(), "custNo", result); HqlPack.getStringLikerPack(wmsFGInStock.getShippingFlag(), "shippingFlag", result); HqlPack.getStringLikerPack(wmsFGInStock.getMfgLogNo(), "mfgLogNo", result); - HqlPack.getNumEqualPack(wmsFGInStock.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + getStringBuilderPack(wmsFGInStock, result); + return result.toString(); } @@ -669,13 +665,14 @@ public class WmsHqlPack { */ public static String packHqlWmsTaskInfo(WmsTaskInfo wmsTaskInfo) { StringBuffer result = new StringBuffer(); + HqlPack.getStringLikerPack(wmsTaskInfo.getMoveNo(), "moveNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getUserNo(), "userNo", result); HqlPack.getStringLikerPack(wmsTaskInfo.getOpTypeCode(), "opTypeCode", result); HqlPack.getStringLikerPack(wmsTaskInfo.getReMark(), "reMark", result); HqlPack.getNumEqualPack(wmsTaskInfo.getTaskStatus(), "taskStatus", result); - HqlPack.getNumEqualPack(wmsTaskInfo.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); + getStringBuilderPack(wmsTaskInfo, result); + return result.toString(); } } From 0c7eac9025492f3b066faafafd0bd835eae2aed3 Mon Sep 17 00:00:00 2001 From: Silliter Date: Thu, 15 Nov 2018 16:12:43 +0800 Subject: [PATCH 2/4] =?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 --- .../java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 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 53236f0..8feb7dd 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 @@ -24,16 +24,14 @@ public class WmsHqlPack { */ public static String getStringBuilderPack(BaseBean bean, StringBuffer hqlStr) { - if (hqlStr != null && hqlStr.toString().trim().length() > 0) { - if (StringUtils.isNotBlank(bean.getOrganizeCode())) { - hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); - } else if (bean.getIsValid() > 0) { - hqlStr.append(" and model.isValid = " + bean.getIsValid()); - } - - hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + if (StringUtils.isNotBlank(bean.getOrganizeCode())) { + hqlStr.append(" and model.organizeCode = " + bean.getOrganizeCode()); + } else if (bean.getIsValid() > 0) { + hqlStr.append(" and model.isValid = " + bean.getIsValid()); } + hqlStr.append(" and model.isDeleted = " + CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue()); + return hqlStr.toString(); } From 2995a1e0574f8c88aa60c94653734434e2def28d Mon Sep 17 00:00:00 2001 From: jimmy <1622218722@qq.com> Date: Thu, 15 Nov 2018 17:29:37 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= 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 | 4 +++- 1 file changed, 3 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 53236f0..536d31e 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 @@ -192,6 +192,8 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNo(), "partNo", result); HqlPack.getStringLikerPack(wmsIbCheckPlan.getPartNameRdd(), "partNameRdd", result); + HqlPack.timeBuilder(wmsIbCheckPlan.getStartDate(), null, "startDate", result, true); + HqlPack.timeBuilder(wmsIbCheckPlan.getEndDate(), null, "endDate", result, true); HqlPack.getNumEqualPack(wmsIbCheckPlan.getIsValid(), "isValid", result); HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); HqlPack.getStringEqualPack(wmsIbCheckPlan.getOrganizeCode(),"organizeCode",result); @@ -231,7 +233,7 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsLocate.getLocateNo(), "locateNo", result); HqlPack.getStringLikerPack(wmsLocate.getLocateName(), "locateName", result); - HqlPack.getStringLikerPack(wmsLocate.getLocateType(), "locateType", result); + HqlPack.getStringEqualPack(wmsLocate.getLocateType(), "locateType", result); HqlPack.getStringLikerPack(wmsLocate.getWhNo(), "whNo", result); HqlPack.getStringLikerPack(wmsLocate.getZoneNo(), "zoneNo", result); HqlPack.getNumEqualPack(wmsLocate.getIsValid(), "isValid", result); From 4ebe75e66c41cfb81458b7c71e7736c413f5869e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9F=AF=E8=A3=95?= Date: Thu, 15 Nov 2018 17:41:45 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=BB=BA=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 | 34 ++++++++++++++++++++++ 1 file changed, 34 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..46a95e3 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,38 @@ public class WmsEnumUtil { return tmp; } } + + /** + * 产品入库的产品状态 + */ + @JsonFormat(shape = JsonFormat.Shape.OBJECT) + public enum PRODUCT_INSTOCK_STATUS { + CREATE(10, "创建"), FINISH(20, "已处理"),FAIL(30,"处理出错"); + + private int value; + private String description; + + PRODUCT_INSTOCK_STATUS(int value, String description) { + this.value = value; + this.description = description; + } + + public int getValue() { + return value; + } + + public String getDescription() { + return 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; + } + } }