From 6e0341c6356cdb6e527fbd89d1dc876f4e47ce46 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期五, 09 一月 2026 20:37:50 +0800
Subject: [PATCH] 1.Trace Data，ProcessData, SVData等上报
---
SourceCode/Bond/Servo/CEquipment.cpp | 1595 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 1,177 insertions(+), 418 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 9a6ebfc..2cddb34 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1,33 +1,19 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
#include "CEquipment.h"
#include "ToolUnits.h"
#include <regex>
#include "CArm.h"
#include "CGlassPool.h"
#include "Servo.h"
+#include "GlassJson.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)
{
- m_listener = { nullptr, nullptr, nullptr, nullptr, nullptr };
+ m_bEnable = TRUE;
+ m_listener = { };
m_alive = { FALSE, 0, FALSE };
m_bCimState = FALSE;
m_bUpstreamInline = FALSE;
@@ -35,18 +21,24 @@
m_bLocalAlarm = FALSE;
m_bAutoRecipeChange = FALSE;
m_bVCREnable[0] = FALSE;
+ memset(m_bLinkSignalToUpstream, 0, sizeof(m_bLinkSignalToUpstream));
+ memset(m_bLinkSignalToDownstream, 0, sizeof(m_bLinkSignalToDownstream));
m_pCclink = nullptr;
m_nBaseAlarmId = 0;
m_pArm = nullptr;
+ m_blockReadBit = { 0 };
+ m_nTestFlag = 0;
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;
@@ -66,13 +58,19 @@
DeleteCriticalSection(&m_criticalSection);
}
+ void CEquipment::SetEnable(BOOL bEnable)
+ {
+ m_bEnable = bEnable;
+ }
+
+ BOOL CEquipment::IsEnabled() const
+ {
+ return m_bEnable;
+ }
+
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)
@@ -105,7 +103,7 @@
void CEquipment::getProperties(std::vector<std::pair<std::string, std::string>>& container)
{
container.clear();
- // 示例：将一些属性添加到容器
+ // 绀轰緥锛氬皢涓�浜涘睘鎬ф坊鍔犲埌瀹瑰櫒
container.push_back(std::make_pair("DeviceName", "ServoMotor"));
container.push_back(std::make_pair("SerialNumber", "123456789"));
container.push_back(std::make_pair("Version", "1.0"));
@@ -145,10 +143,24 @@
return 0;
}
+ void CEquipment::setProcessState(int nSlotNo, PROCESS_STATE state)
+ {
+ if (nSlotNo <= 0 || nSlotNo > 8) return;
+
+ const auto prevState = m_processState[nSlotNo - 1];
+ m_processState[nSlotNo - 1] = state;
+ onProcessStateChanged(nSlotNo, prevState, m_processState[nSlotNo - 1]);
+
+ if (m_listener.onProcessStateChanged != nullptr) {
+ m_listener.onProcessStateChanged(this, nSlotNo, prevState, m_processState[nSlotNo - 1]);
+ }
+ }
+
void CEquipment::init()
{
initPins();
initSteps();
+ initSlots();
for (auto item : m_mapStep) {
item.second->init();
}
@@ -251,9 +263,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++));
+ }
+ }
+
}
}
@@ -286,7 +316,7 @@
void CEquipment::onTimer(UINT nTimerid)
{
- // 每隔一秒，检查一下ALIVE状态
+ // 姣忛殧涓�绉掞紝妫�鏌ヤ竴涓婣LIVE鐘舵��
static int tick = 0;
tick++;
@@ -305,38 +335,71 @@
{
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) {
+ const std::string pretty = GlassJson::ToPrettyString(*pGlass);
+ CString strPretty = CString(pretty.c_str());
+ ar << strPretty;
+
+ CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) {
+ const std::string prettyBuddy = GlassJson::ToPrettyString(*pBuddy);
+ CString strPrettyBuddy = CString(prettyBuddy.c_str());
+ ar << strPrettyBuddy;
+ }
+ }
}
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) {
+ CString strPretty;
+ std::string pretty;
+ ar >> strPretty;
+ pretty = (LPTSTR)(LPCTSTR)strPretty;
+ if (!pretty.empty()) {
+ CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
+ GlassJson::FromString(pretty, *pGlass);
+ m_slot[i].setContext(pGlass);
+
+ if (!pGlass->getBuddyId().empty()) {
+ CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
+ CString strPrettyBuddy;
+ std::string prettyBuddy;
+ ar >> strPrettyBuddy;
+ prettyBuddy = (LPTSTR)(LPCTSTR)strPrettyBuddy;
+ GlassJson::FromString(prettyBuddy, *pBuddy);
+ 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 +413,38 @@
}
*/
- // 以下解释和处理数据
+ // 杩炴帴淇″彿瑙ｉ噴鍜屼繚瀛�
BOOL bFlag;
- int index = 0x540;
+ int index = 0;
+ for (int i = 0; i < 8; i++) {
+ 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);
+ }
+ }
+
+
+ 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;
// alive
@@ -361,7 +453,7 @@
m_alive.flag = bFlag;
m_alive.count = 0;
- // 状态
+ // 鐘舵��
if (!m_alive.alive) {
m_alive.alive = TRUE;
if (m_listener.onAlive != nullptr) {
@@ -410,7 +502,7 @@
}
- // 以下根据信号做流程处理
+ // 浠ヤ笅鏍规嵁淇″彿鍋氭祦绋嬪鐞�
for (int i = 0; i < 7; i++) {
CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
}
@@ -418,11 +510,26 @@
// process data report
CHECK_READ_STEP_SIGNAL(STEP_ID_PROCESS_DATA_REPORT, pszData, size);
- // 配方改变
+ // FAC Data report
+ // CHECK_READ_STEP_SIGNAL(STEP_ID_FAC_DATA_REPORT, pszData, size);
+ {
+ SERVO::CStep* pStep = getStep(STEP_ID_FAC_DATA_REPORT);
+ if (pStep != nullptr) {
+ ((CReadStep*)pStep)->onReadSignal(TRUE);
+ }
+ }
+
+
+ // 閰嶆柟鏀瑰彉
CHECK_READ_STEP_SIGNAL(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pszData, size);
- // 主配方上报
+ // 涓婚厤鏂逛笂鎶�
CHECK_READ_STEP_SIGNAL(STEP_ID_MASTER_RECIPE_LIST_REPORT, pszData, size);
+
+ // 閰嶆柟鍙傛暟
+ CHECK_WRITE_STEP_SIGNAL(STEP_ID_RECIPE_PARAMETER_CMD_REPLY, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIPE_PARAMETER_REPORT, pszData, size);
+
// CIM Mode
CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pszData, size);
@@ -454,8 +561,12 @@
// EQ Job Event
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS1, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS3, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_RECIVE_JOB_UPS4, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS1, pszData, size);
CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS3, pszData, size);
+ CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS4, pszData, size);
// Store Job Report #1~15
CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT1, pszData, size);
@@ -517,6 +628,30 @@
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_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)
@@ -569,6 +704,50 @@
return m_bVCREnable[index];
}
+ BOOL CEquipment::isLinkSignalUpstreamOn(unsigned int path, unsigned int signal)
+ {
+ if (path >= PATH_MAX) return FALSE;
+ if (signal >= SIGNAL_MAX) return FALSE;
+ return m_bLinkSignalToUpstream[path][signal];
+ }
+
+ 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_bLinkSignalToUpstream[path][signal] = bOn;
+ }
+
+ void CEquipment::setLinkSignalUpstreamBlock(unsigned int path, BOOL* pSignal)
+ {
+ if (path >= PATH_MAX) return;
+ for (int i = 0; i < SIGNAL_MAX; 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];
+ }
+ }
+
int CEquipment::onStepEvent(CStep* pStep, int code)
{
if (code == STEP_EVENT_READDATA) {
@@ -588,8 +767,8 @@
else if (isCimMessageConfirmStep(pStep)) {
SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
int value = pEqReadIntStep->getValue();
- // 此处将value按高低位拆分为message id和panel no.
- // 可能还需要上报到cim
+ // 姝ゅ灏唙alue鎸夐珮浣庝綅鎷嗗垎涓簃essage id鍜宲anel no.
+ // 鍙兘杩橀渶瑕佷笂鎶ュ埌cim
short msgId, panelNo;
msgId = (value & 0xffff0000 >> 16);
panelNo = (value & 0xffff);
@@ -604,7 +783,7 @@
m_listener.onVcrEventReport(this, pVcrEventReport);
}
- // 0426, 先固定返回1(OK)
+ // 0426, 鍏堝浐瀹氳繑鍥�1(OK)
pEqVcrEventStep->setReturnCode(1);
return 1;
}
@@ -617,12 +796,12 @@
CPin* CEquipment::addPin(PinType type, char* pszName)
{
- // 不允许名字添加重复的pin
+ // 涓嶅厑璁稿悕瀛楁坊鍔犻噸澶嶇殑pin
CPin* pPin = getPin(pszName);
if (pPin != nullptr) return nullptr;
- // 添加到Pin列表，看是输入pin或输出pin
+ // 娣诲姞鍒癙in鍒楄〃锛岀湅鏄緭鍏in鎴栬緭鍑簆in
if (type == PinType::INPUT) {
pPin = new CPin(this, type, pszName);
m_inputPins.push_back(pPin);
@@ -664,6 +843,21 @@
return m_outputPins;
}
+ CRecipeList* CEquipment::getRecipeList(int unitNo)
+ {
+ return m_recipesManager.getRecipeList(unitNo);
+ }
+
+ bool CEquipment::saveRecipeList(int unitNo, std::string& strFilepath)
+ {
+ return m_recipesManager.saveRecipeList(unitNo, strFilepath);
+ }
+
+ bool CEquipment::readRecipeList(int unitNo, std::string& strFilepath)
+ {
+ return m_recipesManager.readRecipeList(unitNo, strFilepath);
+ }
+
int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
{
ASSERT(pPin);
@@ -672,7 +866,7 @@
CEquipment* pFromEq = pFromPin->getEquipment();
ASSERT(pFromEq);
- LOGI("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
+ LOGD("<CEquipment><%s-%s>鏀跺埌鏉ヨ嚜<%s.%s>鐨処ntent<%d,%s,0x%x>",
this->getName().c_str(),
pPin->getName().c_str(),
pFromEq->getName().c_str(),
@@ -683,202 +877,34 @@
- // 以下解释处理数据
+ // 浠ヤ笅瑙ｉ噴澶勭悊鏁版嵁
int code = pIntent->getCode();
- // 测试
+ // 娴嬭瘯
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)
+ int CEquipment::fetchedOutJob(int port, CJobDataB* pJobDataB)
{
if (m_pArm == nullptr) {
return -1;
}
- // 找到指定的glass id,
+ // 鎵惧埌鎸囧畾鐨刧lass 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 +913,23 @@
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[port] != PROCESS_STATE::Ready) {
+ setProcessState(port, 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(int port, CJobDataB* pJobDataB, short putSlot)
{
if (m_pArm == nullptr) {
return -1;
@@ -925,34 +943,119 @@
ASSERT(pGlass);
Lock();
- pGlass->addPath(m_nID);
- pGlass->addRef(); // 加入list,addRef
- m_glassList.push_back(pGlass);
- pGlass->release(); // tempFetchOut需要调用一次release
+ pGlass->addPath(m_nID, getSlotUnit(putSlot), putSlot);
+ CGlass* pBuddy = pGlass->getBuddy();
+ if (pBuddy != nullptr) pBuddy->addPath(m_nID, getSlotUnit(putSlot), putSlot);
+ m_slot[putSlot - 1].setContext(pGlass);
+ pGlass->release(); // tempFetchOut闇�瑕佽皟鐢ㄤ竴娆elease
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)
+ {
+ 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;
+ }
+
+ 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)
+ {
+ 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)
@@ -1072,17 +1175,17 @@
return -1;
}
- LOGI("<CEquipment-%s>准备设置DispatchingMode<%d>", m_strName.c_str(), (int)mode);
+ LOGI("<CEquipment-%s>鍑嗗璁剧疆DispatchingMode<%d>", m_strName.c_str(), (int)mode);
if (onWritedBlock != nullptr) {
pStep->writeShort((short)mode, onWritedBlock);
}
else {
pStep->writeShort((short)mode, [&, mode](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>设置DispatchingMode成功.", m_strName.c_str());
+ LOGI("<CEquipment-%s>璁剧疆DispatchingMode鎴愬姛.", m_strName.c_str());
}
else {
- LOGI("<CEquipment-%s>设置DispatchingMode失败，code:%d", m_strName.c_str(), code);
+ LOGE("<CEquipment-%s>璁剧疆DispatchingMode澶辫触锛宑ode:%d", m_strName.c_str(), code);
}
return 0;
@@ -1092,52 +1195,58 @@
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);
- }
+ LOGI("<CEquipment-%s>鍑嗗璁剧疆indexerOperationMode<%d>", m_strName.c_str(), (int)mode);
+ 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 {
+ LOGE("<CEquipment-%s>璁剧疆indexerOperationMode澶辫触锛宑ode:%d", m_strName.c_str(), code);
+ }
- return 0;
- });
- }
+ if (onWritedRetBlock != nullptr) {
+ onWritedRetBlock(code, retCode);
+ }
+
+ return 0;
+ });
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) {
return -1;
}
- LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>姝ｅ湪璇锋眰鍗曞厓<%d>涓婚厤鏂瑰垪琛�", m_strName.c_str(), unitNo);
+ m_recipesManager.setOnSyncingStateChanged(block);
if (m_recipesManager.syncing() != 0) {
return -2;
}
pStep->writeShort(unitNo, [&, unitNo](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表成功，正在等待数据.", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>璇锋眰鍗曞厓<%d>涓婚厤鏂瑰垪琛ㄦ垚鍔燂紝姝ｅ湪绛夊緟鏁版嵁.", m_strName.c_str(), unitNo);
}
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;
@@ -1145,28 +1254,318 @@
return 0;
}
- int CEquipment::recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo)
+ int CEquipment::recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo, ONSYNCINGSTATECHANGED block)
{
- SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
+ LOGI("<CEquipment-%s>姝ｅ湪璇锋眰鍗曞厓<%d>涓婚厤鍙傛暟鍒楄〃", m_strName.c_str(), unitNo);
+ m_recipesManager.setOnSyncingStateChanged(block);
+ if (m_recipesManager.syncing() != 0) {
+ return -2;
+ }
+
+ SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_RECIPE_PARAMETER_REQ);
if (pStep == nullptr) {
return -1;
}
- LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
- if (m_recipesManager.syncing() != 0) {
- return -2;
- }
- pStep->writeShort(unitNo, [&, unitNo](int code) -> int {
+ char szBuffer[14 * 2] = {0};
+ int index = 0;
+ memcpy(&szBuffer[index], &masterRecipeId, sizeof(short));
+ index += sizeof(short);
+ memcpy(&szBuffer[index], &localRecipeId, sizeof(short));
+ index += sizeof(short);
+ memcpy(&szBuffer[index], &unitNo, sizeof(short));
+
+ pStep->writeDataEx(szBuffer, 14 * 2, [&, unitNo](int code) -> int {
if (code == WOK) {
- LOGI("<CEquipment-%s>请求单元<%d>主配方列表成功，正在等待数据.", m_strName.c_str(), unitNo);
+ LOGI("<CEquipment-%s>璇锋眰鍗曞厓<%d>涓婚厤鏂瑰弬鏁板垪琛ㄦ垚鍔燂紝姝ｅ湪绛夊緟鏁版嵁.", m_strName.c_str(), unitNo);
}
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;
- });
+ });
+
+ 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;
+ 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;
+ 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;
+
+ 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::isSlotAvailable(unsigned int slot)
+ {
+ if (slot >= 8) return nullptr;
+ if (!m_slot[slot].isEnable()) return nullptr;
+ if (m_slot[slot].isLock()) return nullptr;
+ if (!m_slot[slot].isEmpty()) return nullptr;
+ int lsPath = m_slot[slot].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]) return nullptr;
+
+ return &m_slot[slot];
+ }
+
+ 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, BOOL bJobMode/* = FALSE*/)
+ {
+ for (int i = 0; i < SLOT_MAX; i++) {
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 001");
+ if (!m_slot[i].isEnable()) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 002");
+ if (m_slot[i].isLock()) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 003");
+ CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+ if (!isSlotProcessed(i)) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 004");
+ if (pGlass == nullptr) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 005");
+ if (!pGlass->isScheduledForProcessing()) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 006");
+ if (bJobMode && pGlass->getProcessJob() == nullptr) continue;
+ 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) LOGD("getProcessedSlot 008");
+ MaterialsType glassType = pGlass->getType();
+ if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 009");
+ if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
+ if (m_nTestFlag == 1) LOGD("getProcessedSlot 00a");
+ 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;
+ if (!isSlotProcessed(i+1)) 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;
+
+ 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::getProcessedSlotCt(unsigned int slot)
+ {
+ if (slot >= 8) return nullptr;
+ if (!m_slot[slot].isEnable()) return nullptr;
+ if (m_slot[slot].isLock()) return nullptr;
+ CGlass* pGlass = (CGlass*)m_slot[slot].getContext();
+ if (pGlass == nullptr) return nullptr;
+ int lsPath = m_slot[slot].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]) return nullptr;
+
+ return &m_slot[slot];
+ }
+
+ 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->isScheduledForProcessing()) 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;
+ }
+
+ CSlot* CEquipment::getSlot(int index)
+ {
+ if (index >= SLOT_MAX) return nullptr;
+ return &m_slot[index];
+ }
+
+ CSlot* CEquipment::getSlotWithNo(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;
+ }
+
+ return pSlot;
+ }
+
+ 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;
+ }
+
+ BOOL CEquipment::slotHasGlass(int slotIndex/* = 0*/)
+ {
+ ASSERT(slotIndex < 8);
+ CGlass* pGlass = (CGlass*)m_slot[slotIndex].getContext();
+ return (pGlass != nullptr);
+ }
+
+ 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);
+ if (m_listener.onDataChanged != nullptr) {
+ m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
+ }
+
return 0;
}
@@ -1186,14 +1585,45 @@
int nRet = processData.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
processData.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
-
onProcessData(&processData);
+
+
+
+ // 鎵惧埌鐜荤拑锛屽叧鑱旀暟鎹�
+ CGlass* pGlass = this->getGlassWithCassette(processData.getCassetteSequenceNo(),
+ processData.getJobSequenceNo());
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>鎵句笉鍒板搴擥lass, 鍏宠仈宸ヨ壓鍙傛暟澶辫触銆侰assetteSequenceNo:%d/%d",
+ this->getName().c_str(),
+ processData.getCassetteSequenceNo(),
+ processData.getJobSequenceNo());
+ return -1;
+ }
+
+ auto rawData = processData.getParamsRawData();
+ std::vector<CParam> tempParams;
+ this->parsingProcessData((const char*)rawData.data(), rawData.size(), tempParams);
+ int n = processData.getTotalParameter();
+ std::vector<CParam> params(tempParams.begin(), tempParams.begin() + (std::min)(n, (int)tempParams.size()));
+ pGlass->addParams(params);
+ if (m_listener.onProcessDataReport != nullptr) {
+ m_listener.onProcessDataReport(this, params);
+ }
+
+ // 鍏宠仈鐨凣lass涔熻鏇存柊
+ CGlass* pBuddy = pGlass->getBuddy();
+ LOGI("<Equipment-%s>decodeProcessDataReport pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
+ if (pBuddy != nullptr) {
+ LOGI("<Equipment-%s>decodeProcessDataReport addParams pBuddy=%x %s", getName().c_str(), pBuddy, pGlass->getID().c_str());
+ pBuddy->addParams(params);
+ if (m_listener.onProcessDataReport != nullptr) {
+ m_listener.onProcessDataReport(this, params);
+ }
+ }
return nRet;
}
@@ -1204,13 +1634,10 @@
int nRet = jobDataS.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
jobDataS.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
-
onReceivedJob(port, &jobDataS);
return nRet;
@@ -1220,8 +1647,15 @@
{
LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
- addJobDataS(pJobDataS);
- return 0;
+
+ // 鍙互鍦ㄦ鏇存柊JobDataS鏁版嵁浜�
+ int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
+ if (nRet < 0) {
+ LOGE("<CEquipment-%s>onReceivedJob,鏇存柊JobDataS澶辫触锛実lassUpdateJobDataS杩斿洖%d",
+ m_strName.c_str(), nRet);
+ }
+
+ return nRet;
}
int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
@@ -1230,14 +1664,11 @@
int nRet = jobDataS.unserialize(&pszData[0], (int)size);
if (nRet < 0) return nRet;
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
- CAttributeVector attrubutes;
+ CAttributeVector& attrubutes = pStep->attributeVector();
jobDataS.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
-
-
- onReceivedJob(port, &jobDataS);
+ onSentOutJob(port, &jobDataS);
return nRet;
}
@@ -1245,14 +1676,6 @@
int CEquipment::onSentOutJob(int port, CJobDataS* pJobDataS)
{
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);
- }
- else {
- LOGE("<CEquipment-%s>onSentOutJob,删除数据 %d 条，注意排查风险", m_strName.c_str(), count);
- }
return 0;
}
@@ -1276,7 +1699,7 @@
index += sizeof(short);
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("UnitOrPort",
std::to_string(unitOrPort).c_str(), "", weight++));
@@ -1299,10 +1722,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, port, pJobDataB);
+ }
+
return TRUE;
}
@@ -1313,10 +1740,10 @@
BOOL bCheck = onPreFetchedOutJob(port, pJobDataB);
if (bCheck) {
- return fetchedOutJob(pJobDataB);
+ return fetchedOutJob(port, pJobDataB);
}
- // 数据异常，处理或显示
+ // 鏁版嵁寮傚父锛屽鐞嗘垨鏄剧ず
LOGI("<CEquipment-%s>onFetchedOutJob Error.ort:%d|GlassId:%s",
m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
return -1;
@@ -1341,7 +1768,7 @@
index += sizeof(short);
- // 缓存Attribute，用于调试时显示信息
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
unsigned int weight = 201;
pStep->addAttribute(new CAttribute("UnitOrPort",
std::to_string(unitOrPort).c_str(), "", weight++));
@@ -1367,28 +1794,322 @@
int CEquipment::decodeVCREventReport(CStep* pStep, const char* pszData, size_t size)
{
CVcrEventReport vcrEventReport;
- vcrEventReport.unserialize(pszData, size);
+ vcrEventReport.unserialize(pszData, (int)size);
LOGI("<CEquipment-%s>decodeVCREventReport<Result:%d, GlassId:%s>\n", m_strName.c_str(),
vcrEventReport.getVcrResult(),
vcrEventReport.getGlassId().c_str());
- // 缓存Attribute，用于调试时显示信息
- unsigned int weight = 201;
- CAttributeVector attrubutes;
- vcrEventReport.getAttributeVector(attrubutes, weight);
- pStep->addAttributeVector(attrubutes);
+ // 鏇存柊Glass鐨処D
+ CGlass* pGlass = getGlassWithCassette(vcrEventReport.getCassetteSequenceNo(),
+ vcrEventReport.getJobSequenceNo());
+ if (pGlass != nullptr) {
+ pGlass->setID(vcrEventReport.getGlassId().c_str());
+ }
+
- // 0426, 先固定返回1(OK)
+ // 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
+ unsigned int weight = 201;
+ CAttributeVector& attrubutes = pStep->attributeVector();
+ vcrEventReport.getAttributeVector(attrubutes, weight);
+
+
+ // 0426, 鍏堝浐瀹氳繑鍥�1(OK)
((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
+
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, strPanelGradeData);
+ 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++));
+
+
+ // 鏇存柊妫�娴嬬粨鏋�
+ CGlass* pGlass = getGlassWithCassette(cassetteNo, jobSequenceNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>鏇存柊Panel Data澶辫触锛屾壘涓嶅埌瀵瑰簲鐨凣lass.cassetteNo=%d, jobSequenceNo=%d",
+ getName().c_str(), cassetteNo, jobSequenceNo);
+ return -1;
+ }
+ auto result = judgeStringToInspResult(strPanelJudgeData);
+ pGlass->setInspResult(m_nID, 0, result);
+
+ if (m_listener.onPanelDataReport != nullptr) {
+ m_listener.onPanelDataReport(this, pGlass);
+ }
+
+ return 0;
+ }
+
+ int CEquipment::decodeFacDataReport(CStep* pStep, const char* pszData, size_t size)
+ {
+ CSVData svData;
+ int nRet = svData.unserialize(&pszData[0], (int)size);
+ if (nRet < 0) return nRet;
+ m_svDatas.push_back(svData);
+
+ if (m_listener.onSVDataReport != nullptr) {
+ m_listener.onSVDataReport(this, &svData);
+ }
+
+ 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::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
+ );
+
+ CGlass* pGlass = getGlassFromSlot(slotNo);
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>decodeJobProcessStartReport, 鎵句笉鍒板搴攇lass", getName().c_str());
+ }
+ if (slotNo <= 0 || slotNo > 8) return -1;
+
+ if (m_processState[slotNo -1] != PROCESS_STATE::Processing) {
+ Lock();
+ m_svDatas.clear();
+ Unlock();
+ setProcessState(slotNo, 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
+ );
+
+
+ CGlass* pGlass = getGlassFromSlot(slotNo);
+ if (m_processState[slotNo - 1] != PROCESS_STATE::Complete) {
+ setProcessState(slotNo, PROCESS_STATE::Complete);
+ }
+
+ if (pGlass == nullptr) {
+ LOGE("<CEquipment-%s>decodeJobProcessEndReport, 鎵句笉鍒板搴攇lass", getName().c_str());
+ }
+ else {
+ CJobDataS* pJs = pGlass->getJobDataS();
+ if (pJs->getCassetteSequenceNo() == cassetteNo
+ && pJs->getJobSequenceNo() == jobSequenceNo) {
+ pGlass->processEnd(m_nID, getSlotUnit(slotNo));
+ }
+ else {
+ LOGE("<CEquipment-%s>decodeJobProcessEndReport, jobSequenceNo鎴杍obSequenceNo涓嶅尮閰�",
+ 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;
+ }
+
+ 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());
+
+ // 褰撳墠瑕佸瓨鐗囷紝涔嬪墠鑲畾鏈夋嫈鐗囷紝鍥犳鐗囧瓙鍦ˋrm閭ｉ噷
+ 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("<CEquipemnt-%s>onPreStoredJob,JobData鏁版嵁涓嶅尮閰�(JobDataB(%d, %d),JobDataS(%d, %d)), 娉ㄦ剰鎺掓煡椋庨櫓!", m_strName.c_str(),
+ pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
+ pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
+ return FALSE;
+ }
+
+ // 濡傛灉娌℃湁鍙敤浣嶇疆锛屾姤閿�
+ Lock();
+ CSlot* pSlot = getSlot(putSlot - 1);
+ ASSERT(pSlot);
+ if (pSlot->getContext() != nullptr) {
+ Unlock();
+ 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, port, pJobDataB, putSlot)) {
+ return FALSE;
+ }
+
+ if(!canPlaceGlassInSlot(putSlot - 1)) {
+ return FALSE;
+ }
+ }
+
return TRUE;
}
@@ -1397,14 +2118,14 @@
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(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;
}
@@ -1412,6 +2133,30 @@
int CEquipment::onProcessData(CProcessData* pProcessData)
{
LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
+
+ return 0;
+ }
+
+ /*
+ * 褰撲粠CC-Link妫�娴嬪埌璁惧Send Able涓篛n鏃惰皟鐢ㄦ鍑芥暟
+ * 鍙兘浼氬娆￠噸澶嶈皟鐢�(鏍规嵁鎵弿棰戠巼), 娉ㄦ剰闃插憜
+ */
+ int CEquipment::onSendAble(int port)
+ {
+ // LOGI("<CEquipment-%s>onSendAble.port:%d", m_strName.c_str(), port);
+
+ return 0;
+ }
+
+ int CEquipment::onReceiveAble(int port)
+ {
+ // LOGI("<CEquipment-%s>onReceiveAble.port:%d", m_strName.c_str(), port);
+
+ return 0;
+ }
+
+ int CEquipment::onProcessStateChanged(int nSlotNo, PROCESS_STATE prevState, PROCESS_STATE state)
+ {
return 0;
}
@@ -1420,93 +2165,107 @@
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();
+ return TRUE;
}
- int CEquipment::removeJobDataB(int nCassetteSequenceNo, int nJobSequenceNo)
+ void CEquipment::printDebugString001()
{
- 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;
- }
+ 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"
+ );
}
-
- return count;
+ 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"
+ );
+ }
}
- CJobDataB* CEquipment::getJobDataB(int nCassetteSequenceNo, int nJobSequenceNo)
+ InspResult CEquipment::judgeStringToInspResult(std::string& strJudge)
{
- for (auto& item : m_listJobDataB) {
- if (item.getCassetteSequenceNo() == nCassetteSequenceNo
- && item.getJobSequenceNo() == nJobSequenceNo) {
- return &item;
- }
+ if (strJudge.compare("N") == 0) {
+ return InspResult::Fail;
+ }
+ if (strJudge.compare("G") == 0) {
+ return InspResult::Pass;
}
- return nullptr;
+ return InspResult::NotInspected;
}
- int CEquipment::addJobDataS(CJobDataS* pJobDataS)
+ float CEquipment::toFloat(const char* pszAddr)
{
- // 添加之前先删除旧的，以免数据重复
- Lock();
- int count = removeJobDataS(pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
- if (count > 0) {
- LOGE("<CEquipment-%s>addJobDataS,删除重复数据 %d 条，注意排查风险", m_strName.c_str(), count);
+ BYTE szBuffer[4];
+ szBuffer[0] = pszAddr[0];
+ szBuffer[1] = pszAddr[1];
+ szBuffer[2] = pszAddr[2];
+ szBuffer[3] = pszAddr[3];
+ float f = 0.0;
+ memcpy(&f, szBuffer, 4);
+
+ return f;
+ }
+
+ int CEquipment::parsingParams(const char* pszData, size_t size, std::string& strOut)
+ {
+ std::vector<CParam> params;
+ int nRet = parsingParams(pszData, size, params);
+ if (nRet <= 0) return nRet;
+
+ char szBuffer[256];
+ for (auto p : params) {
+ if(!strOut.empty()) strOut.append(",");
+ if (p.getValueType() == PVT_INT) {
+ sprintf_s(szBuffer, 256, "%s:%d", p.getName().c_str(), p.getIntValue());
+ }
+ else if (p.getValueType() == PVT_DOUBLE) {
+ sprintf_s(szBuffer, 256, "%s:%f", p.getName().c_str(), p.getDoubleValue());
+ }
+ strOut.append(szBuffer);
}
- m_listJobDataS.push_back(std::move(*pJobDataS));
- Unlock();
+ return 0;
+ };
- return (int)m_listJobDataB.size();
- }
-
- int CEquipment::removeJobDataS(int nCassetteSequenceNo, int nJobSequenceNo)
+ void CEquipment::addFacDataReportStep(int dataDev, int writeSignalDev, int port)
{
- 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;
- }
+ CEqReadStep* pStep = new CEqReadStep(dataDev, 133 * 2,
+ [&](void* pFrom, int code, const char* pszData, size_t size) -> int {
+ if (code == ROK && pszData != nullptr && size > 0) {
+ decodeFacDataReport((CStep*)pFrom, pszData, size);
+ }
+ return -1;
+ });
+ pStep->setName(STEP_EQ_FAC_DATA_REPORT);
+ pStep->setProp("Port", (void*)(__int64)port);
+ pStep->setReadContinue(TRUE);
+ pStep->setWriteSignalDev(writeSignalDev);
+ if (addStep(STEP_ID_FAC_DATA_REPORT, pStep) != 0) {
+ delete pStep;
}
- Unlock();
-
- return count;
}
- CJobDataS* CEquipment::getJobDataS(int nCassetteSequenceNo, int nJobSequenceNo)
+ std::vector<SERVO::CSVData>& CEquipment::getSVDatas()
{
- for (auto& item : m_listJobDataS) {
- if (item.getCassetteSequenceNo() == nCassetteSequenceNo
- && item.getJobSequenceNo() == nJobSequenceNo) {
- return &item;
- }
- }
-
- return nullptr;
+ return m_svDatas;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3