YiWuProject.git

			@@ -260,13 +260,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);
			// 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();
			@@ -393,11 +393,17 @@
			log.info("当前未收到出片请求，结束出片任务");
			return;
			}
			int outRequest = s7plcWZL.readUInt16("DB51.8");
			if (outRequest == 0){
			log.info("当前未收到卧转立允许出片请求，结束出片任务");
			try {
			int outRequest = s7plcWZL.readUInt16("DB51.8");
			if (outRequest == 0){
			log.info("当前未收到卧转立允许出片请求，结束出片任务");
			return;
			}
			} catch (Exception e) {
			log.error("读取卧转立信号异常", e);
			return;
			}

			//获取出片任务表
			List<BigStorageCageTask> outTaskList = getOutTaskList(s7DataWLTwo);
			if (CollectionUtil.isNotEmpty(outTaskList)) {
			@@ -921,7 +927,7 @@
			damage.setWorkingProcedure("大理片笼");
			damage.setRemark("进笼前卧转立");
			damage.setStatus(1);
			damage.setType(item.getTaskState());
			damage.setType(Const.GLASS_STATE_DAMAGE);
			damageService.insertDamage(damage);
			slotList.add(item.getTargetSlot());
			}
			@@ -946,7 +952,7 @@
			damage.setWorkingProcedure("钢化前");
			damage.setRemark("进笼后卧转立");
			damage.setStatus(1);
			damage.setType(item.getTaskState());
			damage.setType(Const.GLASS_STATE_DAMAGE);
			damageService.insertDamage(damage);
			slotList.add(item.getTargetSlot());
			slotList.add(item.getStartSlot());