From 956cb65690500f099be756accc346f3c8d56be99 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 20 一月 2025 16:50:54 +0800
Subject: [PATCH] 1.SECS,实现S2F15(Equipment Constant Send)的回复,目前仅打印显示数据,待机器端确认相关逻辑后再保存和设置机器数据。 2.修改和完善S2F13,与S2F15靠拢,并使用相同的数据结构和回调函数到应用层;

---
 SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp b/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp
index 999e0cb..66f7ed4 100644
--- a/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp
+++ b/SourceCode/Bond/BoounionPLC/AlarmMonitor.cpp
@@ -236,11 +236,13 @@
 void CAlarmMonitor::addAlarmToHistoryRecord(CAlarm* pAlarm)
 {
 	// 加入数据库
+	/*
 	AlarmManager::getInstance().addAlarm(
 		std::to_string(pAlarm->getId()).c_str(),
 		getAlarmText(pAlarm->getId()),
 		CToolUnits::timeToString2(pAlarm->getOnTime()).c_str(),
 		CToolUnits::timeToString2(pAlarm->getOffTime()).c_str());
+		*/
 }
 
 BOOL CAlarmMonitor::addAlarming(CAlarm* pAlarm)

--
Gitblit v1.9.3