From 7cd77129124e9c6bc773559c57f32aab316fce5d Mon Sep 17 00:00:00 2001 From: "gragon.xu" Date: Wed, 14 Nov 2018 16:35:09 +0800 Subject: [PATCH] Merge branch 'master' of http://git.estsh.com/i3-IMPP/i3plus-wms # Conflicts: # modules/i3plus-wms-api/src/main/java/cn/estsh/i3plus/wms/api/iservice/base/IProductionService.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/controller/base/WmsBaseDataController.java # modules/i3plus-wms-apiservice/src/main/java/cn/estsh/i3plus/wms/apiservice/serviceimpl/base/ProductionService.java --- .../estsh/i3plus/pojo/wms/sqlpack/WmsHqlPack.java | 24 +++++++++++++--------- 1 file changed, 14 insertions(+), 10 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 42f0798..185ee6b 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 @@ -47,8 +47,10 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementDetails.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementDetails.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } @@ -63,12 +65,14 @@ public class WmsHqlPack { //查询参数封装 HqlPack.getStringLikerPack(wmsDocMovementMaster.getOrderNo(), "orderNo", result); - HqlPack.getStringEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getOrderStatus(), "orderStatus", result); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getPartNo(), "partNo", result); - HqlPack.timeBuilder(wmsDocMovementMaster.getCreateDateTimeStart(), wmsDocMovementMaster.getCreateDateTimeEnd(), "createDatetime", result, true); - HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getMoveType(), "moveType", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getBusiType(), "busiType", result); + HqlPack.getStringLikerPack(wmsDocMovementMaster.getCustomerNo(), "customerNo", result); + HqlPack.getStringEqualPack(wmsDocMovementMaster.getOrganizeCode(), "organizeCode", result); + HqlPack.getNumEqualPack(wmsDocMovementMaster.getIsValid(), "isValid", result); + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), + "isDeleted", result); return result.toString(); } @@ -104,7 +108,7 @@ public class WmsHqlPack { HqlPack.getStringLikerPack(routingCode, "routingCode", result); HqlPack.getNumEqualPack(CommonEnumUtil.IS_VAILD.VAILD.getValue(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -123,7 +127,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsRoutingMaster.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsRoutingMaster.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); } @@ -145,7 +149,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(wmsPart.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(wmsPart.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); @@ -445,7 +449,7 @@ public class WmsHqlPack { HqlPack.getStringEqualPack(basCustomer.getOrganizeCode(), "organizeCode", result); HqlPack.getNumEqualPack(basCustomer.getIsValid(), "isValid", result); - HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.TRUE.getValue(), + HqlPack.getNumEqualPack(CommonEnumUtil.TRUE_OR_FALSE.FALSE.getValue(), "isDeleted", result); return result.toString(); }