From 968ccc0dec80301f63483275981c06843f841850 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 02 九月 2025 08:42:21 +0800
Subject: [PATCH] 1.修复加工完成的料放回去，当Port变为LoadReady状态时仍被取走的问题； 2.Port下料配置，每一片的物料类型设置修复；
---
SourceCode/Bond/Servo/PortConfigurationDlg.cpp | 2 +-
SourceCode/Bond/Servo/CMaster.cpp | 6 ++++++
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CMaster.cpp b/SourceCode/Bond/Servo/CMaster.cpp
index f88f104..259991d 100644
--- a/SourceCode/Bond/Servo/CMaster.cpp
+++ b/SourceCode/Bond/Servo/CMaster.cpp
@@ -987,6 +987,12 @@
m_pActiveRobotTask = createTransferTask(pLoadPorts[s], pAligner, primaryType, secondaryType, m_bJobMode);
if (m_pActiveRobotTask != nullptr) {
CGlass* pGlass = (CGlass*)m_pActiveRobotTask->getContext();
+ if (pGlass->getBuddy() != nullptr) {
+ delete m_pActiveRobotTask;
+ m_pActiveRobotTask = nullptr;
+ continue;
+ }
+
pEFEM->setContext(pGlass);
pGlass->start();
bool bMoved = glassFromQueueToInPorcess(pGlass);
diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.cpp b/SourceCode/Bond/Servo/PortConfigurationDlg.cpp
index aa7179c..fba8bf8 100644
--- a/SourceCode/Bond/Servo/PortConfigurationDlg.cpp
+++ b/SourceCode/Bond/Servo/PortConfigurationDlg.cpp
@@ -342,7 +342,7 @@
CGridCellCombo* pCombo = dynamic_cast<CGridCellCombo*>(m_wndGrid.GetCell(i, 2));
ASSERT(pCheck && pCombo);
pGlass->setScheduledForProcessing(pCheck->GetCheck());
- /*pGlass->setType(static_cast<SERVO::MaterialsType>(config.nMaterialType));*/
+ pGlass->setType(static_cast<SERVO::MaterialsType>(nMaterialType));
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
pJobDataS->setLotId(config.strLotID.c_str());
--
Gitblit v1.9.3