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)); }