YiWuProject.git

			@@ -104,6 +104,8 @@
			private static final String ALARM_TYPE = "钢化大理片";
			private static final String ALARM_CODE_SIZE = "sizeSame";
			private static final String ALARM_CODE_ID = "idSame";
			private static final String ALARM_CODE_SLOT = "slotLess";
			private static final String ALARM_CODE_OVER = "overSize";

			@Resource
			private RedisUtil redisUtil;
			@@ -140,16 +142,17 @@
			String fromOpcUa = s7DataDLPOne.getFrom1().toString();

			List<String> ids = s7DataDLPOne.getIds();
			log.info("获取到进片任务玻璃id：{}", ids);
			List<String> glassIdList = new ArrayList<>();
			for (int i = 0; i < 6; i++) {
			String requestWord = ids.get(i);
			if (null != requestWord && !requestWord.isEmpty()) {
			if (StringUtils.isNotBlank(requestWord)) {
			log.info("玻璃id{}加入进片任务", requestWord);
			BigStorageCageTask task = new BigStorageCageTask();
			task.setGlassId(requestWord);
			task.setStartSlot(Integer.parseInt(fromOpcUa));
			inTaskList.add(task);
			glassIdList.add(requestWord);
			break;
			}
			}
			if (CollectionUtil.isEmpty(inTaskList)) {
			@@ -225,11 +228,18 @@
			for (Map.Entry<Double, Long> entry : thickCountMap.entrySet()) {
			int count = bigStorageCageService.count(new LambdaQueryWrapper<BigStorageCage>()
			.eq(BigStorageCage::getEnableState, Const.SLOT_ON).eq(BigStorageCage::getRemainWidth, slotWidth)
			.ge(BigStorageCage::getDeviceId, 4)
			.le(BigStorageCage::getDeviceId, 4)
			.le(BigStorageCage::getMinThickness, entry.getKey())
			.ge(BigStorageCage::getMaxThickness, entry.getKey()));
			if (count < entry.getValue()) {
			log.info("笼内格子剩余数量不足，结束本次进片");
			ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
			alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
			alarmInfo.setAlarmModule(ALARM_MODULE);
			alarmInfo.setAlarmType(ALARM_TYPE);
			alarmInfo.setAlarmCode(ALARM_CODE_SLOT);
			alarmInfo.setAlarmMessage(count + "");
			productAlarmInfoService.save(alarmInfo);
			//向plc发送报警:笼内格子剩余数量不足
			// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 16));
			s7DataDLPOne = new S7DataDLPOne();
			@@ -246,6 +256,13 @@
			.in(BigStorageCageDetails::getState, Const.GLASS_STATE_IN_ALL));
			if (count > 0) {
			log.info("直通片台存在玻璃，结束本次进片");
			ProductAlarmInfo alarmInfo = new ProductAlarmInfo();
			alarmInfo.setState(Const.LOAD_RAW_GLASS_NEW);
			alarmInfo.setAlarmModule(ALARM_MODULE);
			alarmInfo.setAlarmType(ALARM_TYPE);
			alarmInfo.setAlarmCode(ALARM_CODE_OVER);
			alarmInfo.setAlarmMessage("");
			productAlarmInfoService.save(alarmInfo);
			//向plc发送报警:直通片台存在玻璃，无法继续直通
			// miloService.writeToOpcWord(generateReadWriteEntity("DLP1A.DLP1A.alarmSignal", 64));
			s7DataDLPOne = new S7DataDLPOne();
			@@ -432,10 +449,15 @@
			cageDetails.setFilmsId(info.getFilmsId());
			cageDetails.setId(null);
			bigStorageCageDetailsService.save(cageDetails);
			info.setState(Const.GLASS_STATE_OUT);
			bigStorageCageDetailsService.updateById(info);
			}
			//历史数据入库
			bigStorageCageHistoryTaskService.saveBatch(historyTasks);
			extracted(taskList);
			S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
			s7DataDLPTwo.setMesReply(1);
			s7SerializerDLPTwo.write(s7DataDLPTwo);
			return;
			}

			@@ -537,11 +559,15 @@
			.last("limit 1"));
			List<Integer> slotList = sequenceDTOList.stream().map(BigStorageSequenceDTO::getSlot).collect(Collectors.toList());
			list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).in(BigStorageCageDetails::getSlot, slotList));
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.in(BigStorageCageDetails::getSlot, slotList)
			.orderByAsc(BigStorageCageDetails::getTemperingFeedSequence)
			);
			computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
			bigStorageCage.getSlot(), Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			slotList.add(bigStorageCage.getSlot());
			updateSlotRemainBySlots(slotList);
			return;
			}
			//有：统一往5号笼子送
			// 无 4号笼子使用数量是否超过阈值有生成调度任务按照组号组序由1开始依次往5号笼子送小片
			@@ -570,7 +596,10 @@
			BigStorageSlotDTO slotDTO = bigStorageCageDetailsService.queryNeedDispatchSlotBySequence();
			if (null != slotDTO) {
			list = bigStorageCageDetailsService.list(new LambdaQueryWrapper<BigStorageCageDetails>()
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN).in(BigStorageCageDetails::getSlot, slotDTO.getStartSlot()));
			.eq(BigStorageCageDetails::getState, Const.GLASS_STATE_IN)
			.in(BigStorageCageDetails::getSlot, slotDTO.getStartSlot())
			.orderByAsc(BigStorageCageDetails::getTemperingFeedSequence)
			);
			computeOutGlassInfoByVirtualSlot(list, "big_storage_cage_out_one_task",
			slotDTO.getTargetSlot(), Const.GLASS_STATE_SCHEDULE_ING, Const.BIG_STORAGE_BEFORE_DISPATCH);
			List<Integer> slotList = new ArrayList<>();
			@@ -1010,7 +1039,7 @@
			* @return
			*/
			private Boolean extracted(List<BigStorageCageTask> bigStorageCageTaskList) {
			resetOutTask();
			// resetOutTask();
			S7DataDLPTwo s7DataDLPTwo = new S7DataDLPTwo();
			for (int i = 0; i < bigStorageCageTaskList.size() && i < 6; i++) {
			String glassId = bigStorageCageTaskList.get(i).getGlassId();