From e9c66dce803984d9eb0c026df8f50ad196fd0650 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 22 七月 2025 16:20:25 +0800
Subject: [PATCH] 1.将原来的设置CassetteType更新到EFEM的功能，修改为本地保存，因为EFEM不需要这些数据； 2.配置是否需要比较map的一致性； 3.收到EFEM的PortStarus，INUSE状态时，弹出配置对话框；打勾选择要加工的产品；
---
SourceCode/Bond/Servo/CArm.cpp | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CArm.cpp b/SourceCode/Bond/Servo/CArm.cpp
index 7ca9be1..c257753 100644
--- a/SourceCode/Bond/Servo/CArm.cpp
+++ b/SourceCode/Bond/Servo/CArm.cpp
@@ -102,4 +102,33 @@
return 0;
}
+
+ int CArm::glassUpdateJobDataS(CJobDataS* pJobDataS)
+ {
+ ASSERT(pJobDataS);
+
+ Lock();
+ CGlass* pGlass = (CGlass*)m_slot[0].getContext();
+ if (pGlass == nullptr) {
+ Unlock();
+ LOGE("<CArm>glassUpdateJobDataS失败，找不到对应的Glass");
+ return -1;
+ }
+
+ CJobDataS* pSrcJs = pGlass->getJobDataS();
+ if (pSrcJs->getCassetteSequenceNo() != pJobDataS->getCassetteSequenceNo()
+ || pSrcJs->getJobSequenceNo() != pJobDataS->getJobSequenceNo()) {
+ Unlock();
+ LOGE("<CArm>glassUpdateJobDataS失败，CassetteNo不匹配([%d,%d] != [%d,%d])",
+ pSrcJs->getCassetteSequenceNo(),
+ pJobDataS->getCassetteSequenceNo(),
+ pSrcJs->getJobSequenceNo(),
+ pJobDataS->getJobSequenceNo());
+ return -2;
+ }
+
+ pGlass->updateJobDataS(pJobDataS);
+ Unlock();
+ return 0;
+ }
}
--
Gitblit v1.9.3