hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollow/service/impl/HollowBigStorageCageDetailsServiceImpl.java
@@ -75,9 +75,16 @@
    }
    @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=该slot下的所有BigStorageVO
                .collect(Collectors.groupingBy(
                        BigStorageVO::getDeviceId, // 第一层分组依据:slot
                        // 第二层分组:对第一层的value继续按deviceId分组
                        Collectors.groupingBy(BigStorageVO::getSlot)
                ));
//        return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
    }
    @Override
@@ -154,7 +161,16 @@
    @Override
    public List<HollowBigCageDetailsVO> queryVerticalSheetCageDetailsList(HollowBigCageDetailsRequest request) {
        return baseMapper.queryVerticalSheetCageDetailsList(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) {