From 129087588a358d207d1c00f277128ffa6da65869 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 3 Oct 2025 20:37:13 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=85=A5=E5=BA=93=E5=8D=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=8A=B5=E6=89=A3=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E6=98=8E=E7=BB=86bug=E4=BF=AE=E5=A4=8D=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/StoreProductStorageDemandDeducteServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java index 7326de65e..965269b1a 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductStorageDemandDeducteServiceImpl.java @@ -71,10 +71,9 @@ public class StoreProductStorageDemandDeducteServiceImpl implements IStoreProduc .eq(StoreProductStorageDemandDeduct::getStorageCode, storageCode).eq(StoreProductStorageDemandDeduct::getDelFlag, Constants.UNDELETED)); StoreProdStorageDemandDeductDTO dto = BeanUtil.toBean(storage, StoreProdStorageDemandDeductDTO.class).setStorageCode(storageCode) .setFacName(ObjectUtils.isNotEmpty(storeFac) ? storeFac.getFacName() : ""); - if (CollectionUtils.isEmpty(demandDeductList)) { - return dto; - } - Map> demandDeductMap = demandDeductList.stream().collect(Collectors.groupingBy(StoreProductStorageDemandDeduct::getStoreProdStorageDetailId)); + // 入库单明细具体抵扣需求单明细map + Map> demandDeductMap = CollectionUtils.isEmpty(demandDeductList) ? new HashMap<>() + : demandDeductList.stream().collect(Collectors.groupingBy(StoreProductStorageDemandDeduct::getStoreProdStorageDetailId)); List demandDetailDTOList = storageDetailList.stream().map(storageDetail -> { // 获取该明细的抵扣需求列表 List demandDetailList = ObjectUtils.defaultIfNull(demandDeductMap.get(storageDetail.getId()), new ArrayList<>());