From 867888458abdc029cbf31b6058edfefe30a20722 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 16:38:24 +0800
Subject: [PATCH] 1.修复重启后，由于PJ不是列队中，导致无法创建调度任务的问题。 2.修复CPjPage2点Port2的物料类型，Port1也跟着变的问题。
---
SourceCode/Bond/Servo/Model.cpp | 35 +++++++++++++++++++++++------------
1 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 129d51d..d038cb0 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -272,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)
@@ -302,7 +305,7 @@
m_configuration.getUnitId(strUnitId);
// 鏈哄櫒鍨嬪彿鍜岃蒋浠剁増鏈彿搴斾粠閰嶇疆涓鍙栵紝褰撳墠鍏堝浐瀹氬��
- CString strModeType = _T("Master");
+ CString strModeType = _T("Panel Bonder");
CString strSoftRev = _T("1.0.2");
@@ -534,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);
@@ -975,55 +978,62 @@
if (pEquipment == nullptr) return;
m_hsmsPassive.withVariableLock([&] {
m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
- m_hsmsPassive.setVariableValue("SubEqpSlot", unitId);
+ 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", 0);
+ 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) {
@@ -1036,7 +1046,7 @@
if (pEquipment != nullptr) {
m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
}
- m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
+ 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]);
@@ -1129,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