From d400f022161ff47f02cd0ea95a5076d0187ecd4d Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 30 一月 2026 15:11:06 +0800
Subject: [PATCH] 1.接上，日志完善；
---
SourceCode/Bond/Servo/Model.cpp | 267 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 237 insertions(+), 30 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index ce34d63..358a582 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -41,8 +41,118 @@
{
// 1) 鍒锋柊娲剧敓 SV
refreshDerivedSVs();
+ // 2) 涓婃姤 CJ 鐘舵�佷簨浠讹紙鍚屼竴 CJID锛孯PTID=31000锛�
+ static SERVO::CJState s_prevState = SERVO::CJState::NoState;
+ static std::string s_prevCjId;
+ SERVO::CControlJob* pCj = m_master.getControlJob();
+ if (pCj == nullptr) {
+ if (!s_prevCjId.empty()) {
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("CJID", s_prevCjId.c_str());
+ m_hsmsPassive.requestEventReportSend("CJobDeleted");
+ });
+ s_prevCjId.clear();
+ s_prevState = SERVO::CJState::NoState;
+ }
+ }
+ else {
+ const std::string& cjId = pCj->id();
+ const SERVO::CJState state = pCj->state();
+ if (s_prevCjId != cjId) {
+ s_prevCjId = cjId;
+ s_prevState = SERVO::CJState::NoState;
+ }
+ if (state != s_prevState) {
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("CJID", cjId.c_str());
+ if (state == SERVO::CJState::Queued) {
+ m_hsmsPassive.requestEventReportSend("CJobQueued");
+ }
+ else if (state == SERVO::CJState::Executing) {
+ if (s_prevState == SERVO::CJState::Paused) {
+ m_hsmsPassive.requestEventReportSend("CJobResume");
+ }
+ else {
+ m_hsmsPassive.requestEventReportSend("CJobExecuting");
+ }
+ }
+ else if (state == SERVO::CJState::Paused) {
+ m_hsmsPassive.requestEventReportSend("CJobPaused");
+ }
+ else if (state == SERVO::CJState::Completed) {
+ m_hsmsPassive.requestEventReportSend("CJobCompleted");
+ }
+ else if (state == SERVO::CJState::Aborted || state == SERVO::CJState::Failed) {
+ m_hsmsPassive.requestEventReportSend("CJobAbort");
+ }
+ });
+ s_prevState = state;
+ }
+ }
+ // 3) 涓婃姤 PJ 鐘舵�佷簨浠讹紙PrJob*锛�
+ emitPjStateEvents();
// 2) 閫氱煡涓婂眰 UI锛圧X_CODE_CONTROLJOB_CHANGED锛�
notify(RX_CODE_CONTROLJOB_CHANGED);
+}
+
+void CModel::emitPjStateEvents()
+{
+ // 褰撳墠 PJ 鍒楄〃
+ std::map<std::string, SERVO::PJState> current;
+ for (auto pj : m_master.getProcessJobs()) {
+ if (pj == nullptr) continue;
+ current[pj->id()] = pj->state();
+ }
+
+ // 宸插垹闄ょ殑 PJ
+ for (auto it = m_prevPjStates.begin(); it != m_prevPjStates.end(); ) {
+ if (current.find(it->first) == current.end()) {
+ const std::string pjId = it->first;
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PJID", pjId.c_str());
+ m_hsmsPassive.requestEventReportSend("PrJobDeleted");
+ });
+ it = m_prevPjStates.erase(it);
+ continue;
+ }
+ ++it;
+ }
+
+ // 鐘舵�佸彉鏇翠簨浠�
+ for (const auto& kv : current) {
+ const std::string& pjId = kv.first;
+ const SERVO::PJState state = kv.second;
+ auto prevIt = m_prevPjStates.find(pjId);
+ if (prevIt == m_prevPjStates.end()) {
+ // 鏂� PJ锛氱敱 onPRJobMultiCreate 璐熻矗涓婃姤 PrJobPooled锛岃繖閲屽彧缂撳瓨
+ m_prevPjStates[pjId] = state;
+ continue;
+ }
+ const SERVO::PJState prevState = prevIt->second;
+ if (state == prevState) continue;
+
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("PJID", pjId.c_str());
+ if (state == SERVO::PJState::InProcess) {
+ if (prevState == SERVO::PJState::Paused) {
+ m_hsmsPassive.requestEventReportSend("PrJobResume");
+ }
+ else {
+ m_hsmsPassive.requestEventReportSend("PrJobProcessing");
+ }
+ }
+ else if (state == SERVO::PJState::Paused) {
+ m_hsmsPassive.requestEventReportSend("PrJobPaused");
+ }
+ else if (state == SERVO::PJState::Completed) {
+ m_hsmsPassive.requestEventReportSend("PrJobCompleted");
+ }
+ else if (state == SERVO::PJState::Aborted || state == SERVO::PJState::Failed || state == SERVO::PJState::Aborting) {
+ m_hsmsPassive.requestEventReportSend("PrJobAbort");
+ }
+ });
+ m_prevPjStates[pjId] = state;
+ }
}
bool CModel::raiseSoftAlarm(int alarmId,
@@ -333,11 +443,24 @@
return CAACK_5;
}
+ const short scanMap = pLoadPort->getScanCassetteMap();
+ const short downloadMap = pLoadPort->getDownloadCassetteMap();
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
- m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
- m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+ m_hsmsPassive.setVariableValue("SlotMapScan", scanMap);
+ m_hsmsPassive.setVariableValue("SlotMapDownload", downloadMap);
+ if (scanMap != downloadMap) {
+ m_hsmsPassive.requestEventReportSend_SlotMapVerificationNG();
+ m_hsmsPassive.requestEventReportSend("SlotMapMismatch");
+ }
+ else {
+ m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+ }
});
+
+ if (scanMap != downloadMap) {
+ strErrorTxt = "rejected - SlotMap mismatch";
+ return CAACK_5;
+ }
// Host 纭 SlotMap 鍚庡啀寮�濮嬪姞宸�/娴佺▼
m_master.proceedWithCarrier(portIndex);
@@ -385,6 +508,12 @@
m_hsmsPassive.withVariableLock([&] {
m_hsmsPassive.setVariableValue("PJQueued", vars);
m_hsmsPassive.requestEventReportSend_PJ_Queued();
+ for (auto pj : processJobs) {
+ if (pj == nullptr) continue;
+ m_hsmsPassive.setVariableValue("PJID", pj->id().c_str());
+ m_hsmsPassive.requestEventReportSend("PrJobPooled");
+ m_prevPjStates[pj->id()] = pj->state();
+ }
});
return nRet;
};
@@ -512,9 +641,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);
}
});
}
@@ -618,6 +747,37 @@
(void)pMaster;
(void)port;
if (pEquipment == nullptr || pJobDataS == nullptr) return;
+ {
+ const std::string& g1 = pJobDataS->getGlass1Id();
+ const std::string& g2 = pJobDataS->getGlass2Id();
+ std::string glassId;
+ if (!g1.empty() && !g2.empty()) {
+ glassId = g1 + "+" + g2;
+ }
+ else if (!g1.empty()) {
+ glassId = g1;
+ }
+ else {
+ glassId = g2;
+ }
+ const int slotNo = pJobDataS->getTargetSlotNo();
+ const int sourceSlotNo = pJobDataS->getSourceSlotNo();
+ const int sourcePortNo = pJobDataS->getSourcePortNo();
+ std::string sourceCarrier;
+ if (sourcePortNo > 0) {
+ if (auto* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + sourcePortNo - 1)) {
+ sourceCarrier = pLoadPort->getCassetteId();
+ }
+ }
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+ m_hsmsPassive.setVariableValue("SourceCarrier", sourceCarrier.c_str());
+ m_hsmsPassive.setVariableValue("SourceSlot", (__int64)sourceSlotNo);
+ m_hsmsPassive.setVariableValue("SourcePanelID", glassId.c_str());
+ m_hsmsPassive.requestEventReportSend("GlassReceivedJob");
+ });
+ }
const int eqId = pEquipment->getID();
const int recipeId = pJobDataS->getMasterRecipe();
std::string recipe = RecipeManager::getInstance().getPPIDById(recipeId);
@@ -650,6 +810,40 @@
m_hsmsPassive.requestEventReportSend("RecipeChanged");
});
};
+ masterListener.onJobSentOut = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
+ (void)pMaster;
+ (void)port;
+ if (pEquipment == nullptr || pJobDataS == nullptr) return;
+ const std::string& g1 = pJobDataS->getGlass1Id();
+ const std::string& g2 = pJobDataS->getGlass2Id();
+ std::string glassId;
+ if (!g1.empty() && !g2.empty()) {
+ glassId = g1 + "+" + g2;
+ }
+ else if (!g1.empty()) {
+ glassId = g1;
+ }
+ else {
+ glassId = g2;
+ }
+ const int slotNo = pJobDataS->getSourceSlotNo();
+ const int targetSlotNo = pJobDataS->getTargetSlotNo();
+ const int targetPortNo = pJobDataS->getTargetPortNo();
+ std::string targetCarrier;
+ if (targetPortNo > 0) {
+ if (auto* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + targetPortNo - 1)) {
+ targetCarrier = pLoadPort->getCassetteId();
+ }
+ }
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+ m_hsmsPassive.setVariableValue("TargetCarrier", targetCarrier.c_str());
+ m_hsmsPassive.setVariableValue("TargetSlot", (__int64)targetSlotNo);
+ m_hsmsPassive.setVariableValue("TargetPanelID", glassId.c_str());
+ m_hsmsPassive.requestEventReportSend("GlassSentOutJob");
+ });
+ };
masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
static std::map<int, short> s_prevPortStatus;
@@ -668,7 +862,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");
});
@@ -695,7 +889,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();
});
@@ -704,7 +898,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();
});
@@ -713,9 +907,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();
}
}
@@ -726,7 +920,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();
});
@@ -753,34 +947,37 @@
m_hsmsPassive.setVariableValue("CurrentProcessState", (__int64)state);
m_hsmsPassive.requestEventReportSend("ProcessStateChanged");
- // SubEqp events (per equipment, ignore slot distinction except payload)
- static std::map<int, SERVO::PROCESS_STATE> s_prevSubEqpState;
- const auto prevEqState = s_prevSubEqpState[eqId];
- if (prevEqState != state) {
- // state change
- m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
- }
- if (state == SERVO::PROCESS_STATE::Processing) {
- m_hsmsPassive.requestEventReportSend_SubEqpStart();
- }
- else if (state == SERVO::PROCESS_STATE::Complete) {
- m_hsmsPassive.requestEventReportSend_SubEqpEnd();
- }
- s_prevSubEqpState[eqId] = state;
-
// Unit events (per equipment slot)
static std::map<int, std::map<int, SERVO::PROCESS_STATE>> s_prevUnitState;
const auto prevUnitState = s_prevUnitState[eqId][slotNo];
if (prevUnitState != state) {
m_hsmsPassive.requestEventReportSend("UnitStateChange");
+ std::string panelId;
+ if (pEquipment != nullptr && slotNo > 0) {
+ if (auto* pGlass = pEquipment->getGlassFromSlot(slotNo)) {
+ panelId = pGlass->getID();
+ }
+ }
if (state == SERVO::PROCESS_STATE::Processing) {
+ m_hsmsPassive.setVariableValue("PanelStartID", panelId.c_str());
m_hsmsPassive.requestEventReportSend("UnitStart");
}
else if (state == SERVO::PROCESS_STATE::Complete) {
+ m_hsmsPassive.setVariableValue("PanelEndID", panelId.c_str());
m_hsmsPassive.requestEventReportSend("UnitEnd");
}
s_prevUnitState[eqId][slotNo] = state;
}
+ });
+ };
+ masterListener.onEqStatusChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int unitId, int status, int reason) {
+ (void)pMaster;
+ if (pEquipment == nullptr) return;
+ m_hsmsPassive.withVariableLock([&] {
+ m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+ m_hsmsPassive.setVariableValue("SubEqpSlot", (__int64)unitId);
+ m_hsmsPassive.setVariableValue("EquipmentStatus", (__int64)status);
+ m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
});
};
masterListener.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
@@ -790,6 +987,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", (__int64)0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
@@ -832,6 +1033,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", (__int64)0);
m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
for (size_t idx = 0; idx < count; ++idx) {
const std::string val = formatParamValue(params[idx]);
@@ -866,13 +1071,13 @@
};
masterListener.onCjStart = [&](void* pMaster, void* pj) {
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("CJStartID", ((SERVO::CControlJob*)pj)->id().c_str());
+ m_hsmsPassive.setVariableValue("CJID", ((SERVO::CControlJob*)pj)->id().c_str());
m_hsmsPassive.requestEventReportSend_CJ_Start();
});
};
masterListener.onCjEnd = [&](void* pMaster, void* pj) {
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("CJEndID", ((SERVO::CControlJob*)pj)->id().c_str());
+ m_hsmsPassive.setVariableValue("CJID", ((SERVO::CControlJob*)pj)->id().c_str());
m_hsmsPassive.requestEventReportSend_CJ_End();
});
@@ -881,15 +1086,17 @@
};
masterListener.onPjStart = [&](void* pMaster, void* pj) {
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
+ m_hsmsPassive.setVariableValue("PJID", ((SERVO::CProcessJob*)pj)->id().c_str());
m_hsmsPassive.requestEventReportSend_PJ_Start();
});
+ emitPjStateEvents();
};
masterListener.onPjEnd = [&](void* pMaster, void* pj) {
m_hsmsPassive.withVariableLock([&] {
- m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
+ m_hsmsPassive.setVariableValue("PJID", ((SERVO::CProcessJob*)pj)->id().c_str());
m_hsmsPassive.requestEventReportSend_PJ_End();
});
+ emitPjStateEvents();
};
masterListener.onPanelStart = [&](void* pMaster, void* pPanel) {
m_hsmsPassive.withVariableLock([&] {
--
Gitblit v1.9.3