YiWuProject.git

			@@ -7,7 +7,7 @@
			import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.BigStorageDTO;
			import com.mes.bigstorage.entity.dto.BigStorageDTO;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			import com.mes.bigstoragetask.entity.BigStorageCageFeedTask;
			@@ -20,7 +20,6 @@
			import com.mes.tools.service.BigStorageBaseService;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.scheduling.annotation.Scheduled;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			@@ -554,7 +553,7 @@
			}


			@Scheduled(fixedDelay = 300)
			// @Scheduled(fixedDelay = 300)
			public void querySizeByEngineerTask() {
			log.info("查询结果：{}", querySizeByEngineer("P24072402", 1, 10, 8));
			log.info("查询结果：{}", querySizeByEngineer("P24072402", 1, 5, 8));
			@@ -624,7 +623,7 @@

			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where engineer_id = '" + engineerId + "' and tempering_layout_id = " + temperingLayoutId)
			.last("limit 1"));
			@@ -642,7 +641,7 @@
			List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(thickness);
			for (Integer item : deviceUsedList) {
			bigStorageCage = bigStorageCageService.getOne(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getRemainWidth, slotWidth)
			.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getDeviceId, item)
			.last("limit 1"));