From be01318968aed5e55c511eedc6c1f72a961c3f13 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 19 六月 2025 14:49:02 +0800
Subject: [PATCH] 1.重新梳理JobDataS的传递和更新；
---
SourceCode/Bond/Servo/CEquipment.cpp | 203 +++++++++++++++++++-------------------------------
1 files changed, 78 insertions(+), 125 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index d380f13..165199a 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -791,7 +791,7 @@
CGlass* pContext = nullptr;
for (int i = 0; i < SLOT_MAX; i++) {
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
- if (pGlass != nullptr && compareJobDataB(pJobDataB, pGlass->getJobDataB())) {
+ if (pGlass != nullptr && compareJobData(pJobDataB, pGlass->getJobDataS())) {
pContext = pGlass;
if (pGlass != nullptr) pGlass->addRef();
m_slot[i].setContext(nullptr);
@@ -1012,30 +1012,34 @@
return 0;
}
- int CEquipment::indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock/* = nullptr*/)
+ int CEquipment::indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITEDRET onWritedRetBlock)
{
- SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EFEM_IN_OP_MODE_CHANGE);
+ SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_IN_OP_MODE_CHANGE);
if (pStep == nullptr) {
return -1;
}
unsigned short operationMode = (unsigned short)((unsigned short)mode + getIndexerOperationModeBaseValue());
LOGI("<CEquipment-%s>准备设置indexerOperationMode<%d>", m_strName.c_str(), (int)mode);
- if (onWritedBlock != nullptr) {
- pStep->writeShort(operationMode, onWritedBlock);
- }
- else {
- pStep->writeShort(operationMode, [&, mode](int code) -> int {
- if (code == WOK) {
- LOGI("<CEquipment-%s>设置indexerOperationMode成功.", m_strName.c_str());
- }
- else {
- LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
- }
+ pStep->writeShort(operationMode, [&, mode, onWritedRetBlock](int code) -> int {
+ int retCode = 0;
+ if (code == WOK) {
+ LOGI("<CEquipment-%s>设置indexerOperationMode成功.", m_strName.c_str());
+ const char* pszRetData = nullptr;
+ pStep->getReturnData(pszRetData);
+ ASSERT(pszRetData);
+ retCode = (unsigned int)CToolUnits::toInt16(pszRetData);
+ }
+ else {
+ LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
+ }
- return 0;
- });
- }
+ if (onWritedRetBlock != nullptr) {
+ onWritedRetBlock(code, retCode);
+ }
+
+ return 0;
+ });
return 0;
}
@@ -1318,8 +1322,6 @@
int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
{
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
-
- addJobDataS(pJobDataS);
return 0;
}
@@ -1336,7 +1338,7 @@
pStep->addAttributeVector(attrubutes);
- onReceivedJob(port, &jobDataS);
+ onSentOutJob(port, &jobDataS);
return nRet;
}
@@ -1345,13 +1347,16 @@
{
LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
- int count = removeJobDataS(pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
- if (count == 1) {
- LOGI("<CEquipment-%s>onSentOutJob,删除数据 %d 条", m_strName.c_str(), count);
+
+ // 可以在此更新JobDataS数据了
+ CGlass* pGlass = getGlass(pJobDataS->getGlass1Id().c_str());
+ 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;
}
- else {
- LOGE("<CEquipment-%s>onSentOutJob,删除数据 %d 条，注意排查风险", m_strName.c_str(), count);
- }
+ pGlass->updateJobDataS(pJobDataS);
return 0;
}
@@ -1539,15 +1544,54 @@
return 0;
}
+ int CEquipment::decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size)
+ {
+ int index = 0;
+ short cassetteSequenceNo, jobSequenceNo;
+ memcpy(&cassetteSequenceNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+
+
+ // efme， 获取数据后返回
+ // Cassette Sequence No 1W
+ // Job Sequence No 1W
+ // Job DataS 256W
+
+
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("CassetteSequenceNo",
+ (std::to_string(cassetteSequenceNo)).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("JobSequenceNo",
+ (std::to_string(jobSequenceNo)).c_str(), "", weight++));
+
+
+ return 0;
+ }
+
int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB, short& putSlot)
{
LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
- CJobDataS* pJobDataS = getJobDataS(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
- if (pJobDataS == nullptr) {
- LOGE("<CFliper-%s>onPreFetchedOutJob,找不到对应的JobDataS(CassetteSequenceNo:%d, JobSequenceNo:%d), 注意排查风险!", m_strName.c_str(),
+ // 当前要存片，之前肯定有拔片，因此片子在Arm那里
+ CGlass* pGlass = ((CArm*)m_pArm)->getGlassFromSlot(1);
+ if (pGlass == nullptr) {
+ LOGE("<CFliper-%s>onPreStoredJob,缓存中没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)，请检查数据，注意风险。", m_strName.c_str(),
pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+ return FALSE;
+ }
+
+ CJobDataS* pJobDataS = pGlass->getJobDataS();
+ ASSERT(pJobDataS);
+ if (!compareJobData(pJobDataB, pJobDataS)) {
+ LOGE("<CFliper-%s>onPreFetchedOutJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
+ pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
+ pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
return FALSE;
}
@@ -1583,7 +1627,6 @@
short putSlot = 0;
BOOL bCheck = onPreStoredJob(port, pJobDataB, putSlot);
if (bCheck) {
- addJobDataB(pJobDataB);
return storedJob(pJobDataB, putSlot);
}
@@ -1625,104 +1668,14 @@
return 0;
}
- int CEquipment::addJobDataB(CJobDataB* pJobDataB)
+ BOOL CEquipment::compareJobData(CJobDataB* pJobDataB, CJobDataS* pJobDataS)
{
- // 添加之前先删除旧的，以免数据重复
- Lock();
- int count = removeJobDataB(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
- if (count > 0) {
- LOGE("<CEquipment-%s>addJobDataB,删除重复数据 %d 条，注意排查风险", m_strName.c_str(), count);
- }
+ ASSERT(pJobDataB);
+ ASSERT(pJobDataS);
- m_listJobDataB.push_back(std::move(*pJobDataB));
- Unlock();
-
- return (int)m_listJobDataB.size();
- }
-
- int CEquipment::removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo)
- {
- int count = 0;
- for (auto it = m_listJobDataB.begin(); it != m_listJobDataB.end(); ) {
- if ((*it).getCassetteSequenceNo() == nCassetteSequenceNo
- && (*it).getJobSequenceNo() == nJobSequenceNo) {
- it = m_listJobDataB.erase(it);
- count++;
- }
- else {
- ++it;
- }
- }
-
- return count;
- }
-
- CJobDataB* CEquipment::getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo)
- {
- for (auto& item : m_listJobDataB) {
- if (item.getCassetteSequenceNo() == nCassetteSequenceNo
- && item.getJobSequenceNo() == nJobSequenceNo) {
- return &item;
- }
- }
-
- return nullptr;
- }
-
- int CEquipment::addJobDataS(CJobDataS* pJobDataS)
- {
- // 添加之前先删除旧的，以免数据重复
- Lock();
- int count = removeJobDataS(pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
- if (count > 0) {
- LOGE("<CEquipment-%s>addJobDataS,删除重复数据 %d 条，注意排查风险", m_strName.c_str(), count);
- }
-
- m_listJobDataS.push_back(std::move(*pJobDataS));
- Unlock();
-
- return (int)m_listJobDataB.size();
- }
-
- int CEquipment::removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo)
- {
- int count = 0;
- Lock();
- for (auto it = m_listJobDataS.begin(); it != m_listJobDataS.end(); ) {
- if ((*it).getCassetteSequenceNo() == nCassetteSequenceNo
- && (*it).getJobSequenceNo() == nJobSequenceNo) {
- it = m_listJobDataS.erase(it);
- count++;
- }
- else {
- ++it;
- }
- }
- Unlock();
-
- return count;
- }
-
- CJobDataS* CEquipment::getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo)
- {
- for (auto& item : m_listJobDataS) {
- if (item.getCassetteSequenceNo() == nCassetteSequenceNo
- && item.getJobSequenceNo() == nJobSequenceNo) {
- return &item;
- }
- }
-
- return nullptr;
- }
-
- BOOL CEquipment::compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2)
- {
- ASSERT(pJobDataB1);
- ASSERT(pJobDataB2);
-
- if (pJobDataB1->getCassetteSequenceNo() != pJobDataB2->getCassetteSequenceNo())
+ if (pJobDataB->getCassetteSequenceNo() != pJobDataS->getCassetteSequenceNo())
return FALSE;
- if (pJobDataB1->getJobSequenceNo() != pJobDataB2->getJobSequenceNo())
+ if (pJobDataB->getJobSequenceNo() != pJobDataS->getJobSequenceNo())
return FALSE;
return TRUE;
--
Gitblit v1.9.3