From d24917a7422efa5aa1d3cff2ef70ad754cebaedf Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 19 六月 2025 11:31:00 +0800
Subject: [PATCH] 1.生成玻璃的JobDataS数据，采用新的JobNo等id
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 56 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 48 insertions(+), 8 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index d2a356e..8c9050c 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -9,6 +9,7 @@
#include "CEquipmentPage1.h"
#include "CEquipmentPage2.h"
#include "CEquipmentPage3.h"
+#include "CPageLinkSignal.h"
#include "CPagePortProperty.h"
#include "CPagePortStatus.h"
#include "CPageCassetteCtrlCmd.h"
@@ -128,9 +129,9 @@
CHMPropertyDlg dlg(pEquipment->getName().c_str(), 658, 788);
- CEquipmentPage1* pPage1 = new CEquipmentPage1();
+ CPageLinkSignal* pPage1 = new CPageLinkSignal();
pPage1->setEquipment(pEquipment);
- pPage1->Create(IDD_PAGE_EQUIPMENT1);
+ pPage1->Create(IDD_PAGE_LINK_SIGNAL);
dlg.addPage(pPage1, "Link Signal");
if (_strcmpi(pEquipment->getClassName(), "CLoadPort") == 0) {
@@ -148,7 +149,7 @@
CEquipmentPage2* pPage2 = new CEquipmentPage2();
pPage2->setEquipment(pEquipment);
pPage2->Create(IDD_PAGE_EQUIPMENT2);
- dlg.addPage(pPage2, "Glass");
+ dlg.addPage(pPage2, "Slots");
if (pEquipment->getID() == EQ_ID_EFEM) {
CEquipmentPage3* pPage3 = new CEquipmentPage3();
@@ -211,18 +212,19 @@
else if (nCmd == ID_EQSGRAPHITEM_TEST1) {
BOOL bTestGenerate = FALSE;
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
- if (pEquipment->getID() == EQ_ID_LOADPORT1 && !pEquipment->hasGlass()) {
- ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1,
- "P20250320G1X", 1);
+ if (pEquipment->getID() == EQ_ID_LOADPORT4 && !pEquipment->hasGlass()) {
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1);
bTestGenerate = TRUE;
}
+ /*
else if (pEquipment->getID() == EQ_ID_LOADPORT2 && !pEquipment->hasGlass()) {
((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2,
"P20250320G2X", 1);
bTestGenerate = TRUE;
}
-
+ */
if (!bTestGenerate) {
+ /*
SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
if (pTask != nullptr) {
SERVO::CGlass* pGlass = (SERVO::CGlass*)pTask->getContext();
@@ -233,12 +235,14 @@
pEquipment->onSentOutJob(0, pJobDataS);
}
}
+ */
}
}
else if (nCmd == ID_EQSGRAPHITEM_TEST2) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
SERVO::CArm* pArm = (SERVO::CArm*)pEquipment->getArm();
if (pArm != nullptr) {
+ /*
SERVO::CGlass* pGlass = pArm->getAnyGlass();
if (pGlass != nullptr) {
SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
@@ -248,7 +252,7 @@
Sleep(600);
pEquipment->onStoredJob(0, pJobDataB);
}
- }
+ }*/
}
}
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
@@ -264,6 +268,42 @@
}
else if (nCmd == ID_EQSGRAPHITEM_TEST4) {
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+ if (pEquipment != nullptr) {
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, FALSE);
+ pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, FALSE);
+ pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, TRUE);
+ }
+
+ if (pEquipment != nullptr && (pEquipment->getID() == EQ_ID_Bonder1
+ || pEquipment->getID() == EQ_ID_Bonder2)) {
+ SERVO::CGlass* pGlass = pEquipment->getAnyGlass();
+ if (pGlass != nullptr) {
+ SERVO::CProcessData pd;
+ pd.setGlassId(pGlass->getID().c_str());
+ pEquipment->onProcessData(&pd);
+ }
+ }
+ }
+ else if (nCmd == ID_EQSGRAPHITEM_TEST5) {
+ SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
+ if (pEquipment != nullptr) {
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_UPSTREAM_TROUBLE, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(0, SIGNAL_SEND_ABLE, FALSE);
+ pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_INLINE, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_UPSTREAM_TROUBLE, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_INTERLOCK, TRUE);
+ pEquipment->setLinkSignal(1, SIGNAL_SEND_ABLE, FALSE);
+ }
+ }
+ else if (nCmd == ID_EQSGRAPHITEM_TEST6) {
+ SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
// 娴嬭瘯涓嬪彂Cim Message
--
Gitblit v1.9.3