~admin/HangZhouMes.git

			@@ -7,6 +7,7 @@
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.BigStorageDTO;
			import com.mes.bigstorage.entity.dto.SlotSequenceDTO;
			import com.mes.bigstorage.entity.dto.TemperingLayoutDTO;
			import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			@@ -21,6 +22,7 @@
			import com.mes.temperingglass.entity.TemperingGlassInfo;
			import com.mes.temperingglass.mapper.TemperingGlassInfoMapper;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			@@ -49,6 +51,9 @@
			private BigStorageCageService bigStorageCageService;
			@Resource
			private GlassInfoMapper glassInfoMapper;

			@Value("${mes.minCount}")
			private int minCount;

			/**
			* 查询进/出片任务
			@@ -215,24 +220,26 @@

			@Override
			public BigStorageDTO queryTargetSlotByTempering(GlassInfo glassInfo) {
			// MPJLambdaWrapper<BigStorageDTO> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
			// .selectAll(BigStorageDTO.class)
			// .leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			// .eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			// .eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
			// .last("limit 1");
			BigStorageDTO bigStorageDTO = null;
			MPJLambdaWrapper<BigStorageCage> wrapper = new MPJLambdaWrapper<>(BigStorageCage.class)
			.selectAsClass(BigStorageCage.class, BigStorageDTO.class)
			.selectAll(BigStorageCage.class)
			.leftJoin(BigStorageCageDetails.class, BigStorageCageDetails::getSlot, BigStorageCage::getSlot)
			.eq(BigStorageCageDetails::getTemperingLayoutId, glassInfo.getTemperingLayoutId())
			.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1)
			.gt(BigStorageCage::getRemainWidth, glassInfo.getWidth())
			.last("limit 1");
			bigStorageDTO = bigStorageCageService.selectJoinOne(BigStorageDTO.class, wrapper);
			if (null != bigStorageDTO) {
			if (glassInfo.getTemperingLayoutId() == 0) {
			wrapper.eq(BigStorageCageDetails::getWidth, glassInfo.getWidth()).eq(BigStorageCageDetails::getHeight, glassInfo.getHeight());
			} else {
			wrapper.eq(BigStorageCageDetails::getTemperingFeedSequence, glassInfo.getTemperingFeedSequence() + 1);
			}
			BigStorageCage bigStorageCage = bigStorageCageService.selectJoinOne(BigStorageCage.class, wrapper);
			if (null != bigStorageCage) {
			bigStorageDTO = new BigStorageDTO();
			bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
			bigStorageDTO.setSlot(bigStorageCage.getSlot());
			return bigStorageDTO;
			}
			BigStorageCage bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, Const.BIG_STORAGE_WIDTH)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where tempering_layout_id = " + glassInfo.getTemperingLayoutId())
			@@ -251,12 +258,21 @@
			bigStorageDTO.setWidth(bigStorageCage.getRemainWidth());
			bigStorageDTO.setSlot(bigStorageCage.getSlot());
			return bigStorageDTO;


			}

			@Override
			public TemperingLayoutDTO temperingIsAll() {
			return baseMapper.temperingIsAll();
			}


			@Override
			public TemperingLayoutDTO queryTemperingOccupySlot() {
			return baseMapper.queryTemperingOccupySlot(minCount);
			}

			@Override
			public List<SlotSequenceDTO> queryGlassMaxAndMin(String engineerId, Integer temperingLayoutId) {
			return baseMapper.queryGlassMaxAndMin(engineerId, temperingLayoutId);
			}
			}