From af5c7a6ce19dd295701348f5f7eb6ce53c91826a Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 10:58:44 +0800
Subject: [PATCH] 1.工创建PJ, 然后生产，当时有3片料，PJ只选了两片。其中两片配对生产了，按道理就不应该去取第三片了，但实际上它还去取了。修复此Bug
---
SourceCode/Bond/Servo/CMaster.cpp | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 336 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index 492e813..62a6733 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -707,6 +707,91 @@
continue;
}
+ // 鐢熶骇妯″紡鍥哄畾鏄犲皠锛歅ort1/3 -> G1锛孭ort2/4 -> G2銆�
+ auto isProductionPortTypeMatch = [&](int portIndex, MaterialsType type) -> bool {
+ if (m_schedulingMode != SchedulingMode::Production) return true;
+ const bool isG1Port = (portIndex == 0 || portIndex == 2);
+ if (type == MaterialsType::G1) return isG1Port;
+ if (type == MaterialsType::G2) return !isG1Port;
+ return true;
+ };
+
+ // 鐢熶骇妯″紡锛氭牴鎹嚎涓婃湭閰嶅鐜荤拑鍙嶆帹涓嬩竴鐗囧簲鏉ヨ嚜鍝釜绔彛锛圥ort1<->2, Port3<->4锛夈��
+ auto getPreferredPortForType = [&](MaterialsType targetType) -> int {
+ if (m_schedulingMode != SchedulingMode::Production) return -1;
+
+ auto preferG1ByG2 = [&](CGlass* pG2) -> int {
+ if (pG2 == nullptr || pG2->getType() != MaterialsType::G2 || pG2->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG2->getOrginPort(originPort, originSlot);
+ if (originPort == 1) return 0; // Port2 -> Port1
+ if (originPort == 3) return 2; // Port4 -> Port3
+ return -1;
+ };
+ auto preferG2ByG1 = [&](CGlass* pG1) -> int {
+ if (pG1 == nullptr || pG1->getType() != MaterialsType::G1 || pG1->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG1->getOrginPort(originPort, originSlot);
+ if (originPort == 0) return 1; // Port1 -> Port2
+ if (originPort == 2) return 3; // Port3 -> Port4
+ return -1;
+ };
+
+ if (targetType == MaterialsType::G1) {
+ int p = preferG1ByG2(pBonder1->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pBonder2->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pFliper->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+ else if (targetType == MaterialsType::G2) {
+ int p = preferG2ByG1(pBonder1->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pBonder2->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+
+ return -1;
+ };
+
+ // Job 妯″紡涓嬭姹� Bonder 鍐呯殑 G1/G2 鏉ヨ嚜鍚屼竴涓� ProcessJob銆�
+ auto validateBonderPairProcessJob = [&](CEquipment* pBonder, const char* bonderName) -> bool {
+ if (m_pActiveRobotTask == nullptr) return false;
+ CGlass* pIncomingG1 = (CGlass*)m_pActiveRobotTask->getContext();
+ CGlass* pExistingG2 = pBonder->getGlassFromSlot(0);
+ if (pIncomingG1 == nullptr || pExistingG2 == nullptr) return true;
+
+ CProcessJob* pjG1 = pIncomingG1->getProcessJob();
+ CProcessJob* pjG2 = pExistingG2->getProcessJob();
+ if (m_bJobMode && (pjG1 == nullptr || pjG2 == nullptr || pjG1 != pjG2)) {
+ std::string pj1 = (pjG1 == nullptr) ? "NULL" : pjG1->id();
+ std::string pj2 = (pjG2 == nullptr) ? "NULL" : pjG2->id();
+ LOGW("<Master>%s閰嶅鎷︽埅锛欸1/G2鏉ヨ嚜涓嶅悓ProcessJob(G1=%s,G2=%s)銆�",
+ bonderName, pj1.c_str(), pj2.c_str());
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+
+ // 鐢熶骇妯″紡鍥哄畾绔彛瀵癸細Port1<->Port2锛孭ort3<->Port4銆�
+ if (m_schedulingMode == SchedulingMode::Production) {
+ int g1Port = 0, g1Slot = 0, g2Port = 0, g2Slot = 0;
+ pIncomingG1->getOrginPort(g1Port, g1Slot);
+ pExistingG2->getOrginPort(g2Port, g2Slot);
+ const bool pairOk =
+ (g1Port == 0 && g2Port == 1) ||
+ (g1Port == 2 && g2Port == 3);
+ if (!pairOk) {
+ LOGW("<Master>%s閰嶅鎷︽埅锛氱鍙ｅ涓嶅尮閰�(瑕佹眰1<->2鎴�3<->4, 瀹為檯G1Port=%d,G2Port=%d)銆�",
+ bonderName, g1Port + 1, g2Port + 1);
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+ }
+ return true;
+ };
+
// Bonder1銆丅onder2銆丗liper銆乂acuumBake銆丄ligner锛岀粺璁2鍜孏1鐨勬暟閲�, 閰嶅缁勬暟, 澶氬嚭鐨勭被鍨�
int nG2Count = 0, nG1Count = 0, nGlassGroup, nExtraType;
@@ -837,11 +922,17 @@
// VacuumBake(G1) -> Bonder
if (!rmd.armState[0] && pBonder1->slotHasGlass(0) && !pBonder1->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder1, "Bonder1")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
if (!rmd.armState[0] && pBonder2->slotHasGlass(0) && !pBonder2->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder2, "Bonder2")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
@@ -880,15 +971,45 @@
else {
primaryType = MaterialsType::G1;
}
+ const int preferredPortForPrimary = getPreferredPortForType(primaryType);
+ {
+ static int s_prevPrimaryType = -1;
+ static int s_prevPreferredPort = -2;
+ const int curPrimaryType = (int)primaryType;
+ if (s_prevPrimaryType != curPrimaryType || s_prevPreferredPort != preferredPortForPrimary) {
+ LOGI("<Master>LoadPort->Aligner瑙勫垯(RUNNING): primaryType=%d, preferredPort=%d",
+ curPrimaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0);
+ s_prevPrimaryType = curPrimaryType;
+ s_prevPreferredPort = preferredPortForPrimary;
+ }
+ }
for (int s = 0; s < 4; s++) {
PortType pt = pLoadPorts[s]->getPortType();
if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
&& (pt == PortType::Loading || pt == PortType::Both)
&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ if (!isProductionPortTypeMatch(s, primaryType)) {
+ continue;
+ }
+ if (preferredPortForPrimary >= 0 && s != preferredPortForPrimary) {
+ continue;
+ }
m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
if (m_pActiveRobotTask != nullptr) {
CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
+ CProcessJob* pPJ = (pGlass != nullptr) ? pGlass->getProcessJob() : nullptr;
+ LOGI("<Master>LoadPort->Aligner鍛戒腑(RUNNING): port=%d, primaryType=%d, preferredPort=%d, glass=%s, scheduled=%d, pj=%s",
+ s + 1, (int)primaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0,
+ pGlass != nullptr ? pGlass->getID().c_str() : "",
+ (pGlass != nullptr && pGlass->isScheduledForProcessing()) ? 1 : 0,
+ pPJ != nullptr ? pPJ->id().c_str() : "NULL");
+ if (pGlass == nullptr) {
+ LOGE("<Master>LoadPort->Aligner鍛戒腑(RUNNING)浣哻ontext涓虹┖锛屼换鍔″凡涓㈠純.");
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ continue;
+ }
if (pGlass->getBuddy() != nullptr) {
delete m_pActiveRobotTask;
m_pActiveRobotTask = nullptr;
@@ -969,6 +1090,91 @@
unlock(); // 绛夊綋鍓嶄换鍔″畬鎴愭垨涓鍚庣户缁�
continue;
}
+
+ // 鐢熶骇妯″紡鍥哄畾鏄犲皠锛歅ort1/3 -> G1锛孭ort2/4 -> G2銆�
+ auto isProductionPortTypeMatch = [&](int portIndex, MaterialsType type) -> bool {
+ if (m_schedulingMode != SchedulingMode::Production) return true;
+ const bool isG1Port = (portIndex == 0 || portIndex == 2);
+ if (type == MaterialsType::G1) return isG1Port;
+ if (type == MaterialsType::G2) return !isG1Port;
+ return true;
+ };
+
+ // 鐢熶骇妯″紡锛氭牴鎹嚎涓婃湭閰嶅鐜荤拑鍙嶆帹涓嬩竴鐗囧簲鏉ヨ嚜鍝釜绔彛锛圥ort1<->2, Port3<->4锛夈��
+ auto getPreferredPortForType = [&](MaterialsType targetType) -> int {
+ if (m_schedulingMode != SchedulingMode::Production) return -1;
+
+ auto preferG1ByG2 = [&](CGlass* pG2) -> int {
+ if (pG2 == nullptr || pG2->getType() != MaterialsType::G2 || pG2->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG2->getOrginPort(originPort, originSlot);
+ if (originPort == 1) return 0; // Port2 -> Port1
+ if (originPort == 3) return 2; // Port4 -> Port3
+ return -1;
+ };
+ auto preferG2ByG1 = [&](CGlass* pG1) -> int {
+ if (pG1 == nullptr || pG1->getType() != MaterialsType::G1 || pG1->getBuddy() != nullptr) return -1;
+ int originPort = -1, originSlot = -1;
+ pG1->getOrginPort(originPort, originSlot);
+ if (originPort == 0) return 1; // Port1 -> Port2
+ if (originPort == 2) return 3; // Port3 -> Port4
+ return -1;
+ };
+
+ if (targetType == MaterialsType::G1) {
+ int p = preferG1ByG2(pBonder1->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pBonder2->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pFliper->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG1ByG2(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+ else if (targetType == MaterialsType::G2) {
+ int p = preferG2ByG1(pBonder1->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pBonder2->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(1)); if (p >= 0) return p;
+ p = preferG2ByG1(pVacuumBake->getGlassFromSlot(2)); if (p >= 0) return p;
+ p = preferG2ByG1(pAligner->getGlassFromSlot(1)); if (p >= 0) return p;
+ }
+
+ return -1;
+ };
+
+ // Job 妯″紡涓嬭姹� Bonder 鍐呯殑 G1/G2 鏉ヨ嚜鍚屼竴涓� ProcessJob銆�
+ auto validateBonderPairProcessJob = [&](CEquipment* pBonder, const char* bonderName) -> bool {
+ if (m_pActiveRobotTask == nullptr) return false;
+ CGlass* pIncomingG1 = (CGlass*)m_pActiveRobotTask->getContext();
+ CGlass* pExistingG2 = pBonder->getGlassFromSlot(0);
+ if (pIncomingG1 == nullptr || pExistingG2 == nullptr) return true;
+
+ CProcessJob* pjG1 = pIncomingG1->getProcessJob();
+ CProcessJob* pjG2 = pExistingG2->getProcessJob();
+ if (m_bJobMode && (pjG1 == nullptr || pjG2 == nullptr || pjG1 != pjG2)) {
+ std::string pj1 = (pjG1 == nullptr) ? "NULL" : pjG1->id();
+ std::string pj2 = (pjG2 == nullptr) ? "NULL" : pjG2->id();
+ LOGW("<Master>%s閰嶅鎷︽埅锛欸1/G2鏉ヨ嚜涓嶅悓ProcessJob(G1=%s,G2=%s)銆�",
+ bonderName, pj1.c_str(), pj2.c_str());
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+
+ // 鐢熶骇妯″紡鍥哄畾绔彛瀵癸細Port1<->Port2锛孭ort3<->Port4銆�
+ if (m_schedulingMode == SchedulingMode::Production) {
+ int g1Port = 0, g1Slot = 0, g2Port = 0, g2Slot = 0;
+ pIncomingG1->getOrginPort(g1Port, g1Slot);
+ pExistingG2->getOrginPort(g2Port, g2Slot);
+ const bool pairOk =
+ (g1Port == 0 && g2Port == 1) ||
+ (g1Port == 2 && g2Port == 3);
+ if (!pairOk) {
+ LOGW("<Master>%s閰嶅鎷︽埅锛氱鍙ｅ涓嶅尮閰�(瑕佹眰1<->2鎴�3<->4, 瀹為檯G1Port=%d,G2Port=%d)銆�",
+ bonderName, g1Port + 1, g2Port + 1);
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ return false;
+ }
+ }
+ return true;
+ };
// 5.5) 鏆傚仠鐘舵�佹鏌ワ細鑻� CJ 鎴栧湪鍒� PJ 澶勪簬 Paused锛屾殏缂撹皟搴︽柊鐨勬惉閫�
bool pausedByEvent = false;
@@ -1098,10 +1304,16 @@
// 13) VacuumBake(G1) -> Bonder锛堟Ы绾у垽瀹氾細slot0(G2) 宸叉湁涓� slot1(G1) 涓虹┖锛�
if (!rmd.armState[0] && pBonder1->slotHasGlass(0) && !pBonder1->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder1, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder1, "Bonder1")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
if (!rmd.armState[0] && pBonder2->slotHasGlass(0) && !pBonder2->slotHasGlass(1)) {
m_pActiveRobotTask = createTransferTask(pVacuumBake, pBonder2, MaterialsType::G1, MaterialsType::G0);
+ if (m_pActiveRobotTask != nullptr && !validateBonderPairProcessJob(pBonder2, "Bonder2")) {
+ // 鍚� PJ 鏍￠獙澶辫触锛屾湰杞笉涓嬪彂鎼��
+ }
CHECK_RUN_ACTIVE_ROBOT_TASK(m_pActiveRobotTask);
}
@@ -1123,16 +1335,46 @@
// 16) LoadPort -> Aligner锛堝彈缁勬暟闂ㄩ檺鎺у埗锛涚粺涓� buddy/鐘舵�佹椂搴忥級
if (blockLoadFromLP) { unlock(); continue; }
+ const int preferredPortForPrimary = getPreferredPortForType(primaryType);
+ {
+ static int s_prevPrimaryType = -1;
+ static int s_prevPreferredPort = -2;
+ const int curPrimaryType = (int)primaryType;
+ if (s_prevPrimaryType != curPrimaryType || s_prevPreferredPort != preferredPortForPrimary) {
+ LOGI("<Master>LoadPort->Aligner瑙勫垯(RUNNING_BATCH): primaryType=%d, preferredPort=%d",
+ curPrimaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0);
+ s_prevPrimaryType = curPrimaryType;
+ s_prevPreferredPort = preferredPortForPrimary;
+ }
+ }
for (int s = 0; s < 4; s++) {
PortType pt = pLoadPorts[s]->getPortType();
if (!rmd.armState[0] && pLoadPorts[s]->isEnable()
&& (pt == PortType::Loading || pt == PortType::Both)
&& pLoadPorts[s]->getPortStatus() == PORT_INUSE) {
+ if (!isProductionPortTypeMatch(s, primaryType)) {
+ continue;
+ }
+ if (preferredPortForPrimary >= 0 && s != preferredPortForPrimary) {
+ continue;
+ }
m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, 1, m_bJobMode);
if (m_pActiveRobotTask != nullptr) {
auto* pGlass = static_cast<CGlass*>(m_pActiveRobotTask->getContext());
+ CProcessJob* pPJ = (pGlass != nullptr) ? pGlass->getProcessJob() : nullptr;
+ LOGI("<Master>LoadPort->Aligner鍛戒腑(RUNNING_BATCH): port=%d, primaryType=%d, preferredPort=%d, glass=%s, scheduled=%d, pj=%s",
+ s + 1, (int)primaryType, preferredPortForPrimary >= 0 ? (preferredPortForPrimary + 1) : 0,
+ pGlass != nullptr ? pGlass->getID().c_str() : "",
+ (pGlass != nullptr && pGlass->isScheduledForProcessing()) ? 1 : 0,
+ pPJ != nullptr ? pPJ->id().c_str() : "NULL");
+ if (pGlass == nullptr) {
+ LOGE("<Master>LoadPort->Aligner鍛戒腑(RUNNING_BATCH)浣哻ontext涓虹┖锛屼换鍔″凡涓㈠純.");
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ continue;
+ }
if (pGlass->getBuddy() != nullptr) {
delete m_pActiveRobotTask; m_pActiveRobotTask = nullptr;
continue;
@@ -1710,12 +1952,36 @@
pGlass->setProcessJob(pj);
PJWarp& jpWarp = pj->getPjWarp();
+ int portIndex = -1;
+ switch (pPort->getID()) {
+ case EQ_ID_LOADPORT1: portIndex = 0; break;
+ case EQ_ID_LOADPORT2: portIndex = 1; break;
+ case EQ_ID_LOADPORT3: portIndex = 2; break;
+ case EQ_ID_LOADPORT4: portIndex = 3; break;
+ default: break;
+ }
+
+ BOOL scheduled = FALSE;
+ int material = 1; // G1
+ if (1 <= slot && slot <= 8) {
+ if (0 <= portIndex && portIndex <= 3 && jpWarp.selectedPorts[portIndex]) {
+ scheduled = jpWarp.checkSlots[portIndex][slot - 1];
+ material = jpWarp.materialSlots[portIndex][slot - 1];
+ }
+ else {
+ // Backward compatibility for legacy single-port PJWarp.
+ scheduled = jpWarp.checkSlot[slot - 1];
+ material = jpWarp.material[slot - 1];
+ }
+ }
+ material = (material == 2) ? 2 : 1;
+
int nRecipeID = RecipeManager::getInstance().getIdByPPID(pj->recipeSpec());
RecipeInfo stRecipeInfo = RecipeManager::getInstance().getRecipeByPPID(pj->recipeSpec());
std::vector<DeviceRecipe> vecRecipeInfo = stRecipeInfo.vecDeviceList;
- pGlass->setScheduledForProcessing(jpWarp.checkSlot[slot-1]);
- pGlass->setType(static_cast<SERVO::MaterialsType>(jpWarp.material[slot-1]));
+ pGlass->setScheduledForProcessing(scheduled);
+ pGlass->setType(static_cast<SERVO::MaterialsType>(material));
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
if (pJobDataS != nullptr) {
@@ -1723,7 +1989,7 @@
pJobDataS->setLotId(pj->getLotId().c_str());
pJobDataS->setProductId(pj->getProductId().c_str());
pJobDataS->setOperationId(pj->getOperationId().c_str());
- pJobDataS->setMaterialsType(jpWarp.material[slot - 1]);
+ pJobDataS->setMaterialsType(material);
pJobDataS->setMasterRecipe(nRecipeID);
for (const auto& info : vecRecipeInfo) {
const std::string& name = info.strDeviceName;
@@ -3068,6 +3334,9 @@
if (portStatus != PORT_INUSE) {
LOGW("ProcessStart warning (ProceedWithCarrier): port status is %d (expected INUSE).", portStatus);
}
+ LOGI("ProcessStart payload (ProceedWithCarrier): port=%u, cassetteId=%s, scanMap=%d, jobExistence0=%d, jobExistence1=%d, slotProcess=%d, anyScheduled=%d",
+ port + 1, pPort->getCassetteId().c_str(), scanMap,
+ (int)jobExistence[0], (int)jobExistence[1], (int)slotProcess, anyScheduled ? 1 : 0);
pPort->sendCassetteCtrlCmd(CCC_PROCESS_START, jobExistence, 12, slotProcess, jobCount, nullptr, nullptr);
return 0;
@@ -3112,12 +3381,51 @@
}
}
+ // 鍏堟竻绌烘墍鏈夌鍙ｇ幓鐠冪殑璋冨害鏍囪锛岄伩鍏嶆部鐢ㄥ巻鍙� PJ 鐘舵�併��
+ int clearedGlassCount = 0;
+ for (int i = 0; i < 4; i++) {
+ auto* pPort = (CLoadPort*)getEquipment(EQ_ID_LOADPORT1 + i);
+ if (pPort == nullptr) continue;
+ for (int slot = 1; slot <= SLOT_MAX; slot++) {
+ auto* pGlass = pPort->getGlassFromSlot(slot);
+ if (pGlass == nullptr) continue;
+ pGlass->setProcessJob(nullptr);
+ pGlass->setScheduledForProcessing(FALSE);
+ clearedGlassCount++;
+ }
+ }
+ LOGI("<Master>setProcessJobs: cleared scheduling marks on %d glass(es).", clearedGlassCount);
+
+ auto toPortIndex = [](int eqid) -> int {
+ switch (eqid) {
+ case EQ_ID_LOADPORT1: return 0;
+ case EQ_ID_LOADPORT2: return 1;
+ case EQ_ID_LOADPORT3: return 2;
+ case EQ_ID_LOADPORT4: return 3;
+ default: return -1;
+ }
+ };
+
+ auto hasAnySelectedPorts = [](const PJWarp& warp) -> bool {
+ for (int p = 0; p < 4; p++) {
+ if (warp.selectedPorts[p]) return true;
+ }
+ return false;
+ };
+
+ auto hasAnyLegacyCheckedSlots = [](const PJWarp& warp) -> bool {
+ for (int s = 0; s < 8; s++) {
+ if (warp.checkSlot[s]) return true;
+ }
+ return false;
+ };
// 鏇存柊context
for (auto pj : m_processJobs) {
for (auto& c : pj->carriers()) {
auto pPort = getPortWithCarrierId(c.carrierId);
if (pPort == nullptr) continue;
+ const int portIndex = toPortIndex(pPort->getID());
short downloadMap = 0;
for (auto s : c.slots) {
@@ -3129,12 +3437,37 @@
std::vector<uint8_t> newSlots;
std::vector<void*> newContexts;
+ PJWarp& warp = pj->getPjWarp();
+ const bool useMultiPortWarp = hasAnySelectedPorts(warp);
+ const bool useLegacyWarp = !useMultiPortWarp && hasAnyLegacyCheckedSlots(warp);
for (auto s : c.slots) {
auto pGlass = pPort->getGlassFromSlot(s);
if (pGlass == nullptr) continue;
newSlots.push_back(s);
newContexts.push_back(pGlass);
+
+ // 榛樿锛欻ost 涓嬪彂浣嗘湭鎼哄甫 PJWarp 缁嗚妭鏃讹紝carrier slots 瑙嗕负搴斿姞宸ャ��
+ BOOL scheduled = TRUE;
+ int material = (pGlass->getType() == MaterialsType::G2) ? 2 : 1;
+
+ if (1 <= s && s <= 8) {
+ if (useMultiPortWarp && 0 <= portIndex && portIndex < 4 && warp.selectedPorts[portIndex]) {
+ scheduled = warp.checkSlots[portIndex][s - 1];
+ material = warp.materialSlots[portIndex][s - 1];
+ }
+ else if (useLegacyWarp) {
+ scheduled = warp.checkSlot[s - 1];
+ material = warp.material[s - 1];
+ }
+ }
+ material = (material == 2) ? 2 : 1;
+
+ pGlass->setProcessJob(pj);
+ pGlass->setScheduledForProcessing(scheduled);
+ pGlass->setType(static_cast<MaterialsType>(material));
+ LOGI("<Master>setProcessJobs bind: pj=%s, port=%d, slot=%d, glass=%s, scheduled=%d, material=%d",
+ pj->id().c_str(), portIndex + 1, (int)s, pGlass->getID().c_str(), scheduled ? 1 : 0, material);
}
pj->setCarrierSlotsAndContexts(c.carrierId, newSlots, newContexts);
--
Gitblit v1.9.3