From 25d8df360d3600fde43daef0d6527c4fcddf8b8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=80=9D=E6=B4=81?= Date: Tue, 9 Jul 2019 11:11:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=BF=AE=E6=94=B9hql?= 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 | 2 +- 1 file changed, 1 insertion(+), 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 8e91752..5996175 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 @@ -2103,7 +2103,7 @@ public class WmsHqlPack { //查询参数封装 DdlPreparedPack.getInPackList(statusList,"asnStatus",result); DdlPreparedPack.getNumEqualPack(WmsEnumUtil.PRODUCT_INSTOCK_STATUS.CREATE.getValue(),"actionStatus",result); - DdlPreparedPack.getStringEqualPack(String.valueOf(WmsEnumUtil.ORDER_TYPE.AMP.getValue()),"asnType",result); + DdlPreparedPack.getNumEqualPack(WmsEnumUtil.ORDER_TYPE.AMP.getValue(),"asnType",result); DdlPreparedPack.getStringEqualPack(organizeCode,"organizeCode",result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), "isValid", result); DdlPreparedPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); From 483b93cb9fc5373fb7af4e3f071a271d2853b28c Mon Sep 17 00:00:00 2001 From: "jimmy.zeng" Date: Tue, 9 Jul 2019 11:47:03 +0800 Subject: [PATCH 2/2] bug #4939 #4914 --- .../src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java | 4 ++++ .../src/main/java/cn/estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java index 3ba7285..8ef0841 100644 --- a/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java +++ b/modules/i3plus-pojo-wms/src/main/java/cn/estsh/i3plus/pojo/wms/bean/WmsPOMaster.java @@ -131,4 +131,8 @@ public class WmsPOMaster extends BaseBean { @Transient @ApiParam("手机") private String vendorPhone; + + @Transient + @ApiParam("前端信息") + private String message; } 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 8e91752..56f947c 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 @@ -974,6 +974,13 @@ public class WmsHqlPack { DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getOrderNo(), "orderNo", result); DdlPreparedPack.getNumEqualPack(wmsMoveMaster.getOrderStatus(), "orderStatus", result); DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getTransTypeCode(), "transTypeCode", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getCreateUser(), "createUser", result); + DdlPreparedPack.getStringEqualPack(wmsMoveMaster.getModifyUser(), "modifyUser", result); + + DdlPreparedPack.timeBuilder(wmsMoveMaster.getCreateDateTimeStart(), + wmsMoveMaster.getCreateDateTimeEnd(),"createDatetime",result,true); + DdlPreparedPack.timeBuilder(wmsMoveMaster.getModifyDateTimeStart(), + wmsMoveMaster.getModifyDateTimeEnd(),"modifyDatetime",result,true); getStringBuilderPack(wmsMoveMaster, result); return result;