YiWuProject.git

			@@ -15,6 +15,7 @@
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			import com.mes.bigstoragetask.entity.BigStorageCageOutTask;
			import com.mes.bigstoragetask.entity.UpdateBigStorageCageDTO;
			import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
			import com.mes.bigstoragetask.mapper.BigStorageCageOutTaskMapper;
			import com.mes.common.config.Const;
			@@ -292,6 +293,7 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			.last("limit 1"));
			@@ -307,6 +309,7 @@
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.notInSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where state in (100,102,103)")
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			@@ -321,6 +324,7 @@
			}
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.notInSql(BigStorageCage::getSlot, "select distinct slot from big_storage_cage_details where state = 0")
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.ge(BigStorageCage::getMaxThickness, glassInfo.getThickness())
			.orderByAsc(BigStorageCage::getDeviceId)
			@@ -380,8 +384,6 @@
			} else {
			return false;
			}


			}

			@Override
			@@ -393,4 +395,9 @@
			List<Map<String, Object>> TemperingGlass = baseMapper.selectMaps(wrapper);
			return TemperingGlass;
			}

			@Override
			public void updateBySlot(List<UpdateBigStorageCageDTO> glassList, int state) {
			baseMapper.updateBySlot(glassList, state);
			}
			}