From aabaff9cdcf9bb279b762891aedda5a03571fbb5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 01 七月 2025 08:55:07 +0800
Subject: [PATCH] 1.修改Glass的JobDataS的更新逻辑，在收到OnReceiveJob时，机器内未保存和管理Glass, 此时Glass在Arm上，应通过Arm来更新JobDataS；
---
SourceCode/Bond/Servo/CEquipment.cpp | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index c7cc0db..817f4bc 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1439,17 +1439,15 @@
{
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
- // 可以在此更新JobDataS数据了
- CGlass* pGlass = getGlassFromSlot(port);
- if (pGlass == nullptr) {
- LOGE("<CEquipment-%s>onSentOutJob,没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d, ID=%s)，请检查数据，注意风险。",
- m_strName.c_str(), pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo(),
- pJobDataS->getGlass1Id().c_str());
- return -1;
- }
- pGlass->updateJobDataS(pJobDataS);
- return 0;
+ // 可以在此更新JobDataS数据了
+ int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
+ if (nRet < 0) {
+ LOGE("<CEquipment-%s>onReceivedJob,更新JobDataS失败，glassUpdateJobDataS返回%d",
+ m_strName.c_str(), nRet);
+ }
+
+ return nRet;
}
int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
--
Gitblit v1.9.3