From c3aa662297c2182de2e7a53d7bf63f4ab6b1adbd Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 15 九月 2025 17:29:22 +0800
Subject: [PATCH] 1.千传调度调整，修改为物料从哪个Port, 那个Slot搬出就最终终回哪个位置 ；
---
SourceCode/Bond/Servo/Model.cpp | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index a518901..8d987b6 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -250,9 +250,18 @@
alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
alarmData.strEndTime = "";
-
+ alarmData.strDescription = "";
+
const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
- alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
+ if (alarmInfo != nullptr) {
+ if (alarmInfo->strDescription.empty()) {
+ alarmData.strDescription = alarmInfo->strAlarmText;
+ }
+ else {
+ alarmData.strDescription = alarmInfo->strAlarmText + "," + alarmInfo->strDescription + ".";
+ }
+ }
+
int nAlarmEventId = 0;
bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
--
Gitblit v1.9.3