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;
			@@ -288,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);
			@@ -603,7 +605,7 @@
			Set<String> projectNoSet = projectList.stream()
			.map(OptimizeProject::getProjectNo)
			.collect(Collectors.toSet());
			List<OptimizeProject> resultList= new ArrayList<>();
			List<OptimizeProject> resultList = new ArrayList<>();
			for (TemperingGlassCountDTO dto : temperingGlassCountDTOS) {
			if (projectNoSet.contains(dto.getEngineerId())) {
			OptimizeProject project = new OptimizeProject();
			@@ -620,4 +622,18 @@
			}
			return resultList;
			}

			@Override
			public List<BigCageDetailsVO> queryVerticalSheetCageDetailsList(BigCageDetailsRequest request) {
			List<BigCageDetailsVO> cageDetails = baseMapper.queryVerticalSheetCageDetailsList(request);
			if (!(com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFlowCardId()) &&
			com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getFilmsId()) &&
			com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getEngineerId()) &&
			com.baomidou.mybatisplus.core.toolkit.StringUtils.isBlank(request.getGlassId()))) {
			cageDetails = cageDetails.stream()
			.filter(detail -> detail.getGlassId() != null)
			.collect(Collectors.toList());
			}
			return cageDetails;
			}
			}