YiWuProject.git

			@@ -468,6 +468,20 @@
			}

			HollowGlassOutRelationInfo hollowGlassOutRelationInfo = null;

			//直通台有玻璃时将中空出片队列中对应玻璃id的格子号替换未直通台
			HollowBigStorageCageDetails details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).last("limit 1"));
			if (details != null) {
			hollowGlassOutRelationInfo = hollowGlassOutRelationInfoService.getOne(
			new LambdaQueryWrapper<HollowGlassOutRelationInfo>()
			.eq(HollowGlassOutRelationInfo::getFlowCardId, details.getFlowCardId())
			.eq(HollowGlassOutRelationInfo::getState, Const.HOLLOW_FLOW_CARD_START)
			.orderByAsc(HollowGlassOutRelationInfo::getId)
			.last("limit 1")
			);
			}
			int cell = -1;
			for (Integer i : resultList) {
			if (null == hollowGlassOutRelationInfo) {
			@@ -511,9 +525,6 @@
			.orderByAsc(HollowGlassQueueInfo::getHollowSequence));
			if (CollectionUtil.isNotEmpty(unFinishHollowQueueList)) {
			//直通台有玻璃时将中空出片队列中对应玻璃id的格子号替换未直通台
			HollowBigStorageCageDetails details = hollowBigStorageCageDetailsService.getOne(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getSlot, THROUGH_SLOT)
			.in(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL).last("limit 1"));
			log.info("中空大理片直通台玻璃信息{}", details);
			if (details != null) {
			unFinishHollowQueueList.stream().forEach(e -> {
			@@ -908,7 +919,7 @@
			log.info("当前未收到进片请求，结束进片任务");
			return;
			}
			if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())){
			if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
			log.info("当前存在进片任务请求，结束本次大笼子调度");
			return;
			}