From 016183bc4926c4fd80599dc7e06542c5396e6fd8 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 12 四月 2025 16:24:25 +0800
Subject: [PATCH] 1.读取机器的Job Event上报; 2.修复在读取CC-Link数据当单元号超出32767时读取失败的问题。

---
 SourceCode/Bond/BondEq/Alarm.cpp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/BondEq/Alarm.cpp b/SourceCode/Bond/BondEq/Alarm.cpp
index 266e4ca..ef82a47 100644
--- a/SourceCode/Bond/BondEq/Alarm.cpp
+++ b/SourceCode/Bond/BondEq/Alarm.cpp
@@ -107,22 +107,24 @@
 	if (ar.IsStoring())
 	{
 		Lock();
+		ar << m_nUnitId;
+		ar << m_nId;
+		ar << m_nLevel;
 		ar << m_timeOn;
 		ar << m_timeOff;
 		ar << m_nStatus;
-		ar << m_nId;
-		ar << m_nLevel;
 		WriteString(ar, m_strText);
 		Unlock();
 	}
 	else
 	{
 		Lock();
+		ar >> m_nUnitId;
+		ar >> m_nId;
+		ar >> m_nLevel;
 		ar >> m_timeOn;
 		ar >> m_timeOff;
 		ar >> m_nStatus;
-		ar >> m_nId;
-		ar >> m_nLevel;
 		ReadString(ar, m_strText);
 		Unlock();
 	}

--
Gitblit v1.9.3