From 349f26accd28cd83356334239b11728ce50b7f95 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 14 五月 2025 18:10:21 +0800
Subject: [PATCH] 1.重新理顺Glass的流转，CJobDataB, CJobDataS在CEquipment的列表存储等；
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index cc44782..e8493da 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -10,6 +10,7 @@
#include "CEquipmentPage2.h"
#include "CPagePortProperty.h"
#include "CPageCassetteCtrlCmd.h"
+#include "CJobDataB.h"
// CPageGraph2 瀵硅瘽妗�
@@ -191,13 +192,38 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment->getID() == EQ_ID_LOADPORT1) {
- pEquipment->outputGlass(1);
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1, 10,
+ "P20250320G1X", 1);
}
- pEquipment->fetchedOutJob("P20250320A1A2");
+ else if (pEquipment->getID() == EQ_ID_LOADPORT2) {
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2, 10,
+ "P20250320G2X", 1);
+ }
+ SERVO::CGlass* pGlass = pEquipment->getFrontGlass();
+ if (pGlass != nullptr) {
+ SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
+ SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+ if (pJobDataB != nullptr && pJobDataS != nullptr) {
+ pEquipment->fetchedOutJob(pJobDataB);
+ pEquipment->onSentOutJob(0, pJobDataS);
+ }
+ }
}
else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- pEquipment->storedJob("P20250320A1A2");
+ SERVO::CArm* pArm = (SERVO::CArm*)pEquipment->getArm();
+ if (pArm != nullptr) {
+ SERVO::CGlass* pGlass = pArm->getFrontGlass();
+ if (pGlass != nullptr) {
+ SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
+ SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
+ if (pJobDataB != nullptr && pJobDataS != nullptr) {
+ pEquipment->onReceivedJob(0, pJobDataS);
+ Sleep(600);
+ pEquipment->onStoredJob(0, pJobDataB);
+ }
+ }
+ }
}
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
--
Gitblit v1.9.3