From bfe14e41fa5b07771d78af4511ba18d706bc23cc Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 28 七月 2025 17:07:52 +0800
Subject: [PATCH] 1.Spooling Config功能EAP模拟测试；
---
SourceCode/Bond/Servo/CEquipment.cpp | 477 ++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 375 insertions(+), 102 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ea36b48..c670d76 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -7,22 +7,6 @@
#include "Servo.h"
-#define CHECK_READ_STEP_SIGNAL(addr, data, size) { \
- BOOL bFlag = isBitOn(data, size, addr); \
- SERVO::CStep* pStep = getStep(addr); \
- if (pStep != nullptr) { \
- ((CReadStep*)pStep)->onReadSignal(bFlag ? addr : 0); \
- } \
-}
-
-#define CHECK_WRITE_STEP_SIGNAL(addr, data, size) { \
- BOOL bFlag = isBitOn(data, size, addr); \
- SERVO::CStep* pStep = getStep(addr); \
- if (pStep != nullptr) { \
- ((CWriteStep*)pStep)->onRecvSignal(bFlag ? addr : 0); \
- } \
-}
-
namespace SERVO {
CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
@@ -35,11 +19,13 @@
m_bLocalAlarm = FALSE;
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
- memset(m_bLinkSignal, 0, sizeof(m_bLinkSignal));
+ memset(m_bLinkSignalToUpstream, 0, sizeof(m_bLinkSignalToUpstream));
+ memset(m_bLinkSignalToDownstream, 0, sizeof(m_bLinkSignalToDownstream));
m_pCclink = nullptr;
m_nBaseAlarmId = 0;
m_pArm = nullptr;
m_processState = PROCESS_STATE::Ready;
+ m_blockReadBit = { 0 };
InitializeCriticalSection(&m_criticalSection);
}
@@ -399,15 +385,31 @@
BOOL bFlag;
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);
+ m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
+ m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+ m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
+ m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
index += 0x40;
+
+ if (m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE]) {
+ onSendAble(i+1);
+ }
}
- if(m_bLinkSignal[0][SIGNAL_SEND_ABLE]) {
- onSendAble();
+
+
+ index += 0x40 * 2;
+ for (int i = 0; i < 8; i++) {
+ m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
+ m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+ m_bLinkSignalToDownstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
+ m_bLinkSignalToDownstream[i][SIGNAL_RECEIVE_ABLE] = isBitOn(pszData, size, index + 3);
+ index += 0x40;
+
+ if (m_bLinkSignalToDownstream[0][SIGNAL_RECEIVE_ABLE]) {
+ onReceiveAble(i + 1);
+ }
}
+
// 其它信号及响应
index = 0x540;
@@ -581,6 +583,24 @@
// Indexer Operation Mode Change
CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);
+
+ // Panel Data Report
+ CHECK_READ_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);
+
+ // job process start/end report
+ CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_START_REPORT, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_END_REPORT, pszData, size);
+
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY, pszData, size);
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY, pszData, size);
}
BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -633,25 +653,47 @@
return m_bVCREnable[index];
}
- BOOL CEquipment::isLinkSignalOn(unsigned int path, unsigned int signal)
+ BOOL CEquipment::isLinkSignalUpstreamOn(unsigned int path, unsigned int signal)
{
if (path >= PATH_MAX) return FALSE;
if (signal >= SIGNAL_MAX) return FALSE;
- return m_bLinkSignal[path][signal];
+ return m_bLinkSignalToUpstream[path][signal];
}
- void CEquipment::setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn)
+ BOOL CEquipment::isLinkSignalDownstreamOn(unsigned int path, unsigned int signal)
+ {
+ if (path >= PATH_MAX) return FALSE;
+ if (signal >= SIGNAL_MAX) return FALSE;
+ return m_bLinkSignalToDownstream[path][signal];
+ }
+
+ void CEquipment::setLinkSignalUpstream(unsigned int path, unsigned int signal, BOOL bOn)
{
if (path >= PATH_MAX) return;
if (signal >= SIGNAL_MAX) return;
- m_bLinkSignal[path][signal] = bOn;
+ m_bLinkSignalToUpstream[path][signal] = bOn;
}
- void CEquipment::setLinkSignalBlock(unsigned int path, BOOL* pSignal)
+ void CEquipment::setLinkSignalUpstreamBlock(unsigned int path, BOOL* pSignal)
{
if (path >= PATH_MAX) return;
for (int i = 0; i < SIGNAL_MAX; i++) {
- m_bLinkSignal[path][i] = pSignal[i];
+ m_bLinkSignalToUpstream[path][i] = pSignal[i];
+ }
+ }
+
+ void CEquipment::setLinkSignalDownstream(unsigned int path, unsigned int signal, BOOL bOn)
+ {
+ if (path >= PATH_MAX) return;
+ if (signal >= SIGNAL_MAX) return;
+ m_bLinkSignalToDownstream[path][signal] = bOn;
+ }
+
+ void CEquipment::setLinkSignalDownstreamBlock(unsigned int path, BOOL* pSignal)
+ {
+ if (path >= PATH_MAX) return;
+ for (int i = 0; i < SIGNAL_MAX; i++) {
+ m_bLinkSignalToDownstream[path][i] = pSignal[i];
}
}
@@ -750,6 +792,11 @@
return m_outputPins;
}
+ CRecipeList* CEquipment::getRecipeList(int unitNo)
+ {
+ return m_recipesManager.getRecipeList(unitNo);
+ }
+
int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
{
ASSERT(pPin);
@@ -782,7 +829,7 @@
return 0;
}
- int CEquipment::fetchedOutJob(CJobDataB* pJobDataB)
+ int CEquipment::fetchedOutJob(int port, CJobDataB* pJobDataB)
{
if (m_pArm == nullptr) {
return -1;
@@ -805,7 +852,6 @@
return -3;
}
-
((CArm*)m_pArm)->tempStore(pContext);
pContext->release();
Unlock();
@@ -822,7 +868,7 @@
return 0;
}
- int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
+ int CEquipment::storedJob(int port, CJobDataB* pJobDataB, short putSlot)
{
if (m_pArm == nullptr) {
return -1;
@@ -848,7 +894,7 @@
if (m_listener.onDataChanged != nullptr) {
m_listener.onDataChanged(this, EDCC_STORED_JOB);
}
-
+
return 0;
}
@@ -896,7 +942,6 @@
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();
@@ -1102,7 +1147,7 @@
return 0;
}
- int CEquipment::masterRecipeListRequest(short unitNo)
+ int CEquipment::masterRecipeListRequest(short unitNo, ONSYNCINGSTATECHANGED block)
{
SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
if (pStep == nullptr) {
@@ -1110,6 +1155,7 @@
}
LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
+ m_recipesManager.setOnSyncingStateChanged(block);
if (m_recipesManager.syncing() != 0) {
return -2;
}
@@ -1171,6 +1217,28 @@
if (!m_slot[i].isEnable()) continue;
if (m_slot[i].isLock()) continue;
if (!m_slot[i].isEmpty()) continue;
+ int lsPath = m_slot[i].getLinkSignalPath();
+ if (!m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+ || m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+ || !m_bLinkSignalToDownstream[lsPath][SIGNAL_INTERLOCK]
+ || !m_bLinkSignalToDownstream[lsPath][SIGNAL_RECEIVE_ABLE]) 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::getAvailableSlotForGlassExcludeSignal(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;
@@ -1227,12 +1295,14 @@
if (!m_slot[i].isEnable()) continue;
if (m_slot[i].isLock()) continue;
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (!isSlotProcessed(i)) continue;
if (pGlass == nullptr) continue;
+ if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) 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;
+ 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;
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1253,11 +1323,12 @@
if (m_slot[i].isLock()) continue;
CGlass* pGlass = (CGlass*)m_slot[i].getContext();
if (pGlass == nullptr) continue;
+ if (!isSlotProcessed(i+1)) 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;
+ 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;
MaterialsType glassType = pGlass->getType();
if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1266,6 +1337,26 @@
return &m_slot[i];
}
}
+ }
+
+ return nullptr;
+ }
+
+ CSlot* CEquipment::getInspFailSlot()
+ {
+ 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;
+ 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;
+
+ return &m_slot[i];
}
return nullptr;
@@ -1311,6 +1402,10 @@
if (pSlot == nullptr) return -1;
pSlot->setContext(nullptr);
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
+ }
+
return 0;
}
@@ -1332,11 +1427,8 @@
// 缓存Attribute，用于调试时显示信息
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
processData.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
-
onProcessData(&processData);
return nRet;
@@ -1350,11 +1442,8 @@
// 缓存Attribute，用于调试时显示信息
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
jobDataS.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
-
onReceivedJob(port, &jobDataS);
return nRet;
@@ -1363,7 +1452,16 @@
int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
{
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
- return 0;
+
+
+ // 可以在此更新JobDataS数据了
+ int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
+ if (nRet < 0) {
+ LOGE("<CEquipment-%s>onReceivedJob,更新JobDataS失败，glassUpdateJobDataS返回%d",
+ m_strName.c_str(), nRet);
+ }
+
+ return nRet;
}
int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
@@ -1374,11 +1472,8 @@
// 缓存Attribute，用于调试时显示信息
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
jobDataS.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
-
onSentOutJob(port, &jobDataS);
return nRet;
@@ -1387,17 +1482,6 @@
int CEquipment::onSentOutJob(int port, CJobDataS* pJobDataS)
{
LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
-
-
- // 可以在此更新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;
- }
- pGlass->updateJobDataS(pJobDataS);
return 0;
}
@@ -1449,7 +1533,7 @@
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 m_listener.onPreFethedOutJob(this, port, pJobDataB);
}
return TRUE;
@@ -1462,7 +1546,7 @@
BOOL bCheck = onPreFetchedOutJob(port, pJobDataB);
if (bCheck) {
- return fetchedOutJob(pJobDataB);
+ return fetchedOutJob(port, pJobDataB);
}
// 数据异常，处理或显示
@@ -1524,9 +1608,8 @@
// 缓存Attribute，用于调试时显示信息
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
vcrEventReport.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
// 0426, 先固定返回1(OK)
((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
@@ -1545,7 +1628,7 @@
index += sizeof(short);
CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
index += 128 * 2;
- CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+ CToolUnits::convertString(&pszData[index], 256 * 2, strPanelGradeData);
index += 256 * 2;
@@ -1560,6 +1643,15 @@
pStep->addAttribute(new CAttribute("PanelGradeData",
strPanelGradeData.c_str(), "", weight++));
+
+ // 更新检测结果
+ CGlass* pGlass = getGlassWithCassette(cassetteNo, jobSequenceNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>更新Panel Data失败，找不到对应的Glass.cassetteNo=%d, jobSequenceNo=%d",
+ getName().c_str(), cassetteNo, jobSequenceNo);
+ return -1;
+ }
+ pGlass->setInspResult(m_nID, 0, judgeStringToInspResult(strPanelJudgeData));
return 0;
}
@@ -1585,7 +1677,7 @@
return 0;
}
- int CEquipment::decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size)
+ int CEquipment::decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size)
{
int index = 0;
short cassetteSequenceNo, jobSequenceNo;
@@ -1593,24 +1685,9 @@
index += sizeof(short);
memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
index += sizeof(short);
+ cassetteSequenceNo = 4000;
+ jobSequenceNo = 1;
-
- // efme， 获取数据后返回
- // Cassette Sequence No 1W
- // Job Sequence No 1W
- // Job DataS 256W
- char szBuffer[1024];
- index = 0;
- memcpy(&szBuffer[index], &cassetteSequenceNo, sizeof(short));
- index += sizeof(short);
- memcpy(&szBuffer[index], &jobSequenceNo, sizeof(short));
- index += sizeof(short);
-
- CJobDataS* pJobDataS = getJobDataSWithCassette(cassetteSequenceNo, jobSequenceNo);
- if (pJobDataS != nullptr) {
- index += pJobDataS->serialize(&szBuffer[index], 1024 - sizeof(short) - sizeof(short));
- ((CEqReadStep*)pStep)->setReturnData(szBuffer, index);
- }
// 缓存Attribute，用于调试时显示信息
@@ -1621,6 +1698,164 @@
(std::to_string(jobSequenceNo)).c_str(), "", weight++));
+ return 0;
+ }
+
+ int CEquipment::decodeJobProcessStartReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ int port = (int)(__int64)pStep->getProp("Port");
+ LOGI("<CEquipment-%s>decodeJobProcessStartReport, port:%d", getName().c_str(), port);
+
+ short cassetteNo, jobSequenceNo, unitNo, subUnitNo, slotNo;
+ int year, month, day, hour, minute, second;
+
+ int index = 0;
+ memcpy(&cassetteNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&unitNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&subUnitNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&slotNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+
+ memcpy(&year, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ month = (int)pszData[index];
+ index += 1;
+ day = (int)pszData[index];
+ index += 1;
+ hour = (int)pszData[index];
+ index += 1;
+ minute = (int)pszData[index];
+ index += 1;
+ second = (int)pszData[index];
+ index += 1;
+
+ LOGI("<CEquipment-%s>cassetteNo:%d, jobSequenceNo:%d,unitNo:%d, subUnitNo:%d, slotNo:%d %d-%d-%d %d:%d:%d",
+ getName().c_str(),
+ cassetteNo,
+ jobSequenceNo,
+ unitNo,
+ subUnitNo,
+ slotNo,
+ year, month, day, hour, minute, second
+ );
+
+
+ if (m_processState != PROCESS_STATE::Processing) {
+ setProcessState(PROCESS_STATE::Processing);
+ }
+
+
+ // 缓存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("UnitNo",
+ std::to_string(unitNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SubUnitNo",
+ std::to_string(subUnitNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SlotNo",
+ std::to_string(slotNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("ProcessStartTime",
+ (std::to_string(year) + std::to_string(day) + std::to_string(day) + std::to_string(hour) + std::to_string(minute) + std::to_string(second)).c_str()
+ , "", weight++));
+
+ return 0;
+ }
+
+ int CEquipment::decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ int port = (int)(__int64)pStep->getProp("Port");
+ LOGI("<CEquipment-%s>decodeJobProcessEndReport, port:%d", getName().c_str(), port);
+
+ short cassetteNo, jobSequenceNo, unitNo, subUnitNo, slotNo;
+ int year, month, day, hour, minute, second;
+
+ 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);
+ memcpy(&unitNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&subUnitNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ memcpy(&slotNo, &pszData[index], sizeof(short));
+ index += sizeof(short);
+
+ memcpy(&year, &pszData[index], sizeof(short));
+ index += sizeof(short);
+ month = (int)pszData[index];
+ index += 1;
+ day = (int)pszData[index];
+ index += 1;
+ hour = (int)pszData[index];
+ index += 1;
+ minute = (int)pszData[index];
+ index += 1;
+ second = (int)pszData[index];
+ index += 1;
+
+ LOGI("<CEquipment-%s>cassetteNo:%d, jobSequenceNo:%d,unitNo:%d, subUnitNo:%d, slotNo:%d %d-%d-%d %d:%d:%d",
+ getName().c_str(),
+ cassetteNo,
+ jobSequenceNo,
+ unitNo,
+ subUnitNo,
+ slotNo,
+ year, month, day, hour, minute, second
+ );
+
+
+ if (m_processState != PROCESS_STATE::Complete) {
+ setProcessState(PROCESS_STATE::Complete);
+ }
+
+ CGlass* pGlass = getGlassFromSlot(slotNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>decodeJobProcessEndReport, 找不到对应glass", getName().c_str());
+ }
+ else {
+ CJobDataS* pJs = pGlass->getJobDataS();
+ if (pJs->getCassetteSequenceNo() == cassetteNo
+ && pJs->getJobSequenceNo() == jobSequenceNo) {
+ pGlass->processEnd(m_nID, getSlotUnit(slotNo));
+ if (m_processState != PROCESS_STATE::Complete) {
+ setProcessState(PROCESS_STATE::Complete);
+ }
+ }
+ else {
+ LOGE("<CEquipment-%s>decodeJobProcessEndReport, jobSequenceNo或jobSequenceNo不匹配",
+ getName().c_str());
+ }
+ }
+
+
+
+
+ // 缓存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("UnitNo",
+ std::to_string(unitNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SubUnitNo",
+ std::to_string(subUnitNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("SlotNo",
+ std::to_string(slotNo).c_str(), "", weight++));
+ pStep->addAttribute(new CAttribute("ProcessStartTime",
+ (std::to_string(year) + std::to_string(day) + std::to_string(day) + std::to_string(hour) + std::to_string(minute) + std::to_string(second)).c_str()
+ , "", weight++));
+
return 0;
}
@@ -1640,7 +1875,7 @@
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(),
+ 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;
@@ -1648,17 +1883,18 @@
// 如果没有可用位置，报错
Lock();
- CSlot* pSlot = getAvailableSlotForGlass((MaterialsType)pJobDataS->getMaterialsType());
- if (pSlot == nullptr) {
+ CSlot* pSlot = getSlot(putSlot - 1);
+ ASSERT(pSlot);
+ if (pSlot->getContext() != nullptr) {
Unlock();
- LOGE("<CFliper-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
+ 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, pJobDataB, putSlot)) {
+ if (!m_listener.onPreStoredJob(this, port, pJobDataB, putSlot)) {
return FALSE;
}
@@ -1678,11 +1914,11 @@
short putSlot = 0;
BOOL bCheck = onPreStoredJob(port, pJobDataB, putSlot);
if (bCheck) {
- return storedJob(pJobDataB, putSlot);
+ return storedJob(port, pJobDataB, putSlot);
}
// 数据异常，处理或显示
- LOGI("<CEquipment-%s>onStoredJob Error.ort:%d|GlassId:%s",
+ LOGI("<CEquipment-%s>onStoredJob Error.port:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
return -1;
}
@@ -1698,13 +1934,16 @@
* 当从CC-Link检测到设备Send Able为On时调用此函数
* 可能会多次重复调用(根据扫描频率), 注意防呆
*/
- int CEquipment::onSendAble()
+ int CEquipment::onSendAble(int port)
{
- LOGI("<CEquipment-%s>onSendAble.", m_strName.c_str());
+ LOGI("<CEquipment-%s>onSendAble.port:%d", m_strName.c_str(), port);
- if (m_processState != PROCESS_STATE::Complete) {
- setProcessState(PROCESS_STATE::Complete);
- }
+ return 0;
+ }
+
+ int CEquipment::onReceiveAble(int port)
+ {
+ LOGI("<CEquipment-%s>onReceiveAble.port:%d", m_strName.c_str(), port);
return 0;
}
@@ -1731,4 +1970,38 @@
return TRUE;
}
+
+ void CEquipment::printDebugString001()
+ {
+ for (int i = 0; i < 8; i++) {
+ LOGI("<CEquipment-%s>Link Signal to UP stream Path#%d, Signal:%s, %s, %s, %s",
+ m_strName.c_str(), i,
+ m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
+ m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
+ m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
+ m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
+ );
+ }
+ for (int i = 0; i < 8; i++) {
+ LOGI("<CEquipment-%s>Link Signal to Down stream Path#%d, Signal:%s, %s, %s, %s",
+ m_strName.c_str(), i,
+ m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
+ m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
+ m_bLinkSignalToDownstream[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
+ m_bLinkSignalToDownstream[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
+ );
+ }
+ }
+
+ InspResult CEquipment::judgeStringToInspResult(std::string& strJudge)
+ {
+ if (strJudge.compare("N") == 0) {
+ return InspResult::Fail;
+ }
+ if (strJudge.compare("G") == 0) {
+ return InspResult::Pass;
+ }
+
+ return InspResult::NotInspected;
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3