From 43cd50ae5629f8e18c349fe5e9a58aac298df9f2 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 06 二月 2026 16:58:32 +0800
Subject: [PATCH] 1.修复一个判断逻辑问题；
---
SourceCode/Bond/Servo/CEquipment.cpp | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 4d39fbb..88f93ac 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -934,9 +934,13 @@
}
}
if (pContext == nullptr) {
+ LOGE("<CEquipment-%s>fetchedOutJob, no glass for JobDataB(%d, %d)", m_strName.c_str(),
+ pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
Unlock();
return -3;
}
+ LOGI("<CEquipment-%s>fetchedOutJob -> Arm: GlassId:%s, Cassette:%d, Job:%d", m_strName.c_str(),
+ pContext->getID().c_str(), pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
((CArm*)m_pArm)->tempStore(pContext);
pContext->release();
@@ -962,11 +966,14 @@
CGlass* pGlass = nullptr;
if (((CArm*)m_pArm)->tempFetchOut(pGlass) != 0) {
+ LOGE("<CEquipment-%s>storedJob, tempFetchOut failed (arm empty).", m_strName.c_str());
return -2;
}
ASSERT(pGlass);
+ LOGI("<CEquipment-%s>storedJob <- Arm: GlassId:%s, Cassette:%d, Job:%d", m_strName.c_str(),
+ pGlass->getID().c_str(), pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
Lock();
pGlass->addPath(m_nID, getSlotUnit(putSlot), putSlot);
CGlass* pBuddy = pGlass->getBuddy();
@@ -2109,31 +2116,24 @@
// 褰撳墠瑕佸瓨鐗囷紝涔嬪墠鑲畾鏈夋嫈鐗囷紝鍥犳鐗囧瓙鍦ˋrm閭ｉ噷
CGlass* pGlass = ((CArm*)m_pArm)->getGlassFromSlot(1);
if (pGlass == nullptr) {
- LOGE("<CFliper-%s>onPreStoredJob,缂撳瓨涓病鏈夋壘鍒板搴旂殑Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)锛岃妫�鏌ユ暟鎹紝娉ㄦ剰椋庨櫓銆�", m_strName.c_str(),
+ LOGE("<CEquipment-%s>onPreStoredJob,缂撳瓨涓病鏈夋壘鍒板搴旂殑Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)锛岃妫�鏌ユ暟鎹紝娉ㄦ剰椋庨櫓銆�", m_strName.c_str(),
pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+ LOGE("<CEquipment-%s>onPreStoredJob, arm temp empty (arm:%s).", m_strName.c_str(),
+ (m_pArm != nullptr) ? ((CEquipment*)m_pArm)->getName().c_str() : "null");
return FALSE;
}
CJobDataS* pJobDataS = pGlass->getJobDataS();
ASSERT(pJobDataS);
+ LOGI("<CEquipment-%s>onPreStoredJob, Arm has GlassId:%s, Cassette:%d, Job:%d",
+ m_strName.c_str(), pGlass->getID().c_str(),
+ pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
if (!compareJobData(pJobDataB, pJobDataS)) {
LOGE("<CEquipemnt-%s>onPreStoredJob,JobData鏁版嵁涓嶅尮閰�(JobDataB(%d, %d),JobDataS(%d, %d)), 娉ㄦ剰鎺掓煡椋庨櫓!", m_strName.c_str(),
pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
return FALSE;
}
-
- // 濡傛灉娌℃湁鍙敤浣嶇疆锛屾姤閿�
- Lock();
- CSlot* pSlot = getSlot(putSlot - 1);
- ASSERT(pSlot);
- if (pSlot->getContext() != nullptr) {
- Unlock();
- LOGE("<CEquipemnt-%s>onPreStoredJob,鎸囧畾slot(port:%d)鏈夋枡锛岃娉ㄦ剰椋庨櫓锛�", m_strName.c_str(), port);
- return FALSE;
- }
- Unlock();
-
if (m_listener.onPreStoredJob != nullptr) {
if (!m_listener.onPreStoredJob(this, port, pJobDataB, putSlot)) {
@@ -2144,6 +2144,21 @@
return FALSE;
}
}
+
+ // 濡傛灉娌℃湁鍙敤浣嶇疆锛屾姤閿欙紙闇�鍦� listener 鍥炶皟鍚庢嬁鍒� putSlot锛�
+ if (putSlot <= 0) {
+ LOGE("<CEquipemnt-%s>onPreStoredJob, putSlot鏃犳晥(port:%d).", m_strName.c_str(), port);
+ return FALSE;
+ }
+ Lock();
+ CSlot* pSlot = getSlot(putSlot - 1);
+ ASSERT(pSlot);
+ if (pSlot->getContext() != nullptr) {
+ Unlock();
+ LOGE("<CEquipemnt-%s>onPreStoredJob,鎸囧畾slot(port:%d)鏈夋枡锛岃娉ㄦ剰椋庨櫓锛�", m_strName.c_str(), port);
+ return FALSE;
+ }
+ Unlock();
return TRUE;
}
@@ -2299,6 +2314,14 @@
}
}
+ PROCESS_STATE CEquipment::getProcessState(int slotNo) const
+ {
+ if (slotNo <= 0 || slotNo > SLOT_MAX) {
+ return PROCESS_STATE::Ready;
+ }
+ return m_processState[slotNo - 1];
+ }
+
std::vector<SERVO::CSVData>& CEquipment::getSVDatas()
{
return m_svDatas;
--
Gitblit v1.9.3