~zhoushihao/YiWuProject.git

			@@ -192,7 +192,7 @@
			public void generateHollowGlassInfo(String flowCardId, int totalLayer, int layer) {

			GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getFlowCardId, flowCardId)
			.eq(GlassInfo::getLayer, layer).last("limit 1"));
			.eq(GlassInfo::getLayer, layer).orderByDesc(GlassInfo::getId).last("limit 1"));
			if (null == glassInfo) {
			log.info("当前流程卡信息为导入mes系统流程卡：{}，层数{}", flowCardId, layer);
			return;
			@@ -329,7 +329,7 @@
			}

			@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 +339,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<>();
			@@ -367,7 +367,8 @@
			return dto1; // 返回合并后的对象
			}
			));
			return result;
			List<FlowCardGlassInfoDTO> resultList = new ArrayList<>(result.values());
			return resultList;
			}

			@Override