YiWuProject.git

			@@ -44,6 +44,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;

			/**
			@@ -580,7 +584,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 +607,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());