YiWuProject.git

			@@ -11,7 +11,9 @@
			import com.mes.bigstorage.entity.BigStorageCage;
			import com.mes.bigstorage.entity.BigStorageCageDetails;
			import com.mes.bigstorage.entity.dto.*;
			import com.mes.bigstorage.entity.request.BigCageDetailsRequest;
			import com.mes.bigstorage.entity.vo.BigStorageQueryVO;
			import com.mes.bigstorage.entity.vo.BigCageDetailsVO;
			import com.mes.bigstorage.mapper.BigStorageCageDetailsMapper;
			import com.mes.bigstorage.service.BigStorageCageDetailsService;
			import com.mes.bigstorage.service.BigStorageCageService;
			@@ -44,6 +46,10 @@

			import javax.annotation.Resource;
			import java.util.*;
			import java.util.ArrayList;
			import java.util.Iterator;
			import java.util.List;
			import java.util.Map;
			import java.util.stream.Collectors;

			/**
			@@ -284,7 +290,7 @@
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON)
			.eq(BigStorageCage::getRemainWidth, slotWidth).orderByAsc(BigStorageCage::getSlot)
			.inSql(BigStorageCage::getDeviceId,
			"select distinct device_id from big_storage_cage_details where engineer_id = '" + EngineerId + "'")
			"select distinct device_id from big_storage_cage_details where engineer_id = '" + EngineerId + "' and device_id not in (5,6)")
			.last("limit 1"));
			if (null != bigStorageCage) {
			log.info("根据版图id找到笼子内的目标格子：{},玻璃id：{}", bigStorageCage.getSlot(), glassId);
			@@ -580,7 +586,18 @@
			}

			@Override
			public List<BigStorageCageDetails> queryNeedDispatch() {
			return baseMapper.queryNeedDispatch();
			}

			@Override
			public BigStorageSlotDTO queryNeedDispatchSlotBySequence() {
			return baseMapper.queryNeedDispatchSlotBySequence();
			}

			@Override
			public List<OptimizeProject> queryTemperingOrder() {
			String temperingengineerId = redisUtil.getCacheObject("temperingEngineerId");
			List<TemperingGlassCountDTO> temperingGlassCountDTOS = baseMapper.queryTemperingGlassCountSummary(1);
			List<OptimizeProject> projectList = optimizeProjectService.engineerScheduling(new OptimizeProject() {{
			setType(3);
			@@ -592,6 +609,9 @@
			for (TemperingGlassCountDTO dto : temperingGlassCountDTOS) {
			if (projectNoSet.contains(dto.getEngineerId())) {
			OptimizeProject project = new OptimizeProject();
			if (Objects.equals(dto.getEngineerId(), temperingengineerId)) {
			project.setState(1);
			}
			project.setProjectNo(dto.getEngineerId());
			project.setGlassType(dto.getFilmsId());
			project.setGlassThickness(dto.getThickness().intValue());
			@@ -602,4 +622,9 @@
			}
			return resultList;
			}

			@Override
			public List<BigCageDetailsVO> queryVerticalSheetCageDetailsList(BigCageDetailsRequest request) {
			return baseMapper.queryVerticalSheetCageDetailsList(request);
			}
			}