YiWuProject.git

			@@ -7,6 +7,7 @@
			import com.mes.common.config.Const;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.hollow.entity.HollowBigStorageCage;
			import com.mes.hollow.entity.HollowBigStorageCageDetails;
			import com.mes.hollow.entity.HollowGlassRelationInfo;
			import com.mes.hollow.entity.dto.*;
			@@ -23,6 +24,8 @@
			import javax.annotation.Resource;
			import java.util.Arrays;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			/**
			* (HollowBigStorageCageDetails)表服务实现类
			@@ -70,8 +73,9 @@
			}

			@Override
			public List<BigStorageVO> queryHollowbigStorageCageDetail() {
			return baseMapper.queryHollowbigStorageCageDetail();
			public Map<Integer, List<BigStorageVO>> queryHollowbigStorageCageDetail() {
			List<BigStorageVO> bigStorageCages = baseMapper.queryHollowbigStorageCageDetail();
			return bigStorageCages.stream().collect(Collectors.groupingBy(item -> item.getDeviceId()));
			}

			@Override
			@@ -82,7 +86,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);
			@@ -129,6 +133,23 @@
			return baseMapper.queryPairGlassList(flowCardId, totalLayer, totalPairQuantity, isOut);
			}

			@Override
			public Boolean updateHollowStorageCageDisabled(int slot, int enableState) {
			return hollowBigStorageCageService.update(new LambdaUpdateWrapper<HollowBigStorageCage>()
			.set(HollowBigStorageCage::getEnableState, enableState)
			.eq(HollowBigStorageCage::getSlot, slot));
			}

			@Override
			public List<FlowCardVirtualSlotDTO> queryFlowCardIdsAndLayer() {
			return baseMapper.queryFlowCardIdsAndLayer();
			}

			@Override
			public List<FlowCardGlassInfoDTO> queryHollowAllFlowCard(HollowBigStorageDetailsQueryVO query) {
			return baseMapper.queryHollowAllFlowCard(query);
			}

			private List<HollowBigStorageAndDetailsDTO> hollowBigStorageCageDetailsChild(String glassId, Integer deviceId, Integer slot, int state) {
			//将对应格子号的玻璃id置为101
			this.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()