From a52b87449e493d4312cc81c33a4169eb6be3c144 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 01 四月 2025 09:14:19 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
index 53b5663..c174581 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java
@@ -28,10 +28,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -305,7 +302,13 @@
List<FlowCardGlassInfoDTO> dtos = new ArrayList<>();
listMap.forEach((e, v) -> {
HollowBigStorageCageDetails cageDetails = v.get(0);
- dtos.addAll(hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE));
+ //鎸夌収娴佺▼鍗¤幏鍙栧搴旂殑浜у搧鍚嶇О
+ String productName = baseMapper.queryProductNameByFlowCardId(cageDetails.getFlowCardId());
+ List<FlowCardGlassInfoDTO> flowCardInfoList = hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE);
+ for (FlowCardGlassInfoDTO item : flowCardInfoList) {
+ item.setProductName(productName);
+ dtos.add(item);
+ }
});
Map<String, FlowCardGlassInfoDTO> result = dtos.stream()
.collect(Collectors.toMap(
@@ -321,15 +324,15 @@
},
(dto1, dto2) -> {
dto1.setRealCount(dto1.getRealCount() + dto2.getRealCount()); // 绱姞 realCount
- dto1.setLayer(Math.max(dto1.getLayer(),dto2.getLayer())); // 绱姞 鏈�澶у眰鏁�
+ dto1.setLayer(Math.max(dto1.getLayer(), dto2.getLayer())); // 绱姞 鏈�澶у眰鏁�
return dto1; // 杩斿洖鍚堝苟鍚庣殑瀵硅薄
}
));
- return dtos.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));
+ return dtos.stream().collect(Collectors.groupingBy(e -> e.getFlowCardId() + ":" + e.getProductName()));
}
@Override
- public Map<String, FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query) {
+ public List<FlowCardGlassInfoDTO> queryHollowAllFlowCardSummary(HollowBigStorageDetailsQueryVO query) {
List<HollowBigStorageCageDetails> detailsList = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
.like(StringUtils.isNotBlank(query.getFilmsId()), HollowBigStorageCageDetails::getFilmsId, query.getFilmsId())
@@ -339,7 +342,7 @@
);
if (CollectionUtil.isEmpty(detailsList)) {
log.info("绗煎唴鏃犵幓鐠�");
- return new HashMap<>();
+ return null;
}
Map<String, List<HollowBigStorageCageDetails>> listMap = detailsList.stream().collect(Collectors.groupingBy(HollowBigStorageCageDetails::getFlowCardId));
List<FlowCardGlassInfoDTO> dtos = new ArrayList<>();
@@ -362,12 +365,17 @@
},
(dto1, dto2) -> {
dto1.setRealCount(dto1.getRealCount() + dto2.getRealCount()); // 绱姞 realCount
- dto1.setLayer(Math.max(dto1.getLayer(),dto2.getLayer())); // 绱姞 鏈�澶у眰鏁�
+ dto1.setLayer(Math.max(dto1.getLayer(), dto2.getLayer())); // 绱姞 鏈�澶у眰鏁�
dto1.setSlotCount(dto1.getSlotCount() + dto2.getSlotCount());
return dto1; // 杩斿洖鍚堝苟鍚庣殑瀵硅薄
}
));
- return result;
+ List<FlowCardGlassInfoDTO> resultList = new ArrayList<>(result.values());
+ List<FlowCardGlassInfoDTO> sortedList = resultList.stream()
+ .sorted(Comparator.comparing(FlowCardGlassInfoDTO::getRealCount).reversed() // 绗竴涓瓧娈靛�掑簭
+ .thenComparing(FlowCardGlassInfoDTO::getSumCount, Comparator.reverseOrder())) // 绗簩涓瓧娈靛�掑簭
+ .collect(Collectors.toList());
+ return sortedList;
}
@Override
--
Gitblit v1.8.0