From 417d3825013cd1b9e8a8dafa72f51c755ee5d897 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期一, 23 六月 2025 15:20:32 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/CEquipment.cpp | 922 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 569 insertions(+), 353 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 9a6ebfc..225c835 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -27,7 +27,7 @@
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
{
- m_listener = { nullptr, nullptr, nullptr, nullptr, nullptr };
+ m_listener = { };
m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
@@ -35,18 +35,22 @@
m_bLocalAlarm = FALSE;
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
+ memset(m_bLinkSignal, 0, sizeof(m_bLinkSignal));
m_pCclink = nullptr;
m_nBaseAlarmId = 0;
m_pArm = nullptr;
+ m_processState = PROCESS_STATE::Ready;
InitializeCriticalSection(&m_criticalSection);
}
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) {
+ m_slot[i].setContext(nullptr);
+ }
}
- m_glassList.clear();
for (auto item : m_mapStep) {
delete item.second;
@@ -68,11 +72,7 @@
void CEquipment::setListener(EquipmentListener listener)
{
- m_listener.onAlive = listener.onAlive;
- m_listener.onCimStateChanged = listener.onCimStateChanged;
- m_listener.onAlarm = listener.onAlarm;
- m_listener.onDataChanged = listener.onDataChanged;
- m_listener.onVcrEventReport = listener.onVcrEventReport;
+ m_listener = listener;
}
void CEquipment::setCcLink(CCCLinkIEControl* pCcLink)
@@ -145,10 +145,21 @@
return 0;
}
+ void CEquipment::setProcessState(PROCESS_STATE state)
+ {
+ m_processState = state;
+ onProcessStateChanged(m_processState);
+
+ if (m_listener.onProcessStateChanged != nullptr) {
+ m_listener.onProcessStateChanged(this, m_processState);
+ }
+ }
+
void CEquipment::init()
{
initPins();
initSteps();
+ initSlots();
for (auto item : m_mapStep) {
item.second->init();
}
@@ -251,9 +262,27 @@
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();
+ CGlass* pBuddy = nullptr;
+ if (pGlass == nullptr) {
+ attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
+ "", "", weight++));
+ }
+ else {
+ pBuddy = pGlass->getBuddy();
+ if (pBuddy == nullptr) {
+ attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
+ pGlass->getID().c_str(), "", weight++));
+ }
+ else {
+ attrubutes.addAttribute(new CAttribute(m_slot[i].getName().c_str(),
+ (pGlass->getID() + " -> " + pBuddy->getID()).c_str(), "", weight++));
+ }
+ }
+
}
}
@@ -305,38 +334,54 @@
{
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);
+ CGlass* pGlass = (CGlass *)m_slot[i].getContext();
+ if (pGlass != nullptr) {
+ pGlass->serialize(ar);
+ CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) {
+ pBuddy->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].getTempContext() != nullptr) {
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ pGlass->serialize(ar);
+ m_slot[i].setContext(pGlass);
+ if (pGlass->getBuddy() != nullptr) {
+ CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
+ pBuddy->serialize(ar);
+ pGlass->forceSetBuddy(pBuddy);
+ }
+ }
}
// 梳理各玻璃之间的绑定关系
+ /*
Lock();
- std::list<CGlass*> list = m_glassList;
- for (auto item : list) {
- std::string& strBuddyId = item->getBuddyId();
- if (!strBuddyId.empty()) {
- for (auto item2 : m_glassList) {
- if (strBuddyId.compare(item2->getID()) == 0) {
- item->setBuddy(item2);
- TRACE("绑定关系: %s <- %s\n", item->getID().c_str(), item2->getID().c_str());
+ for (int i = 0; i < SLOT_MAX; i++) {
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass != nullptr) {
+ std::string& strBuddyId = pGlass->getBuddyId();
+ if (!strBuddyId.empty()) {
+ for (int j = 0; j < SLOT_MAX; j++) {
+ CGlass* pBudy = (CGlass*)m_slot[j].getContext();
+ if (pBudy != nullptr && strBuddyId.compare(pBudy->getID()) == 0) {
+ pGlass->setBuddy(pBudy);
+ TRACE("绑定关系: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
+ }
}
}
}
}
Unlock();
+ */
}
}
@@ -350,9 +395,22 @@
}
*/
- // 以下解释和处理数据
+ // 连接信号解释和保存
BOOL bFlag;
- int index = 0x540;
+ int index = 0;
+ for (int i = 0; i < 8; i++) {
+ m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
+ m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+ m_bLinkSignal[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
+ m_bLinkSignal[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
+ index += 0x40;
+ }
+ if(m_bLinkSignal[0][SIGNAL_SEND_ABLE]) {
+ onSendAble();
+ }
+
+ // 其它信号及响应
+ index = 0x540;
// alive
@@ -517,6 +575,21 @@
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_INUSE, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_UNLOAD_READY, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_BLOCKED, pszData, size);
+
+ // robot cmd reply
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_ROBOT_CMD_REPLY, pszData, size);
+
+ // Indexer Operation Mode Change
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);
+
+ // Panel Data Report
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);
+
+ // Panel Data Request
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REQUEST, pszData, size);
+
+ // Job Data Request
+ CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_DATA_REQUEST, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -567,6 +640,28 @@
{
if (index >= VCR_MAX) return FALSE;
return m_bVCREnable[index];
+ }
+
+ BOOL CEquipment::isLinkSignalOn(unsigned int path, unsigned int signal)
+ {
+ if (path >= PATH_MAX) return FALSE;
+ if (signal >= SIGNAL_MAX) return FALSE;
+ return m_bLinkSignal[path][signal];
+ }
+
+ void CEquipment::setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn)
+ {
+ if (path >= PATH_MAX) return;
+ if (signal >= SIGNAL_MAX) return;
+ m_bLinkSignal[path][signal] = bOn;
+ }
+
+ void CEquipment::setLinkSignalBlock(unsigned int path, BOOL* pSignal)
+ {
+ if (path >= PATH_MAX) return;
+ for (int i = 0; i < SIGNAL_MAX; i++) {
+ m_bLinkSignal[path][i] = pSignal[i];
+ }
}
int CEquipment::onStepEvent(CStep* pStep, int code)
@@ -690,175 +785,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 +799,13 @@
// 找到指定的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 && compareJobData(pJobDataB, pGlass->getJobDataS())) {
+ pContext = pGlass;
+ if (pGlass != nullptr) pGlass->addRef();
+ m_slot[i].setContext(nullptr);
break;
}
}
@@ -887,31 +814,24 @@
return -3;
}
- // 如果此玻璃已经贴合，贴合的玻璃也要从列表中移除
- 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);
- break;
- }
- }
- }
-
((CArm*)m_pArm)->tempStore(pContext);
pContext->release();
Unlock();
+
+ if (m_processState != PROCESS_STATE::Ready) {
+ setProcessState(PROCESS_STATE::Ready);
+ }
+
if (m_listener.onDataChanged != nullptr) {
- m_listener.onDataChanged(this, 0);
+ m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
}
return 0;
}
- int CEquipment::storedJob(CJobDataB* pJobDataB)
+ int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
{
if (m_pArm == nullptr) {
return -1;
@@ -925,34 +845,100 @@
ASSERT(pGlass);
Lock();
- pGlass->addPath(m_nID);
- pGlass->addRef(); // 加入list,addRef
- m_glassList.push_back(pGlass);
+ pGlass->addPath(m_nID, getSlotUnit(putSlot));
+ m_slot[putSlot - 1].setContext(pGlass);
pGlass->release(); // tempFetchOut需要调用一次release
Unlock();
-
- // 如果此玻璃已经贴合，贴合的玻璃也要从加入到列表中
- CGlass* pBuddy = pGlass->getBuddy();
- if (pBuddy != nullptr) {
- Lock();
- pBuddy->addPath(m_nID);
- pBuddy->addRef(); // 加入list,addRef
- m_glassList.push_back(pBuddy);
- Unlock();
+ if (m_processState != PROCESS_STATE::Processing) {
+ setProcessState(PROCESS_STATE::Processing);
}
-
if (m_listener.onDataChanged != nullptr) {
- m_listener.onDataChanged(this, 0);
+ m_listener.onDataChanged(this, EDCC_STORED_JOB);
}
-
+
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;
+ }
+
+ CGlass* CEquipment::getGlass(const char* pszGlassId)
+ {
+ 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;
+ if (pGlass->getID().compare(pszGlassId) == 0) {
+ return pGlass;
+ }
+ }
+
+ 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::getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo)
+ {
+ 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;
+ CJobDataS* pJobDataS = pGlass->getJobDataS();
+ ASSERT(pJobDataS);
+ if (pJobDataS->getCassetteSequenceNo() == cassetteSequenceNo
+ && pJobDataS->getJobSequenceNo() == jobSequenceNo) {
+ return pGlass;
+ }
+ }
+
+
+ return nullptr;
+ }
+
+ CJobDataS* CEquipment::getJobDataSWithCassette(int cassetteSequenceNo, int jobSequenceNo)
+ {
+ 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;
+ CJobDataS* pJobDataS = pGlass->getJobDataS();
+ ASSERT(pJobDataS);
+ if (pJobDataS->getCassetteSequenceNo() == cassetteSequenceNo
+ && pJobDataS->getJobSequenceNo() == jobSequenceNo) {
+ return pJobDataS;
+ }
+ }
+
+
+ return nullptr;
}
bool CEquipment::isAlarmStep(SERVO::CStep* pStep)
@@ -1092,30 +1078,35 @@
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, [&, pStep, 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);
+ LOGI("<CEquipment-%s>返回值: %d", m_strName.c_str(), retCode);
+ }
+ else {
+ LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
+ }
- return 0;
- });
- }
+ if (onWritedRetBlock != nullptr) {
+ onWritedRetBlock(code, retCode);
+ }
+
+ return 0;
+ });
return 0;
}
@@ -1170,6 +1161,168 @@
return 0;
}
+ CSlot* CEquipment::getAvailableSlot()
+ {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ if (!m_slot[i].isEmpty()) continue;
+
+ return &m_slot[i];
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getAvailableSlotForGlass(MaterialsType type)
+ {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ if (!m_slot[i].isEmpty()) continue;
+
+ MaterialsType slotType = m_slot[i].getType();
+ if (type == MaterialsType::G1 && slotType == MaterialsType::G2) continue;
+ if (type == MaterialsType::G2 && slotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getAvailableSlotForGlass2(MaterialsType type, const std::vector<int>& candidates)
+ {
+ for (auto item : candidates) {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (item == i + 1) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ if (!m_slot[i].isEmpty()) continue;
+
+ MaterialsType slotType = m_slot[i].getType();
+ if (type == MaterialsType::G1 && slotType == MaterialsType::G2) continue;
+ if (type == MaterialsType::G2 && slotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+ }
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getNonEmptySlot(MaterialsType putSlotType)
+ {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+
+ MaterialsType glassType = pGlass->getType();
+ if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+ if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getProcessedSlot(MaterialsType putSlotType)
+ {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;
+
+ MaterialsType glassType = pGlass->getType();
+ if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+ if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getProcessedSlot2(MaterialsType putSlotType, const std::vector<int>& candidates)
+ {
+ for (auto item : candidates) {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (item == i + 1) {
+ if (!m_slot[i].isEnable()) continue;
+ if (m_slot[i].isLock()) continue;
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (pGlass == nullptr) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;
+
+ MaterialsType glassType = pGlass->getType();
+ if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+ if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
+
+ return &m_slot[i];
+ }
+ }
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getSlot(int index)
+ {
+ if (index >= SLOT_MAX) return nullptr;
+ return &m_slot[index];
+ }
+
+ 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;
+ }
+
+ BOOL CEquipment::canPlaceGlassInSlot(const short slotIndex)
+ {
+ if (slotIndex >= SLOT_MAX) return FALSE;
+ if (!m_slot[slotIndex].isEnable()) return FALSE;
+ if (m_slot[slotIndex].getContext() != nullptr) return FALSE;
+
+ return TRUE;
+ }
+
+ int CEquipment::removeGlass(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 -1;
+ pSlot->setContext(nullptr);
+ return 0;
+ }
+
short CEquipment::decodeRecipeListReport(const char* pszData, size_t size)
{
return m_recipesManager.decodeRecipeListReport(pszData, size);
@@ -1219,8 +1372,6 @@
int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
{
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
-
- addJobDataS(pJobDataS);
return 0;
}
@@ -1237,7 +1388,7 @@
pStep->addAttributeVector(attrubutes);
- onReceivedJob(port, &jobDataS);
+ onSentOutJob(port, &jobDataS);
return nRet;
}
@@ -1246,13 +1397,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;
}
@@ -1299,10 +1453,14 @@
return index;
}
- int CEquipment::onPreFetchedOutJob(int port, CJobDataB* pJobDataB)
+ BOOL CEquipment::onPreFetchedOutJob(int port, CJobDataB* pJobDataB)
{
LOGI("<CEquipment-%s>onPreFetchedOutJob:port:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+ if (m_listener.onPreFethedOutJob != nullptr) {
+ return m_listener.onPreFethedOutJob(this, pJobDataB);
+ }
+
return TRUE;
}
@@ -1385,10 +1543,124 @@
return 0;
}
- int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB)
+ int CEquipment::decodePanelDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ short cassetteNo, jobSequenceNo;
+ int index = 0;
+ std::string strPanelJudgeData, strPanelGradeData;
+ memcpy(&cassetteNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
+ index += 128 * 2;
+ CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+ index += 256 * 2;
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("CassetteNo",
+ std::to_string(cassetteNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("JobSequenceNo",
+ std::to_string(jobSequenceNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("PanelJudgeData",
+ strPanelJudgeData.c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("PanelGradeData",
+ strPanelGradeData.c_str(), "", weight++));
+
+
+ return 0;
+ }
+
+ int CEquipment::decodeFacDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ int index = 0;
+ std::string strSvTimeRecord, strSvData;
+ CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
+ index += 128 * 2;
+ CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
+ index += 256 * 2;
+
+
+ // 缓存Attribute，用于调试时显示信息
+ unsigned int weight = 201;
+ pStep->addAttribute(new CAttribute("SV Time Record",
+ strSvTimeRecord.c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SV Data",
+ strSvData.c_str(), "", weight++));
+
+
+ return 0;
+ }
+
+ int CEquipment::decodeJobDataRequest(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);
+ cassetteSequenceNo = 4000;
+ jobSequenceNo = 1;
+
+
+
+ // 缓存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());
+
+ // 当前要存片，之前肯定有拔片，因此片子在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;
+ }
+
+ // 如果没有可用位置，报错
+ Lock();
+ CSlot* pSlot = getAvailableSlotForGlass((MaterialsType)pJobDataS->getMaterialsType());
+ if (pSlot == nullptr) {
+ Unlock();
+ LOGE("<CFliper-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
+ return FALSE;
+ }
+ Unlock();
+
+
+ if (m_listener.onPreStoredJob != nullptr) {
+ if (!m_listener.onPreStoredJob(this, pJobDataB, putSlot)) {
+ return FALSE;
+ }
+
+ if(!canPlaceGlassInSlot(putSlot - 1)) {
+ return FALSE;
+ }
+ }
+
return TRUE;
}
@@ -1397,10 +1669,10 @@
LOGI("<CEquipment-%s>onStore:port:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
- BOOL bCheck = onPreStoredJob(port, pJobDataB);
+ short putSlot = 0;
+ BOOL bCheck = onPreStoredJob(port, pJobDataB, putSlot);
if (bCheck) {
- addJobDataB(pJobDataB);
- return storedJob(pJobDataB);
+ return storedJob(pJobDataB, putSlot);
}
// 数据异常，处理或显示
@@ -1412,6 +1684,27 @@
int CEquipment::onProcessData(CProcessData* pProcessData)
{
LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
+
+ return 0;
+ }
+
+ /*
+ * 当从CC-Link检测到设备Send Able为On时调用此函数
+ * 可能会多次重复调用(根据扫描频率), 注意防呆
+ */
+ int CEquipment::onSendAble()
+ {
+ LOGI("<CEquipment-%s>onSendAble.", m_strName.c_str());
+
+ if (m_processState != PROCESS_STATE::Complete) {
+ setProcessState(PROCESS_STATE::Complete);
+ }
+
+ return 0;
+ }
+
+ int CEquipment::onProcessStateChanged(PROCESS_STATE state)
+ {
return 0;
}
@@ -1420,93 +1713,16 @@
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();
+ if (pJobDataB->getCassetteSequenceNo() != pJobDataS->getCassetteSequenceNo())
+ return FALSE;
+ if (pJobDataB->getJobSequenceNo() != pJobDataS->getJobSequenceNo())
+ return FALSE;
- 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;
+ return TRUE;
}
}
\ No newline at end of file
--
Gitblit v1.9.3