From c743df7d475735b26395c6ed5c17b4be2d972be2 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期三, 28 五月 2025 16:21:12 +0800
Subject: [PATCH] 1.初步去掉GlassList, 替换为Slot,待测；
---
SourceCode/Bond/Servo/CEquipment.cpp | 312 ++++++++++++++++++---------------------------------
1 files changed, 113 insertions(+), 199 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index d8cad41..edd9ed3 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -43,10 +43,13 @@
CEquipment::~CEquipment()
{
- for (auto item : m_glassList) {
- item->release();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ CContext* pContext = m_slot[i].getContext();
+ if (pContext != nullptr) {
+ pContext->release();
+ m_slot[i].setContext(nullptr);
+ }
}
- m_glassList.clear();
for (auto item : m_mapStep) {
delete item.second;
@@ -149,6 +152,7 @@
{
initPins();
initSteps();
+ initSlots();
for (auto item : m_mapStep) {
item.second->init();
}
@@ -251,9 +255,19 @@
std::to_string((int)item->getType()).c_str(), "", weight++));
}
- for (auto item : m_glassList) {
- attrubutes.addAttribute(new CAttribute("Glass",
- item->getID().c_str(), "", weight++));
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) {
+ attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
+ "", "", weight++));
+ }
+ else {
+ attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
+ pGlass->getID().c_str(), "", weight++));
+ }
+
}
}
@@ -305,24 +319,23 @@
{
if (ar.IsStoring()) {
Lock();
- int count = (int)m_glassList.size();
- ar << count;
- for (auto item : m_glassList) {
- item->serialize(ar);
+ for (int i = 0; i < SLOT_MAX; i++) {
+ m_slot[i].serialize(ar);
}
Unlock();
}
else {
- // addGlassToList前不需要上锁，因其内部有锁
- int count;
- ar >> count;
- for (int i = 0; i < count; i++) {
- CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
- pGlass->serialize(ar);
- addGlassToList(pGlass);
+ for (int i = 0; i < SLOT_MAX; i++) {
+ m_slot[i].serialize(ar);
+ if (m_slot[i].getContext() != nullptr) {
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->serialize(ar);
+ m_slot[i].setContext(pGlass);
+ }
}
// 梳理各玻璃之间的绑定关系
+ /*
Lock();
std::list<CGlass*> list = m_glassList;
for (auto item : list) {
@@ -337,6 +350,7 @@
}
}
Unlock();
+ */
}
}
@@ -690,175 +704,10 @@
// 测试
if (code == FLOW_TEST) {
AfxMessageBox(pIntent->getMsg());
- return FLOW_ACCEPT;
}
-
- // 信号
- if (code == FLOW_SIGNAL) {
- return FLOW_ACCEPT;
- }
-
-
- // 数据
- if (code == FLOW_SIGNAL) {
- return FLOW_ACCEPT;
- }
-
-
- // 物料
- if (code == FLOW_MOVE_MATERIAL) {
- CGlass* pGlass = (CGlass*)pIntent->getContext();
- ASSERT(pGlass);
- if (!glassWillArrive(pGlass)) {
- return FLOW_REJECT;
- }
- return glassArrived(pGlass);
- }
-
-
-
- return FLOW_ACCEPT;
- }
-
- int CEquipment::outputGlass(int port)
- {
- CPin* pOutPin = nullptr;
- if (port == 0) {
- pOutPin = getPin("Out");
- if (pOutPin == nullptr) {
- pOutPin = getPin("Out1");
- }
- }
- else if (port == 1) {
- pOutPin = getPin("Out2");
- }
- if (pOutPin == nullptr) {
- return -1;
- }
-
-
- // 模拟取出第一张Panel,传送到下一环节
- ULONGLONG time = CToolUnits::getTimestamp();
- Lock();
- if (m_glassList.empty()) {
- Unlock();
- return -2;
- }
- CGlass* pContext = m_glassList.front();
- pContext->addRef();
-
- CIntent intent(FLOW_MOVE_MATERIAL, "", pContext);
- int nRet = pOutPin->sendIntent(&intent);
- if (nRet == FLOW_REJECT) {
- LOGE("<CEquipment>对方拒绝接收Intent.");
- }
- else if (nRet == FLOW_ACCEPT) {
- CPath* pPath = pContext->getPathWithSiteID(m_nID);
- if (pPath != nullptr) {
- pPath->setOutTime(time);
- }
- m_glassList.pop_front();
- pContext->release(); // 添加到列队时addRef, 取出时release
- if (m_listener.onDataChanged != nullptr) {
- m_listener.onDataChanged(this, 0);
- }
- }
-
- pContext->release();
- Unlock();
return 0;
- }
-
- BOOL CEquipment::glassWillArrive(CGlass* pGlass)
- {
- return TRUE;
- }
-
- int CEquipment::glassArrived(CGlass* pGlass)
- {
- Lock();
- pGlass->addPath(m_nID);
- pGlass->addRef();
- m_glassList.push_back(pGlass);
- Unlock();
-
- if (m_listener.onDataChanged != nullptr) {
- m_listener.onDataChanged(this, 0);
- }
-
- return FLOW_ACCEPT;
- }
-
- void CEquipment::addGlassToList(CGlass* pGlass)
- {
- ASSERT(pGlass);
-
- Lock();
- pGlass->addRef();
- m_glassList.push_back(pGlass);
- Unlock();
-
- if (m_listener.onDataChanged != nullptr) {
- m_listener.onDataChanged(this, 0);
- }
- }
-
- CGlass* CEquipment::getGlassFromList(const char* pszId)
- {
- CGlass* pGlass = nullptr;
- Lock();
- for (auto item : m_glassList) {
- if (item->getID().compare(pszId) == 0) {
- pGlass = item;
- break;
- }
- }
- Unlock();
-
- return pGlass;
- }
-
- BOOL CEquipment::removeClass(CGlass* pGlass)
- {
- Lock();
- bool bExist = std::find(m_glassList.begin(), m_glassList.end(), pGlass) != m_glassList.end();
- if (bExist) {
- pGlass->addPath(EQ_ID_OPERATOR_REMOVE);
- pGlass->release();
- m_glassList.remove(pGlass);
- }
- Unlock();
-
- if (bExist && m_listener.onDataChanged != nullptr) {
- m_listener.onDataChanged(this, 0);
- }
-
- return bExist;
- }
-
- void CEquipment::getGlassList(std::list<CGlass*>& list)
- {
- Lock();
- for (auto item : m_glassList) {
- item->addRef();
- list.push_back(item);
- }
- Unlock();
- }
-
- CGlass* CEquipment::getFrontGlass()
- {
- CGlass* pGlass = nullptr;
-
- Lock();
- if (!m_glassList.empty()) {
- pGlass = m_glassList.front();
- }
- Unlock();
-
- return pGlass;
}
int CEquipment::fetchedOutJob(CJobDataB* pJobDataB)
@@ -869,16 +718,12 @@
// 找到指定的glass id,
Lock();
- if (m_glassList.empty()) {
- Unlock();
- return -2;
- }
-
CGlass* pContext = nullptr;
- for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
- if ((*iter)->getID().compare(pJobDataB->getGlassId()) == 0) {
- pContext = (*iter);
- m_glassList.erase(iter);
+ for (int i = 0; i < SLOT_MAX; i++) {
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr && compareJobDataB(pJobDataB, pGlass->getJobDataB())) {
+ pContext = pGlass;
+ m_slot[i].setContext(nullptr);
break;
}
}
@@ -890,10 +735,11 @@
// 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
CGlass* pBuddy = pContext->getBuddy();
if (pBuddy != nullptr) {
- for (auto iter = m_glassList.begin(); iter != m_glassList.end(); iter++) {
- if ((*iter)->getID().compare(pBuddy->getID()) == 0) {
- (*iter)->release();
- m_glassList.erase(iter);
+ for (int i = 0; i < SLOT_MAX; i++) {
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr && compareJobDataB(pBuddy->getJobDataB(), pGlass->getJobDataB())) {
+ pContext->release();
+ m_slot[i].setContext(nullptr);
break;
}
}
@@ -913,6 +759,7 @@
int CEquipment::storedJob(CJobDataB* pJobDataB)
{
+ /*
if (m_pArm == nullptr) {
return -1;
}
@@ -946,13 +793,19 @@
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, 0);
}
-
+ */
return 0;
}
- BOOL CEquipment::isGlassListEmpty()
+ BOOL CEquipment::hasGlass()
{
- return m_glassList.empty();
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (m_slot[i].isEnable() && !m_slot[i].isEmpty()) {
+ return TRUE;
+ }
+ }
+
+ return FALSE;
}
bool CEquipment::isAlarmStep(SERVO::CStep* pStep)
@@ -1183,7 +1036,7 @@
return nullptr;
}
- CSlot* CEquipment::getEmptySlot(MaterialsType type)
+ CSlot* CEquipment::getAvailableSlotForGlass(MaterialsType type)
{
for (int i = 0; i < SLOT_MAX; i++) {
if (!m_slot[i].isEnable()) continue;
@@ -1213,6 +1066,36 @@
if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
return &m_slot[i];
+ }
+
+ return nullptr;
+ }
+
+ CGlass* CEquipment::getGlassFromSlot(int slotNo)
+ {
+ CSlot* pSlot = nullptr;
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].getNo() != slotNo) continue;
+ pSlot = &m_slot[i];
+ break;
+ }
+
+ if (pSlot != nullptr) {
+ return (CGlass*)pSlot->getContext();
+ }
+
+ return nullptr;
+ }
+
+ CGlass* CEquipment::getAnyGlass()
+ {
+ CSlot* pSlot = nullptr;
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+ return pGlass;
}
return nullptr;
@@ -1437,6 +1320,24 @@
{
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(),
+ pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+ return FALSE;
+ }
+
+ // 当前不能有任何玻璃，且当前准备进的片是G2
+ Lock();
+ CSlot* pSlot = getAvailableSlotForGlass((MaterialsType)pJobDataS->getMaterialsType());
+ if (pSlot == nullptr) {
+ Unlock();
+ LOGE("<CFliper-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
+ return FALSE;
+ }
+ Unlock();
+
return TRUE;
}
@@ -1557,4 +1458,17 @@
return nullptr;
}
+
+ BOOL CEquipment::compareJobDataB(CJobDataB* pJobDataB1, CJobDataB* pJobDataB2)
+ {
+ ASSERT(pJobDataB1);
+ ASSERT(pJobDataB2);
+
+ if (pJobDataB1->getCassetteSequenceNo() != pJobDataB2->getCassetteSequenceNo())
+ return FALSE;
+ if (pJobDataB1->getJobSequenceNo() != pJobDataB2->getJobSequenceNo())
+ return FALSE;
+
+ return TRUE;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3