YiWuProject.git

			@@ -36,6 +36,7 @@
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import javax.annotation.Resource;
			import java.io.*;
			@@ -78,11 +79,13 @@
			private static final int ID_RATIO = 10;

			@Override
			@Transactional
			public HollowGlassOutRelationInfo receiveTask(HollowTaskRequest request) {
			return childrenTask(request, 0);
			}

			@Override
			@Transactional
			public HollowGlassOutRelationInfo forceOutGlass(HollowTaskRequest request) {
			return childrenTask(request, 1);
			}
			@@ -363,7 +366,8 @@
			int isPairCount = glassInfo.getTotalLayer() * request.getTotalPairQuantity();
			List<HollowGlassQueueInfo> hollowQueues = new ArrayList<>();
			Integer carWidth = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_CAR_WIDTH);
			Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
			// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
			Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(hollowBigStorageCageDetailsList.get(0).getThickness());
			if (930 == request.getCell()) {
			Map<Integer, List<HollowBigStorageCageDetails>> listMap = hollowBigStorageCageDetailsList.stream()
			.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getHollowSequence));
			@@ -432,7 +436,7 @@
			}

			@Override
			public List<PieChartVO> queryPieChart(){
			public List<PieChartVO> queryPieChart() {
			return baseMapper.queryPieChart();
			}
			}