From 7804e7a907c6bb407b359fa144fd09fb081be09f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 07 一月 2025 17:50:39 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/eyes

---
 manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
index fe8dfbe..6a960eb 100644
--- a/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
+++ b/manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java
@@ -91,12 +91,17 @@
     public PageInfo<TWarehousingVO> inventoryReceiptList(TWarehousingDetailQuery query) {
         PageInfo<TWarehousingVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
         List<TWarehousingVO> list = this.baseMapper.inventoryReceiptList(query,pageInfo);
+        List<TStore> stores = storeMapper.selectList(Wrappers.lambdaQuery(TStore.class)
+                .in(TStore::getId, list.stream().map(TWarehousingVO::getStoreId).collect(Collectors.toList())));
         for (TWarehousingVO tWarehousingVO : list) {
             List<TFrameWarehousingDetail> tFrameWarehousingDetails = frameWarehousingDetailMapper.selectList(Wrappers.lambdaQuery(TFrameWarehousingDetail.class)
                     .eq(TFrameWarehousingDetail::getWarehousingId, tWarehousingVO.getId()));
             if(CollectionUtils.isNotEmpty(tFrameWarehousingDetails)){
                 tWarehousingVO.setTotalNum(tFrameWarehousingDetails.stream().mapToInt(TFrameWarehousingDetail::getTotal).sum());
             }
+            stores.stream().filter(tStore -> tStore.getId().equals(tWarehousingVO.getStoreId())).findFirst().ifPresent(tStore -> {
+                tWarehousingVO.setStoreName(tStore.getName());
+            });
         }
         pageInfo.setRecords(list);
         return pageInfo;

--
Gitblit v1.7.1