From bca7e5d43c28757b3de88050e585eb40aa202bce Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 27 一月 2026 15:50:21 +0800
Subject: [PATCH] 1.增加机台事件的上报时关联机器名，slot
---
SourceCode/Bond/Servo/Model.cpp | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 6cbe9c2..c7d3597 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -525,9 +525,9 @@
if (pReport != nullptr) {
m_hsmsPassive.withVariableLock([&] {
m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
- int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
+ int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read(pReport->getVcrResult());
if (nRet != ER_NOERROR) {
- LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
+ LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read failed, ret=%d", nRet);
}
});
}
@@ -681,7 +681,7 @@
m_hsmsPassive.withVariableLock([&] {
m_hsmsPassive.setVariableValue(stateVid, (__int64)status);
m_hsmsPassive.setVariableValue(modeVid, (__int64)pLoadPort->getPortMode());
- m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
m_hsmsPassive.setVariableValue("PortState", (__int64)status);
m_hsmsPassive.requestEventReportSend("PortStateChange");
});
@@ -708,7 +708,7 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_Port_Blocked();
});
@@ -717,7 +717,7 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
});
@@ -726,9 +726,9 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
if (prevStatus == PORT_INUSE) {
- m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
}
}
@@ -739,7 +739,7 @@
SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
m_hsmsPassive.withVariableLock([&] {
if (pLoadPort != nullptr) {
- m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
+ m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
}
m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
});
@@ -803,6 +803,10 @@
auto sendSv = [&](const auto& vidMap, const char* evName) {
const size_t count = (std::min)(params.size(), vidMap.size());
m_hsmsPassive.withVariableLock([&] {
+ if (pEquipment != nullptr) {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ }
+ m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
@@ -845,6 +849,10 @@
auto sendProcess = [&](const auto& vidMap, const char* evName) {
const size_t count = (std::min)(params.size(), vidMap.size());
m_hsmsPassive.withVariableLock([&] {
+ if (pEquipment != nullptr) {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ }
+ m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
--
Gitblit v1.9.3