From 0a0b065a898ea5d87ae82bf39a745e76337fc8f5 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 10 九月 2025 15:19:16 +0800
Subject: [PATCH] 1.一些输出日志信息，更新等级； 2.CPath增加Slot信息； 3.WIP数据显示到列表控件； 4.调整Glass的Path信息文本输出；
---
SourceCode/Bond/Servo/CEquipment.cpp | 48 ++++++++++++++++++++++++++++++++----------------
1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 2cbf62f..e390343 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -839,7 +839,7 @@
CEquipment* pFromEq = pFromPin->getEquipment();
ASSERT(pFromEq);
- LOGI("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
+ LOGD("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
this->getName().c_str(),
pPin->getName().c_str(),
pFromEq->getName().c_str(),
@@ -916,7 +916,7 @@
ASSERT(pGlass);
Lock();
- pGlass->addPath(m_nID, getSlotUnit(putSlot));
+ pGlass->addPath(m_nID, getSlotUnit(putSlot), putSlot);
m_slot[putSlot - 1].setContext(pGlass);
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
@@ -990,6 +990,22 @@
return nullptr;
+ }
+
+ int CEquipment::getAllGlass(std::vector<CGlass*>& glasses)
+ {
+ Lock();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr) {
+ pGlass->addRef();
+ glasses.push_back(pGlass);
+ }
+ }
+ Unlock();
+
+ return (int)glasses.size();
}
CJobDataS* CEquipment::getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo)
@@ -1138,7 +1154,7 @@
LOGI("<CEquipment-%s>设置DispatchingMode成功.", m_strName.c_str());
}
else {
- LOGI("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
}
return 0;
@@ -1168,7 +1184,7 @@
LOGI("<CEquipment-%s>返回值: %d", m_strName.c_str(), retCode);
}
else {
- LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
}
if (onWritedRetBlock != nullptr) {
@@ -1199,7 +1215,7 @@
}
else {
m_recipesManager.syncFailed();
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败，code:%d", m_strName.c_str(), unitNo, code);
+ LOGE("<CEquipment-%s>请求单元<%d>主配方列表失败，code:%d", m_strName.c_str(), unitNo, code);
}
return 0;
@@ -1234,7 +1250,7 @@
}
else {
m_recipesManager.syncFailed();
- LOGI("<CEquipment-%s>请求单元<%d>主配方参数列表失败，code:%d", m_strName.c_str(), unitNo, code);
+ LOGE("<CEquipment-%s>请求单元<%d>主配方参数列表失败，code:%d", m_strName.c_str(), unitNo, code);
}
return 0;
@@ -1358,32 +1374,32 @@
CSlot* CEquipment::getProcessedSlot(MaterialsType putSlotType, BOOL bJobMode/* = FALSE*/)
{
for (int i = 0; i < SLOT_MAX; i++) {
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 001");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 001");
if (!m_slot[i].isEnable()) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 002");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 002");
if (m_slot[i].isLock()) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 003");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 003");
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (!isSlotProcessed(i)) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 004");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 004");
if (pGlass == nullptr) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 005");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 005");
if (!pGlass->isScheduledForProcessing()) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 006");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 006");
if (bJobMode && pGlass->getProcessJob() == nullptr) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 007");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 007");
if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) continue;
int lsPath = m_slot[i].getLinkSignalPath();
if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE] ) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 008");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 008");
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 009");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 009");
if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
- if (m_nTestFlag == 1) LOGI("getProcessedSlot 00a");
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 00a");
return &m_slot[i];
}
--
Gitblit v1.9.3