From 0393d1ff2ebc378b3c4cff9b45f72ebc8a4ea516 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 03 六月 2025 15:13:42 +0800
Subject: [PATCH] Merge branch 'master' into liuyang
---
SourceCode/Bond/Servo/CBonder.cpp | 74 ++++++++++--------------------------
1 files changed, 21 insertions(+), 53 deletions(-)
diff --git a/SourceCode/Bond/Servo/CBonder.cpp b/SourceCode/Bond/Servo/CBonder.cpp
index f485a94..8be694e 100644
--- a/SourceCode/Bond/Servo/CBonder.cpp
+++ b/SourceCode/Bond/Servo/CBonder.cpp
@@ -336,6 +336,21 @@
}
}
+ // 必须要实现的虚函数，在此初始化Slot信息
+ void CBonder::initSlots()
+ {
+ m_slot[0].enable();
+ m_slot[0].setPosition(m_nID);
+ m_slot[0].setNo(1);
+ m_slot[0].setName("Slot 1(G1)");
+ m_slot[0].setType(MaterialsType::G1);
+ m_slot[1].enable();
+ m_slot[1].setPosition(m_nID);
+ m_slot[1].setNo(2);
+ m_slot[1].setName("Slot 2(G2)");
+ m_slot[1].setType(MaterialsType::G2);
+ }
+
void CBonder::onTimer(UINT nTimerid)
{
CEquipment::onTimer(nTimerid);
@@ -356,16 +371,6 @@
return __super::recvIntent(pPin, pIntent);
}
- BOOL CBonder::glassWillArrive(CGlass* pGlass)
- {
- BOOL bRet = __super::glassWillArrive(pGlass);
- if (!bRet) {
- return FALSE;
- }
-
- return m_glassList.empty();
- }
-
void CBonder::setIndex(unsigned int index)
{
m_nIndex = index;
@@ -376,39 +381,6 @@
return m_nIndex;
}
- BOOL CBonder::onPreStoredJob(int port, CJobDataB* pJobDataB)
- {
- CJobDataS* pJobDataS = getJobDataS(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
- if (pJobDataS == nullptr) {
- LOGE("<CBonder-%s>onPreFetchedOutJob,找不到对应的JobDataS(CassetteSequenceNo:%d, JobSequenceNo:%d), 注意排查风险!", m_strName.c_str(),
- pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
- return FALSE;
- }
-
- // 如果为空，可以进G1或G2
- // 如果有一片玻璃，当前玻璃为G1则可进G2, 当前玻璃为G2则可进G1
- BOOL bCheck = FALSE;
- Lock();
- size_t size = m_glassList.size();
- if (size == 0) {
- bCheck = TRUE;
- }
- else if (size == 1) {
- CGlass* pGlass = m_glassList.front();
- if ((pGlass->getType() == MaterialsType::G1 && pJobDataS->getMaterialsType() == (int)MaterialsType::G2)
- || (pGlass->getType() == MaterialsType::G2 && pJobDataS->getMaterialsType() == (int)MaterialsType::G1)) {
- bCheck = TRUE;
- }
- }
- Unlock();
-
- if (!bCheck) {
- LOGE("<CEquipment-%s>onPreFetchedOutJob,当前机器不满足进料条件，或已存在两片玻璃，或G2与G1不匹配，请注意风险！", m_strName.c_str());
- }
-
- return bCheck;
- }
-
int CBonder::onProcessData(CProcessData* pProcessData)
{
CEquipment::onProcessData(pProcessData);
@@ -416,28 +388,23 @@
// 检查数据，当前两片玻璃，一片为G1, 一片为G2, 且pProcessData中的id能匹配G1或G2
Lock();
- if (m_glassList.size() != 2) {
- Unlock();
- LOGE("<CBonder-%s>onProcessData,绑定失败，腔体内必须有且仅有两片玻璃!", m_strName.c_str());
- return -1;
- }
-
- CGlass* pGlass1 = m_glassList.front();
- CGlass* pGlass2 = m_glassList.back();
- Unlock();
-
+ CGlass* pGlass1 = getGlassFromSlot(1);
+ CGlass* pGlass2 = getGlassFromSlot(2);
if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被绑定，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
return -1;
}
if (pGlass1->getBuddy() != nullptr || pGlass2->getBuddy() != nullptr) {
LOGE("<CBonder-%s>onProcessData,错误!玻璃较早前已被贴合，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
return -1;
}
if (pGlass1->getType() == pGlass2->getType()) {
LOGE("<CBonder-%s>onProcessData,错误!两片玻璃未匹配，必须分别为G1和G2类型，请检查数据是否正确!", m_strName.c_str());
+ Unlock();
return -1;
}
@@ -445,6 +412,7 @@
pGlass2->setBuddy(pGlass1);
LOGE("<CBonder-%s>onProcessData,%s和%s已贴合!", m_strName.c_str(),
pGlass1->getID().c_str(), pGlass2->getID().c_str());
+ Unlock();
return 0;
}
--
Gitblit v1.9.3