From 238f41fd4edac2febc03d2e428bce7206f609e99 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 29 一月 2026 15:38:58 +0800
Subject: [PATCH] 1.完善CJ/PJ事件上报；
---
SourceCode/Bond/Servo/Model.cpp | 150 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 144 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 22b263c..129d51d 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,
@@ -398,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;
};
@@ -645,10 +761,20 @@
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("MaterialId", glassId.c_str());
+ m_hsmsPassive.setVariableValue("SourceCarrier", sourceCarrier.c_str());
+ m_hsmsPassive.setVariableValue("SourceSlot", (__int64)sourceSlotNo);
+ m_hsmsPassive.setVariableValue("SourcePanelID", glassId.c_str());
m_hsmsPassive.requestEventReportSend("GlassReceivedJob");
});
}
@@ -701,10 +827,20 @@
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("MaterialId", glassId.c_str());
+ m_hsmsPassive.setVariableValue("TargetCarrier", targetCarrier.c_str());
+ m_hsmsPassive.setVariableValue("TargetSlot", (__int64)targetSlotNo);
+ m_hsmsPassive.setVariableValue("TargetPanelID", glassId.c_str());
m_hsmsPassive.requestEventReportSend("GlassSentOutJob");
});
};
@@ -935,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();
});
@@ -950,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