YiWuProject.git

			@@ -157,14 +157,17 @@

			List<BigStorageCageTask> inTaskList = new ArrayList();
			Integer from = s7DataZKDLPOne.getFrom1();
			List<Integer> states = s7DataZKDLPOne.getStates();
			List<String> glassIdList = new ArrayList<>();
			List<String> requestWords = s7DataZKDLPOne.getIds();
			for (int i = 1; i <= 6; i++) {
			String requestWord = requestWords.get(i - 1);
			Integer state = states.get(i - 1);
			if (null != requestWord && !requestWord.isEmpty()) {
			BigStorageCageTask task = new BigStorageCageTask();
			task.setGlassId(requestWord);
			task.setStartSlot(from);
			task.setTaskState(state);
			inTaskList.add(task);
			glassIdList.add(requestWord);
			continue;
			@@ -456,6 +459,7 @@
			//nothing
			log.info("二/三线线空闲状态获取异常");
			}

			List<Integer> resultList = new ArrayList<>();
			if (redisUtil.getCacheObject("priorityHollowSwitch")) {
			resultList = TWO_LINE_FIRST;
			@@ -502,14 +506,23 @@
			//是否有正在中空的玻璃:中空小片表筛选未出笼的玻璃信息
			// 获取当前中空任务未完成出片的玻璃信息
			List<HollowGlassQueueInfo> unFinishHollowQueueList = hollowGlassQueueInfoService.list(new LambdaQueryWrapper<HollowGlassQueueInfo>()
			.eq(HollowGlassQueueInfo::getFlowCardId, hollowGlassOutRelationInfo.getFlowCardId())
			.eq(HollowGlassQueueInfo::getCell, hollowGlassOutRelationInfo.getCell())
			.eq(HollowGlassQueueInfo::getState, Const.TEMPERING_NEW)
			.eq(HollowGlassQueueInfo::getRelationId, hollowGlassOutRelationInfo.getId())
			.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 && details.getGlassId().equals(unFinishHollowQueueList.get(0).getGlassId())) {
			unFinishHollowQueueList.get(0).setSlot(THROUGH_SLOT);
			log.info("将中空队列中的格子号替换为直通台{}", unFinishHollowQueueList);
			}
			List<HollowGlassQueueInfo> infoList = unFinishHollowQueueList.stream().filter(e -> !(e.getSlot() > 500 && e.getIsPair() != 1)).collect(Collectors.toList());
			log.info("有正在出片的中空任务");
			Integer isPair = unFinishHollowQueueList.get(0).getIsPair();
			hollowOutGlassByIsPair(unFinishHollowQueueList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
			Integer isPair = infoList.get(0).getIsPair();
			hollowOutGlassByIsPair(infoList, hollowGlassOutRelationInfo.getCell(), isPair, hollowGlassOutRelationInfo.getTotalLayer(), hollowGlassOutRelationInfo.getIsForce());
			Date endDate = new Date();
			log.info("大理片笼出片任务结束时间：{}，共耗时：{}ms,结束扫码任务", endDate, endDate.getTime() - startDate.getTime());
			return;
			@@ -869,17 +882,22 @@
			log.info("当前为非联机状态，结束进片任务");
			return;
			}
			if (StringUtils.isNotBlank(s7DataZKDLPOne.getId1())) {
			Integer requestEntity = s7DataZKDLPOne.getRequestMes();
			if (StringUtils.isNotBlank(s7DataZKDLPOne.getId7()) && requestEntity == 0) {
			//汇报字为1 启动字为1是清除所有任务信息
			if (s7DataZKDLPOne.getId1().equals(s7DataZKDLPOne.getId1())) {
			if (s7DataZKDLPOne.getId7().equals(s7DataZKDLPOne.getId1())) {
			//todo:清空任务
			s7DataZKDLPOne.setFrom1(0);
			s7DataZKDLPOne.getId1();
			S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
			sendTask.setFrom7(0);
			sendTask.setId7("");
			s7SerializerZKDLPOne.write(sendTask);
			log.info("清除所有任务信息{}", sendTask);
			s7DataZKDLPOne = s7SerializerZKDLPOne.read(S7DataZKDLPOne.class);
			log.info("清空任务后再读取{}", s7DataZKDLPOne);
			}
			log.info("存在任务，结束");
			return;
			}
			Integer requestEntity = s7DataZKDLPOne.getRequestMes();
			if (1 != requestEntity) {
			log.info("当前未收到进片请求，结束进片任务");
			return;
			@@ -897,7 +915,7 @@
			}
			List<HollowBigStorageCageDetails> list = hollowBigStorageCageDetailsService.list(new LambdaQueryWrapper<HollowBigStorageCageDetails>()
			.eq(HollowBigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.in(HollowBigStorageCageDetails::getDeviceId, 5)
			.in(HollowBigStorageCageDetails::getDeviceId, 6)
			.in(HollowBigStorageCageDetails::getGlassId, glassIdList));
			if (CollectionUtil.isEmpty(list)) {
			return;
			@@ -907,7 +925,12 @@
			hollowBigStorageCageDetailsService.update(new LambdaUpdateWrapper<HollowBigStorageCageDetails>()
			.set(HollowBigStorageCageDetails::getState, Const.RAW_GLASS_STATE_OUT)
			.eq(HollowBigStorageCageDetails::getGlassId, details.getGlassId()));

			S7DataZKDLPOne sendTask = new S7DataZKDLPOne();
			sendTask.setFrom7(details.getSlot());
			sendTask.setId7(details.getGlassId());
			s7SerializerZKDLPOne.write(sendTask);
			log.info("新笼子写入id与from{}", sendTask);
			updateSlotRemainBySlots(Arrays.asList(details.getSlot()));
			}


			@@ -1081,7 +1104,17 @@
			Integer outCarMaxSize = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_OUT_CAR_SIZE);
			// Integer glassGap = sysConfigService.queryConfigValue(ConstSysConfig.HOLLOW_GLASS_GAP);
			Integer glassGap = hollowGlassRelationInfoService.getGlassGapByThickness(list.get(0).getThickness());
			log.info("中空生成一车任务：{}", list);
			for (T e : list) {
			//格子为第五个笼子时不添加出片任务
			HollowBigStorageCage hollowBigStorageCage = hollowBigStorageCageService.getOne(
			new LambdaQueryWrapper<HollowBigStorageCage>()
			.eq(HollowBigStorageCage::getSlot, e.getSlot())
			);

			if (hollowBigStorageCage != null && hollowBigStorageCage.getDeviceId() == 6) {
			break;
			}
			if (templist.size() >= outCarMaxSize \|\| Math.max((int) e.getWidth(), (int) e.getHeight()) > remainWidth) {
			break;
			}