From 1195e51e67436cf2b9513678b5e9d3f27a043de4 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 22 十二月 2025 08:29:40 +0800
Subject: [PATCH] 1、中空选中除膜改为多选 2、流程卡报工情况查询添加工程号条件，添加线路，备注显示
---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
index a11dd98..4d6f085 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
@@ -11,6 +11,8 @@
import com.mes.hollow.entity.HollowBigStorageCageDetails;
import com.mes.hollow.entity.HollowGlassRelationInfo;
import com.mes.hollow.entity.dto.*;
+import com.mes.hollow.entity.request.HollowBigCageDetailsRequest;
+import com.mes.hollow.entity.vo.HollowBigCageDetailsVO;
import com.mes.hollow.entity.vo.HollowBigStorageDetailsQueryVO;
import com.mes.hollow.mapper.HollowBigStorageCageDetailsMapper;
import com.mes.hollow.service.HollowBigStorageCageDetailsService;
@@ -68,14 +70,21 @@
}
@Override
- public List<HollowBigStorageCageDetails> queryOutGlassList(String flowCardId, int cell) {
- return baseMapper.queryOutGlassList(flowCardId, cell);
+ public List<HollowBigStorageCageDetails> queryOutGlassList(String flowCardId, int cell, List<Integer> layerList) {
+ return baseMapper.queryOutGlassList(flowCardId, cell, layerList);
}
@Override
- public Map<Integer, List<BigStorageVO>> queryHollowbigStorageCageDetail() {
+ public Map<Object, Map<Integer, List<BigStorageVO>>> queryHollowbigStorageCageDetail() {
List<BigStorageVO> bigStorageCages = baseMapper.queryHollowbigStorageCageDetail();
- return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
+ return bigStorageCages.stream()
+ // 绗竴灞傚垎缁勶細key=slot鍊硷紝value=璇lot涓嬬殑鎵�鏈塀igStorageVO
+ .collect(Collectors.groupingBy(
+ BigStorageVO::getDeviceId, // 绗竴灞傚垎缁勪緷鎹細slot
+ // 绗簩灞傚垎缁勶細瀵圭涓�灞傜殑value缁х画鎸塪eviceId鍒嗙粍
+ Collectors.groupingBy(BigStorageVO::getSlot)
+ ));
+// return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
}
@Override
@@ -86,7 +95,7 @@
@Override
public List<HollowBigStorageAndDetailsDTO> insertHollowBigStorageCageDetails(HollowBigStorageCageDetails bigStorageCageDetails) {
GlassInfo info = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().in(GlassInfo::getGlassId, bigStorageCageDetails.getGlassId()));
- HollowBigStorageDTO hollowBigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(bigStorageCageDetails.getFlowCardId(), bigStorageCageDetails.getWidth(),
+ HollowBigStorageDTO hollowBigStorageDTO = hollowGlassRelationInfoService.queryHollowTargetSlot(bigStorageCageDetails.getFlowCardId(), bigStorageCageDetails.getGlassType(), bigStorageCageDetails.getWidth(),
bigStorageCageDetails.getHeight(), bigStorageCageDetails.getTotalLayer(), bigStorageCageDetails.getLayer());
HollowBigStorageCageDetails cageDetails = new HollowBigStorageCageDetails();
BeanUtils.copyProperties(hollowBigStorageDTO, cageDetails);
@@ -140,6 +149,30 @@
.eq(HollowBigStorageCage::getSlot, slot));
}
+ @Override
+ public List<FlowCardVirtualSlotDTO> queryFlowCardIdsAndLayer() {
+ return baseMapper.queryFlowCardIdsAndLayer();
+ }
+
+ @Override
+ public List<FlowCardGlassInfoDTO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query) {
+ return baseMapper.queryHollowAllFlowCard(query);
+ }
+
+ @Override
+ public List<HollowBigCageDetailsVO> queryVerticalSheetCageDetailsList(HollowBigCageDetailsRequest request) {
+ List<HollowBigCageDetailsVO> cageDetails = baseMapper.queryVerticalSheetCageDetailsList(request);
+ if (!(com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFlowCardId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFilmsId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getEngineerId()) &&
+ com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getGlassId()))) {
+ cageDetails = cageDetails.stream()
+ .filter(detail -> detail.getGlassId() != null)
+ .collect(Collectors.toList());
+ }
+ return cageDetails;
+ }
+
private List<HollowBigStorageAndDetailsDTO> hollowBigStorageCageDetailsChild(String glassId, Integer deviceId, Integer slot, int state) {
//灏嗗搴旀牸瀛愬彿鐨勭幓鐠僫d缃负101
this.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
--
Gitblit v1.8.0