From 8de338246a5c70210077ce1162e926cef5f39c70 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 25 三月 2025 17:09:16 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CLoadPort.cpp | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/CLoadPort.cpp b/SourceCode/Bond/Servo/CLoadPort.cpp
index 079b3f2..b881e5a 100644
--- a/SourceCode/Bond/Servo/CLoadPort.cpp
+++ b/SourceCode/Bond/Servo/CLoadPort.cpp
@@ -62,18 +62,28 @@
int CLoadPort::outputGlass(int port)
{
// 如果列表中没有Panel,模拟生成10张
- if (m_panelList.empty()) {
+ if (m_glassList.empty()) {
static int ii = 0;
char szBuffer[64];
LOGI("<CLoadPort>模拟生成10张PANEL");
for (int i = 0; i < 10; i++) {
sprintf_s(szBuffer, "P20250320A1A%d", ++ii);
- CPanel* pPanel = new CPanel();
- pPanel->setID(szBuffer);
- addPanelToList(pPanel);
+ CGlass* pGlass = new CGlass();
+ pGlass->setID(szBuffer);
+ addGlassToList(pGlass);
}
}
return __super::outputGlass(port);
}
+
+ BOOL CLoadPort::glassWillArrive(CGlass* pGlass)
+ {
+ BOOL bRet = __super::glassWillArrive(pGlass);
+ if (!bRet) {
+ return FALSE;
+ }
+
+ return (m_glassList.size() < 8);
+ }
}
--
Gitblit v1.9.3