From 62bec5118f5e5fe750017cf2f12d4a428ab092df Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 17 九月 2025 18:06:30 +0800
Subject: [PATCH] 1.继续CControlJobManagerDlg的功能实现；
---
SourceCode/Bond/Servo/Model.cpp | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 6f2111e..8d987b6 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -51,6 +51,9 @@
cassetteType, transferMode, autoChangeEnable);
m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
transferMode, autoChangeEnable);
+
+ int seed = m_configuration.getPortCassetteSnSeed(i + 1);
+ m_master.setPortCassetteSnSeed(i + 1, seed);
}
}
@@ -247,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);
@@ -437,6 +449,10 @@
m_hsmsPassive.requestEventReportSend_Panel_End();
auto& db = GlassLogDb::Instance();
db.insertFromCGlass((*(SERVO::CGlass*)pPanel));
+ SERVO::CGlass* pBuddy = ((SERVO::CGlass*)pPanel)->getBuddy();
+ if (pBuddy != nullptr) {
+ db.insertFromCGlass(*pBuddy);
+ }
};
m_master.setListener(masterListener);
m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());
@@ -475,6 +491,10 @@
int CModel::term()
{
+ m_configuration.setPortCassetteSnSeed(1, m_master.getPortCassetteSnSeed(1));
+ m_configuration.setPortCassetteSnSeed(2, m_master.getPortCassetteSnSeed(2));
+ m_configuration.setPortCassetteSnSeed(3, m_master.getPortCassetteSnSeed(3));
+ m_configuration.setPortCassetteSnSeed(4, m_master.getPortCassetteSnSeed(4));
m_hsmsPassive.saveCache();
m_hsmsPassive.term();
CLog::GetLog()->SetOnLogCallback(nullptr);
--
Gitblit v1.9.3