YiWuProject.git

			@@ -7,6 +7,7 @@
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.mes.common.config.Const;
			import com.mes.common.config.ConstSysConfig;
			import com.mes.glassinfo.entity.GlassInfo;
			import com.mes.glassinfo.service.GlassInfoService;
			import com.mes.hollow.controller.HollowBigStorageCageController;
			@@ -24,6 +25,7 @@
			import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
			import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
			import com.mes.largenscreen.entity.PieChartVO;
			import com.mes.sysconfig.service.SysConfigService;
			import com.mes.tools.DateUtil;
			import com.mes.utils.Blank;
			import com.mes.utils.RedisUtil;
			@@ -33,7 +35,6 @@
			import freemarker.template.Version;
			import lombok.extern.slf4j.Slf4j;
			import org.springframework.beans.BeanUtils;
			import org.springframework.beans.factory.annotation.Value;
			import org.springframework.stereotype.Service;

			import javax.annotation.Resource;
			@@ -62,15 +63,17 @@
			HollowFormulaDetailsService hollowFormulaDetailsService;
			@Resource
			HollowGlassRelationInfoService hollowGlassRelationInfoService;
			@Resource
			SysConfigService sysConfigService;

			@Resource
			RedisUtil redisUtil;

			@Value("${mes.glassGap}")
			private Integer glassGap;

			@Value("${mes.carWidth}")
			private Integer carWidth;
			// @Value("${mes.glassGap}")
			// private Integer glassGap;
			//
			// @Value("${mes.carWidth}")
			// private Integer carWidth;

			private static final int ID_RATIO = 10;

			@@ -359,7 +362,8 @@
			.queryOutGlassList(request.getFlowCardId(), request.getCell());
			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);
			if (930 == request.getCell()) {
			Map<Integer, List<HollowBigStorageCageDetails>> listMap = hollowBigStorageCageDetailsList.stream()
			.collect(Collectors.groupingBy(HollowBigStorageCageDetails::getHollowSequence));