From 958cfa6b2e1c1eec0e20edc50816ef18f10cbf09 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 29 五月 2025 15:50:34 +0800
Subject: [PATCH] 1. 修改本地模式Port设置界面 2. 添加Transfer数据库管理类

---
 SourceCode/Bond/Servo/CEquipment.cpp | 1224 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 1,206 insertions(+), 18 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index afd0c0e..e4d8c07 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1,14 +1,34 @@
 #include "stdafx.h"
 #include "CEquipment.h"
 #include "ToolUnits.h"
+#include <regex>
+#include "CArm.h"
+#include "CGlassPool.h"
+#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)
 	{
-		m_listener = { nullptr, nullptr };
-		m_alive = {FALSE, 0, FALSE};
+		m_listener = { nullptr, nullptr, nullptr, nullptr, nullptr };
+		m_alive = { FALSE, 0, FALSE };
 		m_bCimState = FALSE;
 		m_bUpstreamInline = FALSE;
 		m_bDownstreamInline = FALSE;
@@ -17,15 +37,31 @@
 		m_bVCREnable[0] = FALSE;
 		m_pCclink = nullptr;
 		m_nBaseAlarmId = 0;
+		m_pArm = nullptr;
 		InitializeCriticalSection(&m_criticalSection);
 	}
 
 	CEquipment::~CEquipment()
 	{
+		for (auto item : m_glassList) {
+			item->release();
+		}
+		m_glassList.clear();
+
 		for (auto item : m_mapStep) {
 			delete item.second;
 		}
 		m_mapStep.clear();
+
+		for (auto item : m_inputPins) {
+			delete item;
+		}
+		m_inputPins.clear();
+
+		for (auto item : m_outputPins) {
+			delete item;
+		}
+		m_outputPins.clear();
 
 		DeleteCriticalSection(&m_criticalSection);
 	}
@@ -34,11 +70,26 @@
 	{
 		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;
 	}
 
 	void CEquipment::setCcLink(CCCLinkIEControl* pCcLink)
 	{
 		m_pCclink = pCcLink;
+	}
+
+	void CEquipment::setArm(CEquipment* pEquipment)
+	{
+		ASSERT(pEquipment->isArm());
+		ASSERT(!this->isArm());
+		m_pArm = pEquipment;
+	}
+
+	CEquipment* CEquipment::getArm()
+	{
+		return m_pArm;
 	}
 
 	void CEquipment::setBaseAlarmId(int nBaseId)
@@ -72,11 +123,23 @@
 		return iter->second;
 	}
 
+	CStep* CEquipment::getStepWithName(const char* pszName)
+	{
+		for (auto item : m_mapStep) {
+			if (item.second->getName().compare(pszName) == 0) {
+				return item.second;
+			}
+		}
+
+		return nullptr;
+	}
+
 	int CEquipment::addStep(unsigned int addr, CStep* pStep)
 	{
 		auto iter = m_mapStep.find(addr);
 		if (iter != m_mapStep.end()) return -1;
 		pStep->setEquipment(this);
+		pStep->setID(addr);
 		pStep->setCcLink(m_pCclink);
 		m_mapStep[addr] = pStep;
 		return 0;
@@ -84,6 +147,8 @@
 
 	void CEquipment::init()
 	{
+		initPins();
+		initSteps();
 		for (auto item : m_mapStep) {
 			item.second->init();
 		}
@@ -94,6 +159,11 @@
 		for (auto item : m_mapStep) {
 			item.second->term();
 		}
+	}
+
+	void CEquipment::initSteps()
+	{
+
 	}
 
 	void CEquipment::setID(int nID)
@@ -135,6 +205,56 @@
 	const StationIdentifier& CEquipment::getStation()
 	{
 		return m_station;
+	}
+
+	void CEquipment::getAttributeVector(CAttributeVector& attrubutes)
+	{
+		attrubutes.clear();
+
+		unsigned int weight = 0;
+		attrubutes.addAttribute(new CAttribute("Network",
+			std::to_string(m_station.nNetNo).c_str(), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Station",
+			std::to_string(m_station.nStNo).c_str(), "", weight++));
+		attrubutes.addAttribute(new CAttribute("ID",
+			std::to_string(m_nID).c_str(), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Name",
+			m_strName.c_str(), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Description",
+			m_strDescription.c_str(), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Alive",
+			this->isAlive() ? _T("TRUE") : _T("FALSE"), "", weight++));
+		attrubutes.addAttribute(new CAttribute("CIM State",
+			m_bCimState ? _T("ON") : _T("OFF"), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Upstream",
+			m_bUpstreamInline ? _T("Inline") : _T("Offline"), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Downstream",
+			m_bDownstreamInline ? _T("Inline") : _T("Offline"), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Local Alarm",
+			m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), "", weight++));
+		attrubutes.addAttribute(new CAttribute("Auto Recipe Change",
+			m_bAutoRecipeChange ? _T("TRUE") : _T("FALSE"), "", weight++));
+		char szTemp[256];
+		for (int i = 0; i < VCR_MAX; i++) {
+			sprintf_s(szTemp, 256, "VCR-%d", i + 1);
+			attrubutes.addAttribute(new CAttribute(szTemp,
+				m_bVCREnable[i] ? _T("Enable") : _T("Disable"), "", weight++));
+		}
+
+		for (auto item : m_inputPins) {
+			attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
+				std::to_string((int)item->getType()).c_str(), "", weight++));
+		}
+
+		for (auto item : m_outputPins) {
+			attrubutes.addAttribute(new CAttribute(item->getName().c_str(),
+				std::to_string((int)item->getType()).c_str(), "", weight++));
+		}
+
+		for (auto item : m_glassList) {
+			attrubutes.addAttribute(new CAttribute("Glass",
+				item->getID().c_str(), "", weight++));
+		}
 	}
 
 	void CEquipment::setReadBitBlock(unsigned int start, unsigned int end)
@@ -183,7 +303,41 @@
 
 	void CEquipment::serialize(CArchive& ar)
 	{
-
+		if (ar.IsStoring()) {
+			Lock();
+			int count = (int)m_glassList.size();
+			ar << count;
+			for (auto item : m_glassList) {
+				item->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);
+			}
+			
+			// 梳理各玻璃之间的绑定关系
+			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());
+						}
+					}
+				}
+			}
+			Unlock();
+		}
 	}
 
 	void CEquipment::onReceiveLBData(const char* pszData, size_t size)
@@ -198,7 +352,7 @@
 
 		// 以下解释和处理数据
 		BOOL bFlag;
-		int index = 0x340;
+		int index = 0x540;
 
 
 		// alive
@@ -215,7 +369,7 @@
 				}
 			}
 		}
-	
+
 		// CIM State
 		bFlag = isBitOn(pszData, size, ++index);
 		if (!equalBool(m_bCimState, bFlag)) {
@@ -249,7 +403,7 @@
 			m_bAutoRecipeChange = bFlag;
 		}
 
-		// AutoRecipeChange
+		// VCR Enable
 		bFlag = isBitOn(pszData, size, ++index);
 		if (!equalBool(m_bVCREnable[0], bFlag)) {
 			m_bVCREnable[0] = bFlag;
@@ -257,19 +411,112 @@
 
 
 		// 以下根据信号做流程处理
-		CStep* pStep;
-
-		// Equipment Mode Change Report(0x360)
-		// Equipment Status Change Report(0x361)
-		// Equipment Alarm Change Report(0x362 ~ 0x366)
 		for (int i = 0; i < 7; i++) {
-			index = 0x360 + i;;
-			bFlag = isBitOn(pszData, size, index);
-			pStep = getStep(index);
-			if (pStep != nullptr) {
-				pStep->onSignal(bFlag);
-			}
+			CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
 		}
+
+		// process data report
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PROCESS_DATA_REPORT, pszData, size);
+
+		// 配方改变
+		CHECK_READ_STEP_SIGNAL(STEP_ID_CURRENT_RECIPE_CHANGE_REPORT, pszData, size);
+		
+		// 主配方上报
+		CHECK_READ_STEP_SIGNAL(STEP_ID_MASTER_RECIPE_LIST_REPORT, pszData, size);
+
+		// CIM Mode
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIMMODE_CHANGED_CMD_REPLY, pszData, size);
+
+		// CIM Message Set cmd reply
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_SET_CMD_REPLY, pszData, size);
+
+		// CIM Message Clear cmd reply
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_CIM_MSG_CLEAR_CMD_REPLY, pszData, size);
+
+		// Datetime set cmd reply
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_DATETIME_SET_CMD_REPLY, pszData, size);
+
+		// vcr enable cmd reply
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_VCR_ENABLE_CMD_REPLY, pszData, size);
+
+		// EQ mode change cmd reply
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_EQMODE_CHANGE_CMD_REPLY, pszData, size);
+
+		// EQ Master recipe request cmd reply
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_MASTER_RECIPE_LIST_CMD_REPLY, pszData, size);
+
+		// CIM Message Confirm
+		CHECK_READ_STEP_SIGNAL(STEP_ID_CIM_MSG_CONFIRM_REPORT, pszData, size);
+
+		// VCR1 Event report
+		CHECK_READ_STEP_SIGNAL(STEP_ID_VCR1_EVENT_REPORT, pszData, size);
+
+		// 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_SENT_OUT_JOB_DOWNS1, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_SENT_OUT_JOB_DOWNS2, pszData, size);
+
+		// Store Job Report #1~15
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT1, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT2, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT3, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT4, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT5, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT6, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT7, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT8, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT9, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT10, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT11, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT12, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT13, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT14, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_STORE_JOB_REPORT15, pszData, size);
+
+		// Fetched Out Job Report #1~15
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT1, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT2, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT3, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT4, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT5, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT6, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT7, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT8, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT9, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT10, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT11, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT12, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT13, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT14, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_FETCHED_OUT_JOB_REPORT15, pszData, size);
+
+
+		// CEqCassetteTranserStateStep
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT1_BLOCKED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT2_BLOCKED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_LOADED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_INUSE, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_UNLOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT3_BLOCKED, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_EMPTY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_LOAD_READY, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PORT4_LOADED, pszData, size);
+		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);
 	}
 
 	BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -321,4 +568,945 @@
 		if (index >= VCR_MAX) return FALSE;
 		return m_bVCREnable[index];
 	}
-}
+
+	int CEquipment::onStepEvent(CStep* pStep, int code)
+	{
+		if (code == STEP_EVENT_READDATA) {
+			if (isAlarmStep(pStep)) {
+				SERVO::CEqAlarmStep* pEqAlarmStep = (SERVO::CEqAlarmStep*)pStep;
+				int state = pEqAlarmStep->getAlarmState();
+				ASSERT(state == 0 || state == 1);
+				if (m_listener.onAlarm != nullptr) {
+					m_listener.onAlarm(this, state,
+						pEqAlarmStep->getAlarmId(),
+						pEqAlarmStep->getUnitId(),
+						pEqAlarmStep->getAlarmLevel());
+				}
+
+				return 1;
+			}
+			else if (isCimMessageConfirmStep(pStep)) {
+				SERVO::CEqReadIntStep* pEqReadIntStep = (SERVO::CEqReadIntStep*)pStep;
+				int value = pEqReadIntStep->getValue();
+				// 此处将value按高低位拆分为message id和panel no.
+				// 可能还需要上报到cim
+				short msgId, panelNo;
+				msgId = (value & 0xffff0000 >> 16);
+				panelNo = (value & 0xffff);
+				LOGI("Cim Message Confirm(msgID = %d, panel no.=%d).", msgId, panelNo);
+			}
+			/*
+			else if (isVcrEventStep(pStep)) {
+				SERVO::CEqVcrEventStep* pEqVcrEventStep = (SERVO::CEqVcrEventStep*)pStep;
+				CVcrEventReport* pVcrEventReport = pEqVcrEventStep->getVcrEventReport();
+				ASSERT(pVcrEventReport);
+				if (m_listener.onVcrEventReport != nullptr) {
+					m_listener.onVcrEventReport(this, pVcrEventReport);
+				}
+
+				// 0426, 先固定返回1(OK)
+				pEqVcrEventStep->setReturnCode(1);		
+				return 1;
+			}
+			*/
+		}
+
+
+		return 0;
+	}
+
+	CPin* CEquipment::addPin(PinType type, char* pszName)
+	{
+		// 不允许名字添加重复的pin
+		CPin* pPin = getPin(pszName);
+		if (pPin != nullptr) return nullptr;
+
+
+		// 添加到Pin列表,看是输入pin或输出pin
+		if (type == PinType::INPUT) {
+			pPin = new CPin(this, type, pszName);
+			m_inputPins.push_back(pPin);
+			return pPin;
+		}
+		else if (type == PinType::OUTPUT) {
+			pPin = new CPin(this, type, pszName);
+			m_outputPins.push_back(pPin);
+			return pPin;
+		}
+
+		return nullptr;
+	}
+
+	CPin* CEquipment::getPin(char* pszName)
+	{
+		for (auto item : m_inputPins) {
+			if (item->getName().compare(pszName) == 0) {
+				return item;
+			}
+		}
+
+		for (auto item : m_outputPins) {
+			if (item->getName().compare(pszName) == 0) {
+				return item;
+			}
+		}
+
+		return nullptr;
+	}
+
+	std::vector<CPin*>& CEquipment::getInputPins()
+	{
+		return m_inputPins;
+	}
+
+	std::vector<CPin*>& CEquipment::getOutputPins()
+	{
+		return m_outputPins;
+	}
+
+	int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
+	{
+		ASSERT(pPin);
+		CPin* pFromPin = pPin->getConnectedPin();
+		ASSERT(pFromPin);
+		CEquipment* pFromEq = pFromPin->getEquipment();
+		ASSERT(pFromEq);
+
+		LOGI("<CEquipment><%s-%s>收到来自<%s.%s>的Intent<%d,%s,0x%x>",
+			this->getName().c_str(),
+			pPin->getName().c_str(),
+			pFromEq->getName().c_str(),
+			pFromPin->getName().c_str(),
+			pIntent->getCode(),
+			pIntent->getMsg(),
+			pIntent->getContext());
+
+
+
+		// 以下解释处理数据
+		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)
+	{
+		if (m_pArm == nullptr) {
+			return -1;
+		}
+
+		// 找到指定的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);
+				break;
+			}
+		}
+		if (pContext == nullptr) {
+			Unlock();
+			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_listener.onDataChanged != nullptr) {
+			m_listener.onDataChanged(this, 0);
+		}
+
+		return 0;
+	}
+
+	int CEquipment::storedJob(CJobDataB* pJobDataB)
+	{
+		if (m_pArm == nullptr) {
+			return -1;
+		}
+
+		CGlass* pGlass = nullptr;
+		if (((CArm*)m_pArm)->tempFetchOut(pGlass) != 0) {
+			return -2;
+		}
+
+
+		ASSERT(pGlass);
+		Lock();
+		pGlass->addPath(m_nID);
+		pGlass->addRef();					// 加入list,addRef
+		m_glassList.push_back(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_listener.onDataChanged != nullptr) {
+			m_listener.onDataChanged(this, 0);
+		}
+
+		return 0;
+	}
+
+	BOOL CEquipment::isGlassListEmpty()
+	{
+		return m_glassList.empty();
+	}
+
+	bool CEquipment::isAlarmStep(SERVO::CStep* pStep)
+	{
+		return CToolUnits::startsWith(pStep->getName(), STEP_ALARM_START);
+	}
+
+	bool CEquipment::isPortTypeStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+Type$");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isPortModeStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+Mode$");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isPortCassetteTypeStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+CassetteType$");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isPortTransferModeStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+TransferMode$");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isPortEnableStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+Enable$");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isPortTypeAutoChangeEnableStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+CassetteType$");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isCassetteTransferStateStep(SERVO::CStep* pStep)
+	{
+		std::regex pattern("^EQPort\\d+Cassette.*");
+		return std::regex_match(pStep->getName(), pattern);
+	}
+
+	bool CEquipment::isCimMessageConfirmStep(SERVO::CStep* pStep)
+	{
+		return pStep->getName().compare(STEP_EQ_CIM_MESSAGE_CONFIRM) == 0;
+	}
+
+	bool CEquipment::isVcrEventStep(SERVO::CStep* pStep)
+	{
+		return pStep->getName().compare(STEP_EQ_VCR1_EVENT_REPORT) == 0;
+	}
+
+	int CEquipment::setEqMode(short mode)
+	{
+		SERVO::CEqModeChangeStep* pStep = (SERVO::CEqModeChangeStep*)getStepWithName(STEP_EQ_MODE_CHANGE);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		return pStep->setEqMode(mode);
+	}
+
+	int CEquipment::setCimMode(BOOL bOn)
+	{
+		SERVO::CEqCimModeChangeStep* pStep = (SERVO::CEqCimModeChangeStep*)getStepWithName(STEP_CIM_MODE_CHANGE);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		if (bOn)
+			return pStep->cimOn();
+		else 
+			return pStep->cimOff();
+	}
+
+	int CEquipment::setCimMessage(const char* pszMessage, short id, short nTouchPanelNo)
+	{
+		SERVO::CEqCimMessageCmdStep* pStep = (SERVO::CEqCimMessageCmdStep*)getStepWithName(STEP_CIM_MESSAGE_CMD);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		return pStep->setCimMessage(pszMessage, id, nTouchPanelNo);
+	}
+
+	int CEquipment::clearCimMessage(short id, short nTouchPanelNo)
+	{
+		SERVO::CEqCimMessageClearStep* pStep = (SERVO::CEqCimMessageClearStep*)getStepWithName(STEP_CIM_MESSAGE_CLEAR);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		return pStep->clearCimMessage(id, nTouchPanelNo);
+	}
+
+	int CEquipment::setDateTime(short year, short month, short day, short hour, short minute, short second)
+	{
+		SERVO::CEqDateTimeSetCmdStep* pStep = (SERVO::CEqDateTimeSetCmdStep*)getStepWithName(STEP_DATETIME_SET_CMD);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		return pStep->setDateTime(year, month, day, hour, minute, second);
+	}
+
+	int CEquipment::setDispatchingMode(DISPATCHING_MODE mode, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_DISPATCHINT_MODE_CHANGE);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		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());
+				}
+				else {
+					LOGI("<CEquipment-%s>设置DispatchingMode失败,code:%d", m_strName.c_str(), code);
+				}
+
+				return 0;
+				});
+		}
+
+		return 0;
+	}
+
+	int CEquipment::indexerOperationModeChange(IDNEXER_OPERATION_MODE mode, ONWRITED onWritedBlock/* = nullptr*/)
+	{
+		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EFEM_IN_OP_MODE_CHANGE);
+		if (pStep == nullptr) {
+			return -1;
+		}
+
+		unsigned short operationMode = (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);
+				}
+
+				return 0;
+				});
+		}
+
+		return 0;
+	}
+
+	int CEquipment::masterRecipeListRequest(short unitNo)
+	{
+		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);
+		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);
+			}
+			else {
+				m_recipesManager.syncFailed();
+				LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败,code:%d", m_strName.c_str(), unitNo, code);
+			}
+
+			return 0;
+		});
+		return 0;
+	}
+
+	int CEquipment::recipeParameterRequest(short masterRecipeId, short localRecipeId, short unitNo)
+	{
+		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);
+		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);
+			}
+			else {
+				m_recipesManager.syncFailed();
+				LOGI("<CEquipment-%s>请求单元<%d>主配方列表失败,code:%d", m_strName.c_str(), unitNo, code);
+			}
+
+			return 0;
+			});
+		return 0;
+	}
+
+	short CEquipment::decodeRecipeListReport(const char* pszData, size_t size)
+	{
+		return m_recipesManager.decodeRecipeListReport(pszData, size);
+	}
+
+	short CEquipment::decodeRecipeParameterReport(const char* pszData, size_t size)
+	{
+		return m_recipesManager.decodeRecipeParameterReport(pszData, size);
+	}
+
+	int CEquipment::decodeProcessDataReport(CStep* pStep, const char* pszData, size_t size)
+	{
+		CProcessData processData;
+		int nRet = processData.unserialize(&pszData[0], (int)size);
+		if (nRet < 0) return nRet;
+
+		// 缓存Attribute,用于调试时显示信息
+		unsigned int weight = 201;
+		CAttributeVector attrubutes;
+		processData.getAttributeVector(attrubutes, weight);
+		pStep->addAttributeVector(attrubutes);
+
+
+		onProcessData(&processData);
+
+		return nRet;
+	}
+
+	int CEquipment::decodeReceivedJobReport(CStep* pStep, int port, const char* pszData, size_t size)
+	{
+		CJobDataS jobDataS;
+		int nRet = jobDataS.unserialize(&pszData[0], (int)size);
+		if (nRet < 0) return nRet;
+
+		// 缓存Attribute,用于调试时显示信息
+		unsigned int weight = 201;
+		CAttributeVector attrubutes;
+		jobDataS.getAttributeVector(attrubutes, weight);
+		pStep->addAttributeVector(attrubutes);
+
+
+		onReceivedJob(port, &jobDataS);
+
+		return nRet;
+	}
+
+	int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
+	{
+		LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
+
+		addJobDataS(pJobDataS);
+		return 0;
+	}
+
+	int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
+	{
+		CJobDataS jobDataS;
+		int nRet = jobDataS.unserialize(&pszData[0], (int)size);
+		if (nRet < 0) return nRet;
+
+		// 缓存Attribute,用于调试时显示信息
+		unsigned int weight = 201;
+		CAttributeVector attrubutes;
+		jobDataS.getAttributeVector(attrubutes, weight);
+		pStep->addAttributeVector(attrubutes);
+
+
+		onReceivedJob(port, &jobDataS);
+
+		return nRet;
+	}
+
+	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;
+	}
+
+	int CEquipment::decodeFetchedOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
+	{
+		int index = 0;
+		short unitOrPort, unitOrPortNo, subUnitNo, subSlotNo;
+		CJobDataB jobDataB;
+		int nRet = jobDataB.unserialize(&pszData[index], (int)size);
+		if (nRet < 0) return nRet;
+		index += nRet;
+
+		memcpy(&unitOrPort, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&unitOrPortNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&subUnitNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&subSlotNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+
+
+		// 缓存Attribute,用于调试时显示信息
+		unsigned int weight = 201;
+		pStep->addAttribute(new CAttribute("UnitOrPort",
+			std::to_string(unitOrPort).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("UnitOrPortNo",
+			std::to_string(unitOrPortNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SubUnitNo",
+			std::to_string(subUnitNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SubSlotNo",
+			std::to_string(subSlotNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("CassetteSequenceNo",
+			std::to_string(jobDataB.getCassetteSequenceNo()).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("JobSequenceNo",
+			std::to_string(jobDataB.getJobSequenceNo()).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("GlassId",
+			jobDataB.getGlassId().c_str(), "", weight++));
+
+
+		onFetchedOutJob(port, &jobDataB);
+
+		return index;
+	}
+
+	int CEquipment::onPreFetchedOutJob(int port, CJobDataB* pJobDataB)
+	{
+		LOGI("<CEquipment-%s>onPreFetchedOutJob:port:%d|GlassId:%s",
+			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+		return TRUE;
+	}
+
+	int CEquipment::onFetchedOutJob(int port, CJobDataB* pJobDataB)
+	{
+		LOGI("<CEquipment-%s>onFetchedOutJob:port:%d|GlassId:%s", 
+			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+
+		BOOL bCheck = onPreFetchedOutJob(port, pJobDataB);
+		if (bCheck) {
+			return fetchedOutJob(pJobDataB);
+		}
+
+		// 数据异常,处理或显示
+		LOGI("<CEquipment-%s>onFetchedOutJob Error.ort:%d|GlassId:%s",
+			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+		return -1;
+	}
+
+	int CEquipment::decodeStoredJobReport(CStep* pStep, int port, const char* pszData, size_t size)
+	{
+		int index = 0;
+		short unitOrPort, unitOrPortNo, subUnitNo, subSlotNo;
+		CJobDataB jobDataB;
+		int nRet = jobDataB.unserialize(&pszData[index], (int)size);
+		if (nRet < 0) return nRet;
+		index += nRet;
+
+		memcpy(&unitOrPort, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&unitOrPortNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&subUnitNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&subSlotNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+
+
+		// 缓存Attribute,用于调试时显示信息
+		unsigned int weight = 201;
+		pStep->addAttribute(new CAttribute("UnitOrPort",
+			std::to_string(unitOrPort).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("UnitOrPortNo",
+			std::to_string(unitOrPortNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SubUnitNo",
+			std::to_string(subUnitNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SubSlotNo",
+			std::to_string(subSlotNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("CassetteSequenceNo",
+			std::to_string(jobDataB.getCassetteSequenceNo()).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("JobSequenceNo",
+			std::to_string(jobDataB.getJobSequenceNo()).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("GlassId",
+			jobDataB.getGlassId().c_str(), "", weight++));
+
+
+		onStoredJob(port, &jobDataB);
+
+		return index;
+	}
+
+	int CEquipment::decodeVCREventReport(CStep* pStep, const char* pszData, size_t size)
+	{
+		CVcrEventReport vcrEventReport;
+		vcrEventReport.unserialize(pszData, 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);
+
+		// 0426, 先固定返回1(OK)
+		((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
+
+		return 0;
+	}
+
+	int CEquipment::onPreStoredJob(int port, CJobDataB* pJobDataB)
+	{
+		LOGI("<CEquipment-%s>onPreStoredJob:port:%d|GlassId:%s",
+			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+		return TRUE;
+	}
+
+	int CEquipment::onStoredJob(int port, CJobDataB* pJobDataB)
+	{
+		LOGI("<CEquipment-%s>onStore:port:%d|GlassId:%s",
+			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+
+		BOOL bCheck = onPreStoredJob(port, pJobDataB);
+		if (bCheck) {
+			addJobDataB(pJobDataB);
+			return storedJob(pJobDataB);
+		}
+
+		// 数据异常,处理或显示
+		LOGI("<CEquipment-%s>onStoredJob Error.ort:%d|GlassId:%s",
+			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
+		return -1;
+	}
+
+	int CEquipment::onProcessData(CProcessData* pProcessData)
+	{
+		LOGI("<CEquipment-%s>onProcessData.", m_strName.c_str());
+		return 0;
+	}
+
+	int CEquipment::getIndexerOperationModeBaseValue()
+	{
+		return 0;
+	}
+
+	int CEquipment::addJobDataB(CJobDataB* pJobDataB)
+	{
+		// 添加之前先删除旧的,以免数据重复
+		Lock();
+		int count = removeJobDataB(pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
+		if (count > 0) {
+			LOGE("<CEquipment-%s>addJobDataB,删除重复数据 %d 条,注意排查风险", m_strName.c_str(), count);
+		}
+
+		m_listJobDataB.push_back(std::move(*pJobDataB));
+		Unlock();
+
+		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;
+	}
+}
\ No newline at end of file

--
Gitblit v1.9.3