From a1bf060d50da3c27b54bcc349e8b53769b39ef89 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 03 六月 2025 17:31:33 +0800
Subject: [PATCH] 1.增加Aligner --> Bonder1 | Bonder2的搬送检测逻辑； 2.优化搬送逻辑。搬送要分优先考虑的主类型和次要类型。一种情况，如果不分主次，一直搬G1, 等到Bonder1和Bonder2都放了G1, Aligner也放了G1, Bonder1和Bonder2需要的G2就过不来了（在Aligner阻塞了）。另外从生产效率上来说，也应该根据需求，尽快使其中一台Bonder的两片玻璃匹配以使其能尽快开始生产加工。
---
SourceCode/Bond/Servo/CEquipmentPage2.cpp | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage2.cpp b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
index 3bffbe7..f566568 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage2.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage2.cpp
@@ -80,18 +80,17 @@
ASSERT(m_pEquipment);
- std::list<SERVO::CGlass*> list;
- m_pEquipment->getGlassList(list);
- for (auto item : list) {
- item->addRef();
- item->release(); // 閲婃斁list涓殑寮曠敤
-
- SERVO::CGlass* pBuddy = item->getBuddy();
- int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
- m_listCtrl.SetItemData(index, (DWORD_PTR)item);
- m_listCtrl.SetItemText(index, 1, item->getID().c_str());
- if (pBuddy != nullptr) {
- m_listCtrl.SetItemText(index, 2, pBuddy->getID().c_str());
+ for (int i = 0; i < SLOT_MAX; i++) {
+ SERVO::CGlass* pGlass = m_pEquipment->getGlassFromSlot(i+1);
+ if (pGlass != nullptr) {
+ pGlass->addRef();
+ SERVO::CGlass* pBuddy = pGlass->getBuddy();
+ int index = m_listCtrl.InsertItem(m_listCtrl.GetItemCount(), _T(""));
+ m_listCtrl.SetItemData(index, (DWORD_PTR)pGlass);
+ m_listCtrl.SetItemText(index, 1, pGlass->getID().c_str());
+ if (pBuddy != nullptr) {
+ m_listCtrl.SetItemText(index, 2, pBuddy->getID().c_str());
+ }
}
}
@@ -172,6 +171,7 @@
void CEquipmentPage2::OnBnClickedButtonRemove()
{
+ /*
int index = GetSelectedItemIndex();
if (index >= 0) {
SERVO::CGlass* pGlass = (SERVO::CGlass*)m_listCtrl.GetItemData(index);
@@ -182,4 +182,5 @@
m_listCtrl.DeleteItem(index);
}
}
+ */
}
--
Gitblit v1.9.3