From d68541dce155a682f65b7c3fbfbfbeef17ea5b8f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期一, 12 五月 2025 12:00:41 +0800
Subject: [PATCH] 1.StoredJob, Fetched out Job实现; 2.CStep增加定制的Attribute, 以便通过的Step不使用getAttributeVector也能添加不一样的Attribute;

---
 SourceCode/Bond/Servo/CEquipment.cpp |  522 +++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 466 insertions(+), 56 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index e61b4b3..0bf4132 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "CEquipment.h"
 #include "ToolUnits.h"
+#include <regex>
+#include "CArm.h"
 
 
 #define CHECK_READ_STEP_SIGNAL(addr, data, size) {							\
@@ -23,8 +25,8 @@
 
 	CEquipment::CEquipment() : m_nID(0), m_strName(""), m_strDescription(""), m_station(0, 255)
 	{
-		m_listener = { nullptr, nullptr, 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;
@@ -33,6 +35,7 @@
 		m_bVCREnable[0] = FALSE;
 		m_pCclink = nullptr;
 		m_nBaseAlarmId = 0;
+		m_pArm = nullptr;
 		InitializeCriticalSection(&m_criticalSection);
 	}
 
@@ -67,11 +70,19 @@
 		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;
 	}
 
 	void CEquipment::setBaseAlarmId(int nBaseId)
@@ -130,6 +141,7 @@
 	void CEquipment::init()
 	{
 		initPins();
+		initSteps();
 		for (auto item : m_mapStep) {
 			item.second->init();
 		}
@@ -140,6 +152,11 @@
 		for (auto item : m_mapStep) {
 			item.second->term();
 		}
+	}
+
+	void CEquipment::initSteps()
+	{
+
 	}
 
 	void CEquipment::setID(int nID)
@@ -186,48 +203,50 @@
 	void CEquipment::getAttributeVector(CAttributeVector& attrubutes)
 	{
 		attrubutes.clear();
+
+		unsigned int weight = 0;
 		attrubutes.addAttribute(new CAttribute("Network",
-			std::to_string(m_station.nNetNo).c_str(), ""));
+			std::to_string(m_station.nNetNo).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Station",
-			std::to_string(m_station.nStNo).c_str(), ""));
+			std::to_string(m_station.nStNo).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("ID",
-			std::to_string(m_nID).c_str(), ""));
+			std::to_string(m_nID).c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Name",
-			m_strName.c_str(), ""));
+			m_strName.c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Description",
-			m_strDescription.c_str(), ""));
+			m_strDescription.c_str(), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Alive",
-			this->isAlive() ? _T("TRUE") : _T("FALSE"), ""));
+			this->isAlive() ? _T("TRUE") : _T("FALSE"), "", weight++));
 		attrubutes.addAttribute(new CAttribute("CIM State",
-			m_bCimState ? _T("ON") : _T("OFF"), ""));
+			m_bCimState ? _T("ON") : _T("OFF"), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Upstream",
-			m_bUpstreamInline ? _T("Inline") : _T("Offline"), ""));
+			m_bUpstreamInline ? _T("Inline") : _T("Offline"), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Downstream",
-			m_bDownstreamInline ? _T("Inline") : _T("Offline"), ""));
+			m_bDownstreamInline ? _T("Inline") : _T("Offline"), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Local Alarm",
-			m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), ""));
+			m_bLocalAlarm ? _T("TRUE") : _T("FALSE"), "", weight++));
 		attrubutes.addAttribute(new CAttribute("Auto Recipe Change",
-			m_bAutoRecipeChange ? _T("TRUE") : _T("FALSE"), ""));
+			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"), ""));
+				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(), ""));
+				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(), ""));
+				std::to_string((int)item->getType()).c_str(), "", weight++));
 		}
 
 		for (auto item : m_glassList) {
 			attrubutes.addAttribute(new CAttribute("Glass",
-				item->getID().c_str(), ""));
+				item->getID().c_str(), "", weight++));
 		}
 	}
 
@@ -311,7 +330,7 @@
 
 		// 以下解释和处理数据
 		BOOL bFlag;
-		int index = 0x340;
+		int index = 0x540;
 
 
 		// alive
@@ -328,7 +347,7 @@
 				}
 			}
 		}
-	
+
 		// CIM State
 		bFlag = isBitOn(pszData, size, ++index);
 		if (!equalBool(m_bCimState, bFlag)) {
@@ -362,7 +381,7 @@
 			m_bAutoRecipeChange = bFlag;
 		}
 
-		// AutoRecipeChange
+		// VCR Enable
 		bFlag = isBitOn(pszData, size, ++index);
 		if (!equalBool(m_bVCREnable[0], bFlag)) {
 			m_bVCREnable[0] = bFlag;
@@ -370,45 +389,86 @@
 
 
 		// 以下根据信号做流程处理
-		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++) {
-			CHECK_READ_STEP_SIGNAL(0x360 + i, pszData, size);
+			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(0x350, pszData, size);
+		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);
 
-		// Port1 ~ Port4
-		CHECK_READ_STEP_SIGNAL(0x3e0, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3e1, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3e2, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3e3, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3e8, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3e9, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3ea, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3eb, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3f0, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3f1, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3f2, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3f3, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3f8, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3f9, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3fa, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x3fb, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x400, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x401, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x402, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x403, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x408, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x409, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x40a, pszData, size);
-		CHECK_READ_STEP_SIGNAL(0x40b, 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_CASSETTIE_EMPTY, pszData, size);
@@ -495,11 +555,35 @@
 				int state = pEqAlarmStep->getAlarmState();
 				ASSERT(state == 0 || state == 1);
 				if (m_listener.onAlarm != nullptr) {
-					m_listener.onAlarm(this, state, 
+					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;
 			}
 		}
 
@@ -738,14 +822,340 @@
 		return pGlass;
 	}
 
+	int CEquipment::fetchedOut(const char* pszGlassId)
+	{
+		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(pszGlassId) == 0) {
+				pContext = (*iter);
+				m_glassList.erase(iter);
+				break;
+			}
+		}
+		if (pContext == nullptr) {
+			Unlock();
+			return -3;
+		}
+
+		((CArm*)m_pArm)->tempStore(pContext);
+		pContext->release();
+		Unlock();
+
+		if (m_listener.onDataChanged != nullptr) {
+			m_listener.onDataChanged(this, 0);
+		}
+
+		return 0;
+	}
+
+	int CEquipment::storedJob(const char* pszGlassId)
+	{
+		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();
+
+		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)
 	{
-		return CToolUnits::startsWith(pStep->getName(), "EQPort")
-			&& pStep->getName().find("Cassette") != std::string::npos;
+		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::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::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++));
+
+
+		onFetchedOut(port, jobDataB.getGlassId().c_str());
+
+		return index;
+	}
+
+	int CEquipment::onFetchedOut(int port, const char* pszGlassId)
+	{
+		LOGI("<CEquipment-%s>onFetchedOut:port:%d|GlassId:%s", 
+			m_strName.c_str(), port, pszGlassId);
+		return fetchedOut(pszGlassId);
+	}
+
+	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++));
+
+
+		onStore(port, jobDataB.getGlassId().c_str());
+
+		return index;
+	}
+
+	int CEquipment::onStore(int port, const char* pszGlassId)
+	{
+		LOGI("<CEquipment-%s>onStore:port:%d|GlassId:%s",
+			m_strName.c_str(), port, pszGlassId);
+		return storedJob(pszGlassId);
+	}
+}
\ No newline at end of file

--
Gitblit v1.9.3