YiWuProject.git

			@@ -64,8 +64,7 @@
			.eq(HollowGlassRelationInfo::getWidth, width)
			.eq(HollowGlassRelationInfo::getHeight, height)
			.eq(HollowGlassRelationInfo::getLayer, layer)
			.isNull(HollowGlassRelationInfo::getTemperingLayoutId)
			.isNull(HollowGlassRelationInfo::getTemperingFeedSequence)
			.eq(HollowGlassRelationInfo::getState,Const.HOLLOW_RELATION_NEW)
			.orderByAsc(HollowGlassRelationInfo::getHollowSequence)
			.last("limit 1")
			);
			@@ -200,6 +199,7 @@
			hollow.setVirtualSlot(temp.get(0).getVirtualSlot());
			hollow.setFilmsId(glassInfo.getFilmsid());
			hollow.setThickness(glassInfo.getThickness());
			hollow.setState(Const.HOLLOW_RELATION_NEW);
			temp.add(hollow);
			flag = true;
			break;
			@@ -214,6 +214,7 @@
			hollow.setVirtualSlot(slotNumber++);
			hollow.setFilmsId(glassInfo.getFilmsid());
			hollow.setThickness(glassInfo.getThickness());
			hollow.setState(Const.HOLLOW_RELATION_NEW);
			newList.add(hollow);
			tempHollowList.add(newList);
			}
			@@ -242,11 +243,16 @@
			return dtos.stream().collect(Collectors.groupingBy(FlowCardGlassInfoDTO::getFlowCardId));
			}

			// @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));
			// return listMap;
			// }
			@Override
			public Map<Integer, List<LackDetailsDTO>> queryLackByFlowCard(String flowCardId) {
			public List<LackDetailsDTO> queryLackByFlowCard(String flowCardId) {
			List<LackDetailsDTO> lackDetailsList = this.baseMapper.queryLackByFlowCard(flowCardId);
			Map<Integer, List<LackDetailsDTO>> listMap = lackDetailsList.stream().collect(Collectors.groupingBy(LackDetailsDTO::getLayer));
			return listMap;
			return lackDetailsList;
			}

			}