From decceeb6669cadea0302c2e5a8035b920a04f836 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 15:54:16 +0800
Subject: [PATCH] 1.SVdata不主动上报，但先缓存。且bonder1和bonder2分开变量。
---
SourceCode/Bond/Servo/Model.cpp | 261 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 233 insertions(+), 28 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index b345e3d..d038cb0 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,
@@ -162,6 +272,9 @@
int seed = m_configuration.getPortCassetteSnSeed(i + 1);
m_master.setPortCassetteSnSeed(i + 1, seed);
}
+
+ // 鎸夎皟搴︽ā寮忚鍐欑敓浜х鍙ｉ厤缃�
+ m_master.applySchedulingModePortMapping();
}
void CModel::setPortType(unsigned int index, SERVO::PortType type)
@@ -192,7 +305,7 @@
m_configuration.getUnitId(strUnitId);
// 鏈哄櫒鍨嬪彿鍜岃蒋浠剁増鏈彿搴斾粠閰嶇疆涓鍙栵紝褰撳墠鍏堝浐瀹氬��
- CString strModeType = _T("Master");
+ CString strModeType = _T("Panel Bonder");
CString strSoftRev = _T("1.0.2");
@@ -398,6 +511,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;
};
@@ -418,7 +537,7 @@
m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
setControlState(m_currentControlState);
refreshDerivedSVs();
- m_hsmsPassive.init(this, "APP", 7000);
+ m_hsmsPassive.init(this, "APP", 5000);
strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -631,6 +750,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);
@@ -661,6 +811,40 @@
m_hsmsPassive.setVariableValue(recipeVid, recipe.c_str());
}
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) {
@@ -766,76 +950,90 @@
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) {
(void)pMaster;
+ // Keep SV variable cache updated, but do not actively send S6F11 reports.
const int eqId = pEquipment ? pEquipment->getID() : 0;
- auto sendSv = [&](const auto& vidMap, const char* evName) {
+ auto cacheSv = [&](const auto& vidMap) {
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]);
m_hsmsPassive.setVariableValue(std::to_string(vidMap[idx]).c_str(), val.c_str());
}
- m_hsmsPassive.requestEventReportSend(evName);
});
};
- if (eqId == EQ_ID_Bonder1 || eqId == EQ_ID_Bonder2) {
+ if (eqId == EQ_ID_Bonder1) {
static constexpr std::array<int, 19> vids = {
6000,6001,6002,6003,6004,6005,6006,6007,6008,6009,
6010,6011,6012,6013,6014,6015,6016,6017,6018
};
- sendSv(vids, "BonderSVData");
+ cacheSv(vids);
+ }
+ else if (eqId == EQ_ID_Bonder2) {
+ static constexpr std::array<int, 19> vids = {
+ 6020,6021,6022,6023,6024,6025,6026,6027,6028,6029,
+ 6030,6031,6032,6033,6034,6035,6036,6037,6038
+ };
+ cacheSv(vids);
}
else if (eqId == EQ_ID_VACUUMBAKE) {
static constexpr std::array<int, 18> vids = {
6200,6201,6202,6203,6204,6205,6206,6207,6208,
6209,6210,6211,6212,6213,6214,6215,6216,6217
};
- sendSv(vids, "VacuumBakeSVData");
+ cacheSv(vids);
}
else if (eqId == EQ_ID_BAKE_COOLING) {
static constexpr std::array<int, 20> vids = {
6400,6401,6402,6403,6404,6405,6406,6407,6408,6409,
6410,6411,6412,6413,6414,6415,6416,6417,6418,6419
};
- sendSv(vids, "BakeCoolingSVData");
+ cacheSv(vids);
}
else if (eqId == EQ_ID_MEASUREMENT) {
static constexpr std::array<int, 2> vids = { 6600, 6601 };
- sendSv(vids, "MeasurementSVData");
+ cacheSv(vids);
}
};
masterListener.onProcessDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
@@ -845,6 +1043,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]);
@@ -879,13 +1081,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();
});
@@ -894,15 +1096,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([&] {
@@ -935,6 +1139,7 @@
m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
m_master.setJobMode(m_configuration.isJobMode());
+ m_master.setSchedulingMode((SERVO::SchedulingMode)m_configuration.getSchedulingMode());
// 鍔犳埅Job
strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
--
Gitblit v1.9.3