From a79fcf6a937e1bfe57014d2c99f1bb9f98bfa892 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期二, 10 二月 2026 10:20:17 +0800
Subject: [PATCH] 1.完善日志； 2.背景图表配置 3.更改EAP通讯端口和设备名；
---
SourceCode/Bond/Servo/CEquipment.cpp | 105 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 92 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 2cddb34..c0d4998 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -208,6 +208,21 @@
return m_strDescription;
}
+ void CEquipment::setCurrentRecipe(const std::string& recipe)
+ {
+ Lock();
+ m_currentRecipe = recipe;
+ Unlock();
+ }
+
+ std::string CEquipment::getCurrentRecipe()
+ {
+ Lock();
+ std::string out = m_currentRecipe;
+ Unlock();
+ return out;
+ }
+
void CEquipment::setStation(int network, int station)
{
m_station.nNetNo = network;
@@ -764,6 +779,16 @@
return 1;
}
+ else if (pStep->getName().compare(STEP_STATUS) == 0) {
+ SERVO::CEqStatusStep* pEqStatusStep = (SERVO::CEqStatusStep*)pStep;
+ if (m_listener.onEqStatusChanged != nullptr) {
+ const unsigned int unitId = pEqStatusStep->getUnitId();
+ const int status = pEqStatusStep->getStatus(unitId);
+ const int reason = pEqStatusStep->getReasonCode(unitId);
+ m_listener.onEqStatusChanged(this, (int)unitId, status, reason);
+ }
+ return 1;
+ }
else if (isCimMessageConfirmStep(pStep)) {
SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
int value = pEqReadIntStep->getValue();
@@ -902,6 +927,27 @@
for (int i = 0; i < SLOT_MAX; i++) {
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (pGlass != nullptr && compareJobData(pJobDataB, pGlass->getJobDataS())) {
+ // 鍙栫墖鎴愬姛鍚庯紝鍥炲～褰撳墠璺緞鑺傜偣鐨勭寮�鏃堕棿锛堜紭鍏堝尮閰嶅皻鏈寮�鐨勮妭鐐癸級銆�
+ CPath* pPath = pGlass->getPath();
+ if (pPath != nullptr) {
+ CPath* pScan = pPath->getHeadPath();
+ CPath* pOpenNode = nullptr;
+ const unsigned int slotNo = (unsigned int)m_slot[i].getNo();
+ const unsigned int unitNo = getSlotUnit((int)slotNo);
+ while (pScan != nullptr) {
+ if (pScan->getEqID() == m_nID
+ && pScan->getUnit() == unitNo
+ && pScan->getSlot() == slotNo
+ && pScan->getOutTime() == 0) {
+ pOpenNode = pScan;
+ }
+ pScan = pScan->getNext();
+ }
+ if (pOpenNode != nullptr) {
+ pOpenNode->setOutTime(CToolUnits::getTimestamp());
+ }
+ }
+
pContext = pGlass;
if (pGlass != nullptr) pGlass->addRef();
m_slot[i].setContext(nullptr);
@@ -909,9 +955,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();
@@ -937,11 +987,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();
@@ -1655,6 +1708,10 @@
m_strName.c_str(), nRet);
}
+ if (m_listener.onReceivedJob != nullptr) {
+ m_listener.onReceivedJob(this, port, pJobDataS);
+ }
+
return nRet;
}
@@ -1676,6 +1733,10 @@
int CEquipment::onSentOutJob(int port, CJobDataS* pJobDataS)
{
LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
+
+ if (m_listener.onSentOutJob != nullptr) {
+ m_listener.onSentOutJob(this, port, pJobDataS);
+ }
return 0;
}
@@ -1870,7 +1931,9 @@
CSVData svData;
int nRet = svData.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
+ Lock();
m_svDatas.push_back(svData);
+ Unlock();
if (m_listener.onSVDataReport != nullptr) {
m_listener.onSVDataReport(this, &svData);
@@ -2074,31 +2137,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)) {
@@ -2109,6 +2165,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;
}
@@ -2264,6 +2335,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