From 81d64c0584be86ad7255ddfe7ee24be905fc67f1 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 23 六月 2025 14:57:59 +0800
Subject: [PATCH] 1. 在配置文件中添加设备名称 2. 配方绑定界面显示需要的设备ID和设备名称
---
SourceCode/Bond/Servo/CPageGraph2.cpp | 25 ++++++++++---------------
1 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageGraph2.cpp b/SourceCode/Bond/Servo/CPageGraph2.cpp
index 380852e..b89c7d5 100644
--- a/SourceCode/Bond/Servo/CPageGraph2.cpp
+++ b/SourceCode/Bond/Servo/CPageGraph2.cpp
@@ -213,47 +213,42 @@
BOOL bTestGenerate = FALSE;
SERVO::CEquipment* pEquipment = (SERVO::CEquipment*)pItem->pData;
if (pEquipment->getID() == EQ_ID_LOADPORT4 && !pEquipment->hasGlass()) {
- ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G1,
- "P20250320G1X", 1);
+ ((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);
+ else if (pEquipment->getID() == EQ_ID_LOADPORT1 && !pEquipment->hasGlass()) {
+ ((SERVO::CLoadPort*)pEquipment)->testGenerateGlassList(SERVO::MaterialsType::G2);
bTestGenerate = TRUE;
}
*/
if (!bTestGenerate) {
- /*
SERVO::CRobotTask* pTask = theApp.m_model.getMaster().getActiveRobotTask();
if (pTask != nullptr) {
SERVO::CGlass* pGlass = (SERVO::CGlass*)pTask->getContext();
- SERVO::CJobDataB* pJobDataB = pGlass->getJobDataB();
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
- if (pJobDataB != nullptr && pJobDataS != nullptr) {
- pEquipment->onFetchedOutJob(0, pJobDataB);
+ if (pJobDataS != nullptr) {
+ SERVO::CJobDataB jobDataB;
+ pEquipment->onFetchedOutJob(0, &pJobDataS->getJobDataB(jobDataB));
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();
SERVO::CJobDataS* pJobDataS = pGlass->getJobDataS();
- if (pJobDataB != nullptr && pJobDataS != nullptr) {
+ if (pJobDataS != nullptr) {
pEquipment->onReceivedJob(0, pJobDataS);
Sleep(600);
- pEquipment->onStoredJob(0, pJobDataB);
+ SERVO::CJobDataB jobDataB;
+ pEquipment->onStoredJob(0, &pJobDataS->getJobDataB(jobDataB));
}
- }*/
+ }
}
}
else if (nCmd == ID_EQSGRAPHITEM_TEST3) {
--
Gitblit v1.9.3