From 02d5b44343f3bd9abb667e50ccf469fed9a0a99a Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期三, 08 一月 2025 20:43:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 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 7983ab7..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
@@ -60,6 +60,7 @@
tFrameWarehousingDetailVO.setStoreName(store.getName());
}
}
+// tFrameWarehousingDetailVO.setStatus();
}
pageInfo.setRecords(list);
return pageInfo;
@@ -86,18 +87,21 @@
return pageInfo;
}
-
-
@Override
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