From cbe189228810812547d16a3211ab0b174831f609 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 24 三月 2025 11:56:04 +0800
Subject: [PATCH] 1.修复一个闪退问题(Glass列表为空仍要下传导致); 2.在CEquipment派生类中实现限制上游移动(如下在加工且加工数量有限制);

---
 SourceCode/Bond/Servo/CEqAlarmStep.cpp |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqAlarmStep.cpp b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
index cddef97..db6f707 100644
--- a/SourceCode/Bond/Servo/CEqAlarmStep.cpp
+++ b/SourceCode/Bond/Servo/CEqAlarmStep.cpp
@@ -80,9 +80,8 @@
 		return 0;
 	}
 
-	void CEqAlarmStep::setAlarmDev(int nDev)
-	{
-		m_nAlarmDev = nDev;
+	void CEqAlarmStep::setAlarmDev(int nAlarmDev) {
+		m_nAlarmDev = nAlarmDev;
 	}
 
 	int CEqAlarmStep::getAlarmState()

--
Gitblit v1.9.3