~admin/HangZhouMes.git

			@@ -309,7 +309,7 @@
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.notInSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where state in (100,102,103)")
			.gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			.last("limit 1"));
			if (null != bigStorageCage) {
			@@ -322,7 +322,7 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.gt(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			.last("limit 1"));
			Assert.isTrue(null != bigStorageCage, "没有空余的笼子存放玻璃");
			@@ -353,15 +353,15 @@
			public boolean TemperingGlass(String temperingLayoutId, String engineerId) {
			LambdaQueryWrapper<TemperingGlassInfo> temperingGlassInfoLambdaQueryWrapper = new LambdaQueryWrapper<>();
			temperingGlassInfoLambdaQueryWrapper
			.eq(TemperingGlassInfo::getTemperingLayoutId, temperingLayoutId)
			.eq(TemperingGlassInfo::getEngineerId, engineerId);
			List<TemperingGlassInfo> temperingGlassInfoList = temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);
			if (temperingGlassInfoList.size() == 0) {
			LambdaQueryWrapper<BigStorageCageDetails> wrapper = new LambdaQueryWrapper<>();
			wrapper.eq(BigStorageCageDetails::getTemperingLayoutId, temperingLayoutId)
			.eq(BigStorageCageDetails::getEngineerId, engineerId)
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN, Const.GLASS_STATE_ARTIFICIAL);
			List<BigStorageCageDetails> bigStorageCageDetailsList = baseMapper.selectList(wrapper);
			.eq(TemperingGlassInfo::getState,Const.TEMPERING_NEW);
			List<TemperingGlassInfo> temperingGlassInfoList=temperingGlassInfoMapper.selectList(temperingGlassInfoLambdaQueryWrapper);

			if(temperingGlassInfoList.size()==0){
			LambdaQueryWrapper<BigStorageCageDetails> wrapper =new LambdaQueryWrapper<>();
			wrapper.eq(BigStorageCageDetails::getTemperingLayoutId,temperingLayoutId)
			.eq(BigStorageCageDetails::getEngineerId,engineerId)
			.in(BigStorageCageDetails::getState,Const.GLASS_STATE_IN,Const.GLASS_STATE_ARTIFICIAL);
			List<BigStorageCageDetails> bigStorageCageDetailsList=baseMapper.selectList(wrapper);

			for (BigStorageCageDetails bigStorageCageDetails : bigStorageCageDetailsList
			) {
			@@ -385,7 +385,7 @@
			}

			@Override
			public List<Map<String, Object>> selectTemperingGlass() {
			public List<Map<String, Object>> selectTemperingGlass(){
			QueryWrapper<BigStorageCageDetails> wrapper = new QueryWrapper<>();
			wrapper.select("engineer_id,tempering_layout_id,count(*) as count")
			.groupBy("engineer_id,tempering_layout_id");