From cd25fab565eb4e30471d413f94111d6531cf5108 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 8 Nov 2023 11:17:47 +0800 Subject: [PATCH] =?UTF-8?q?UDI=E7=89=A9=E8=B5=84=E6=B5=81=E5=90=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9C=AA=E6=9F=A5=E8=AF=A2=E5=88=B0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inv/UdiTraceController.java | 2 +- .../com/glxp/api/service/inv/impl/InvProductDetailService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java index 7f191e9c..c6501e5a 100644 --- a/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java +++ b/src/main/java/com/glxp/api/controller/inv/UdiTraceController.java @@ -180,7 +180,7 @@ public class UdiTraceController { filterInvProductDetailRequest = new FilterInvProductDetailRequest(); filterInvProductDetailRequest.setRelId(udiRelevanceResponse.getId() + ""); filterInvProductDetailRequest.setBatchNo(udiEntity.getBatchNo()); - List invProductDetailEntities = invProductDetailService.filterInvProductDetailList(filterInvProductDetailRequest); + List invProductDetailEntities = invProductDetailService.selectByUnique(udiRelevanceResponse.getId(), udiEntity.getBatchNo(), null, null, null); if (CollUtil.isNotEmpty(invProductDetailEntities)) { mInvProductDetailEntities.addAll(invProductDetailEntities); } diff --git a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java index 998e4184..a6fc23a2 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java +++ b/src/main/java/com/glxp/api/service/inv/impl/InvProductDetailService.java @@ -105,7 +105,7 @@ public class InvProductDetailService extends ServiceImpl selectByUnique(Long relId, String batchNo, String supId, String deptCode, String invCode) { return invProductDetailDao.selectList(new QueryWrapper().eq("relId", relId).eq(StrUtil.isNotEmpty(batchNo), "batchNo", batchNo) - .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq("supId", supId).eq("deptCode", deptCode).eq("invCode", invCode)); + .isNull(StrUtil.isEmpty(batchNo), "batchNo").eq(supId != null,"supId", supId).eq(deptCode != null, "deptCode", deptCode).eq(invCode != null, "invCode", invCode)); }