From ff1be70b35a043a42ef7471c3ed9f10a9a736db0 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 09 一月 2025 14:33:04 +0800
Subject: [PATCH] bug修改
---
manage/src/main/java/com/jilongda/manage/service/impl/TWarehousingServiceImpl.java | 11 +++++++++--
1 files changed, 9 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..d018d24 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
@@ -54,12 +54,16 @@
.in(TStore::getId,storeIds));
}
for (TFrameWarehousingDetailVO tFrameWarehousingDetailVO : list) {
+ if (tFrameWarehousingDetailVO.getOrderId()!=null){
+ tFrameWarehousingDetailVO.setStatus(5);
+ }
if(CollectionUtils.isNotEmpty(stores)){
TStore store = stores.stream().filter(tStore -> tStore.getId().equals(tFrameWarehousingDetailVO.getStoreId())).findFirst().orElse(null);
if(Objects.nonNull(store)){
tFrameWarehousingDetailVO.setStoreName(store.getName());
}
}
+// tFrameWarehousingDetailVO.setStatus();
}
pageInfo.setRecords(list);
return pageInfo;
@@ -86,18 +90,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