From cb9456e93002220b7247fadac088c7bddf6908d3 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 01 二月 2026 21:03:23 +0800
Subject: [PATCH] 1.LoadPort1装G1,LoadPort2装G2, LoadPort3装G1, LoadPort4装G4, 加工完成回到G1的原位。按此增加生产模式的调度和连接图；
---
SourceCode/Bond/Servo/Model.cpp | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 129d51d..ce8ee46 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)
@@ -975,7 +978,7 @@
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");
});
@@ -990,7 +993,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]);
@@ -1036,7 +1039,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 +1132,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