From 976cee4892eec261f6c2927e788e476e5cc5028e Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 10 三月 2025 08:32:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowGlassRelationInfoServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 60 insertions(+), 0 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 ba08ba6..53b5663 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
@@ -307,10 +307,70 @@
HollowBigStorageCageDetails cageDetails = v.get(0);
dtos.addAll(hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE));
});
+ Map<String, FlowCardGlassInfoDTO> result = dtos.stream()
+ .collect(Collectors.toMap(
+ FlowCardGlassInfoDTO::getFlowCardId,
+ dto -> {
+ FlowCardGlassInfoDTO newDto = new FlowCardGlassInfoDTO();
+ newDto.setFlowCardId(dto.getFlowCardId());
+ newDto.setSumCount(dto.getSumCount());
+ newDto.setPairCount(dto.getPairCount());
+ newDto.setRealCount(dto.getRealCount());
+ newDto.setLayer(dto.getLayer());
+ return newDto;
+ },
+ (dto1, dto2) -> {
+ dto1.setRealCount(dto1.getRealCount() + dto2.getRealCount()); // 绱姞 realCount
+ dto1.setLayer(Math.max(dto1.getLayer(),dto2.getLayer())); // 绱姞 鏈�澶у眰鏁�
+ return dto1; // 杩斿洖鍚堝苟鍚庣殑瀵硅薄
+ }
+ ));
return dtos.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));
}
@Override
+ public Map<String, 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())
+ .like(StringUtils.isNotBlank(query.getFlowCardId()), HollowBigStorageCageDetails::getFlowCardId, query.getFlowCardId())
+ .eq(query.getThickness() != 0, HollowBigStorageCageDetails::getThickness, query.getThickness())
+ .orderByAsc(HollowBigStorageCageDetails::getFlowCardId)
+ );
+ if (CollectionUtil.isEmpty(detailsList)) {
+ log.info("绗煎唴鏃犵幓鐠�");
+ return new HashMap<>();
+ }
+ Map<String, List<HollowBigStorageCageDetails>> listMap = detailsList.stream().collect(Collectors.groupingBy(HollowBigStorageCageDetails::getFlowCardId));
+ List<FlowCardGlassInfoDTO> dtos = new ArrayList<>();
+ listMap.forEach((e, v) -> {
+ HollowBigStorageCageDetails cageDetails = v.get(0);
+ dtos.addAll(hollowBigStorageCageDetailsService.hollowIsAll(e, cageDetails.getTotalLayer(), Boolean.FALSE));
+ });
+ Map<String, FlowCardGlassInfoDTO> result = dtos.stream()
+ .collect(Collectors.toMap(
+ FlowCardGlassInfoDTO::getFlowCardId,
+ dto -> {
+ FlowCardGlassInfoDTO newDto = new FlowCardGlassInfoDTO();
+ newDto.setFlowCardId(dto.getFlowCardId());
+ newDto.setSumCount(dto.getSumCount());
+ newDto.setPairCount(dto.getPairCount());
+ newDto.setRealCount(dto.getRealCount());
+ newDto.setLayer(dto.getLayer());
+ newDto.setSlotCount(dto.getSlotCount());
+ return newDto;
+ },
+ (dto1, dto2) -> {
+ dto1.setRealCount(dto1.getRealCount() + dto2.getRealCount()); // 绱姞 realCount
+ dto1.setLayer(Math.max(dto1.getLayer(),dto2.getLayer())); // 绱姞 鏈�澶у眰鏁�
+ dto1.setSlotCount(dto1.getSlotCount() + dto2.getSlotCount());
+ return dto1; // 杩斿洖鍚堝苟鍚庣殑瀵硅薄
+ }
+ ));
+ return result;
+ }
+
+ @Override
public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
Map<Integer, List<LackDetailsDTO>> listMap = lackDetailsList.stream().collect(Collectors.groupingBy(LackDetailsDTO::getLayer));
--
Gitblit v1.8.0