~admin/HangZhouMes.git

			@@ -26,6 +26,7 @@
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			import java.util.ArrayList;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;
			@@ -171,7 +172,8 @@
			}
			temperingGlassInfoMapper.updateById(temperingGlassInfo);
			}
			baseMapper.deleteById(bigStorageCageDetails.getId());
			bigStorageCageDetails.setState(Const.BIG_STORAGE_OUTSIDE);
			baseMapper.updateById(bigStorageCageDetails);
			bigStorageCageService.updateRemainWidth(bigStorageCageDetails.getSlot());
			//todo:插入破损数据

			@@ -179,15 +181,19 @@

			//查询玻璃信息
			@Override
			public BigStorageCageDetails selectBigStorageCageDetails(String glassId) {
			public List<BigStorageCageDetails> selectBigStorageCageDetails(String glassId) {
			LambdaQueryWrapper<GlassInfo> glassInfoWrapper = new LambdaQueryWrapper<>();
			glassInfoWrapper.eq(GlassInfo::getGlassId, glassId);
			GlassInfo glassInfo = glassInfoMapper.selectOne(glassInfoWrapper);
			BigStorageCageDetails bigStorageCageDetails = new BigStorageCageDetails();
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(galssGap);
			return bigStorageCageDetails;
			if (glassInfo != null) {
			BeanUtils.copyProperties(glassInfo, bigStorageCageDetails);
			bigStorageCageDetails.setState(0);
			bigStorageCageDetails.setGap(galssGap);
			}
			List<BigStorageCageDetails> bigStorageCageDetailsList = new ArrayList<>();
			bigStorageCageDetailsList.add(bigStorageCageDetails);
			return bigStorageCageDetailsList;
			}

			//理片笼详情添加
			@@ -223,6 +229,7 @@
			MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
			.selectAll(BigStorageCage.class)
			.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			.gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
			.last("limit 1");
			@@ -239,6 +246,7 @@
			return bigStorageDTO;
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			@@ -251,6 +259,7 @@
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.last("limit 1"));
			Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
			bigStorageDTO = new BigStorageDTO();