From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示

---
 SourceCode/Bond/Servo/CEquipment.cpp |  829 +++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 661 insertions(+), 168 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index 5518246..599a79c 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -1,32 +1,18 @@
-#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_bEnable = TRUE;
 		m_listener = { };
 		m_alive = { FALSE, 0, FALSE };
 		m_bCimState = FALSE;
@@ -40,8 +26,8 @@
 		m_pCclink = nullptr;
 		m_nBaseAlarmId = 0;
 		m_pArm = nullptr;
-		m_processState = PROCESS_STATE::Ready;
 		m_blockReadBit = { 0 };
+		m_nTestFlag = 0;
 		InitializeCriticalSection(&m_criticalSection);
 	}
 
@@ -70,6 +56,16 @@
 		m_outputPins.clear();
 
 		DeleteCriticalSection(&m_criticalSection);
+	}
+
+	void CEquipment::SetEnable(BOOL bEnable)
+	{
+		m_bEnable = bEnable;
+	}
+
+	BOOL CEquipment::IsEnabled() const
+	{
+		return m_bEnable;
 	}
 
 	void CEquipment::setListener(EquipmentListener listener)
@@ -107,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"));
@@ -147,13 +143,16 @@
 		return 0;
 	}
 
-	void CEquipment::setProcessState(PROCESS_STATE state)
+	void CEquipment::setProcessState(int nSlotNo, PROCESS_STATE state)
 	{
-		m_processState = state;
-		onProcessStateChanged(m_processState);
+		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, m_processState);
+			m_listener.onProcessStateChanged(this, nSlotNo, prevState, m_processState[nSlotNo - 1]);
 		}
 	}
 
@@ -207,6 +206,21 @@
 	std::string& CEquipment::getDescription()
 	{
 		return m_strDescription;
+	}
+
+	void CEquipment::setCurrentRecipe(const std::string& recipe)
+	{
+		Lock();
+		m_currentRecipe = recipe;
+		Unlock();
+	}
+
+	std::string CEquipment::getCurrentRecipe()
+	{
+		Lock();
+		std::string out = m_currentRecipe;
+		Unlock();
+		return out;
 	}
 
 	void CEquipment::setStation(int network, int station)
@@ -317,7 +331,7 @@
 
 	void CEquipment::onTimer(UINT nTimerid)
 	{
-		// 每隔一秒，检查一下ALIVE状态
+		// 姣忛殧涓�绉掞紝妫�鏌ヤ竴涓婣LIVE鐘舵��
 
 		static int tick = 0;
 		tick++;
@@ -339,11 +353,16 @@
 			for (int i = 0; i < SLOT_MAX; i++) {
 				m_slot[i].serialize(ar);
 				CGlass* pGlass = (CGlass *)m_slot[i].getContext();
-				if (pGlass != nullptr) {					
-					pGlass->serialize(ar);
+				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) {
-						pBuddy->serialize(ar);
+						const std::string prettyBuddy = GlassJson::ToPrettyString(*pBuddy);
+						CString strPrettyBuddy = CString(prettyBuddy.c_str());
+						ar << strPrettyBuddy;
 					}
 				}
 			}
@@ -353,18 +372,30 @@
 			for (int i = 0; i < SLOT_MAX; i++) {
 				m_slot[i].serialize(ar);
 				if (m_slot[i].getTempContext() != nullptr) {
-					CGlass* pGlass = theApp.m_model.m_glassPool.allocaGlass();
-					pGlass->serialize(ar);
-					m_slot[i].setContext(pGlass);
-					if (pGlass->getBuddy() != nullptr) {
-						CGlass* pBuddy = theApp.m_model.m_glassPool.allocaGlass();
-						pBuddy->serialize(ar);
-						pGlass->forceSetBuddy(pBuddy);
+					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();
 			for (int i = 0; i < SLOT_MAX; i++) {
@@ -376,7 +407,7 @@
 							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());
+								TRACE("缁戝畾鍏崇郴: %s <- %s\n", pGlass->getID().c_str(), pBudy->getID().c_str());
 							}
 						}
 					}
@@ -397,7 +428,7 @@
 		}
 		*/
 
-		// 连接信号解释和保存
+		// 杩炴帴淇″彿瑙ｉ噴鍜屼繚瀛�
 		BOOL bFlag;
 		int index = 0;
 		for (int i = 0; i < 8; i++) {
@@ -406,10 +437,12 @@
 			m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
 			m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
 			index += 0x40;
+
+			if (m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE]) {
+				onSendAble(i+1);
+			}
 		}		 
-		if(m_bLinkSignalToUpstream[0][SIGNAL_SEND_ABLE]) {
-			onSendAble();
-		}
+
 
 		index += 0x40 * 2;
 		for (int i = 0; i < 8; i++) {
@@ -418,12 +451,14 @@
 			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();
+
+			if (m_bLinkSignalToDownstream[0][SIGNAL_RECEIVE_ABLE]) {
+				onReceiveAble(i + 1);
+			}
 		}
 
-		// 其它信号及响应
+
+		// 鍏跺畠淇″彿鍙婂搷搴�
 		index = 0x540;
 
 
@@ -433,7 +468,7 @@
 			m_alive.flag = bFlag;
 			m_alive.count = 0;
 
-			// 状态
+			// 鐘舵��
 			if (!m_alive.alive) {
 				m_alive.alive = TRUE;
 				if (m_listener.onAlive != nullptr) {
@@ -482,7 +517,7 @@
 		}
 
 
-		// 以下根据信号做流程处理
+		// 浠ヤ笅鏍规嵁淇″彿鍋氭祦绋嬪鐞�
 		for (int i = 0; i < 7; i++) {
 			CHECK_READ_STEP_SIGNAL(STEP_ID_EQMODE_CHANGED + i, pszData, size);
 		}
@@ -490,11 +525,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);
@@ -526,8 +576,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);
@@ -597,13 +651,22 @@
 		CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);
 
 		// Panel Data Report
-		CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);
+		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)
@@ -716,11 +779,21 @@
 
 				return 1;
 			}
+			else if (pStep->getName().compare(STEP_STATUS) == 0) {
+				SERVO::CEqStatusStep* pEqStatusStep = (SERVO::CEqStatusStep*)pStep;
+				if (m_listener.onEqStatusChanged != nullptr) {
+					const unsigned int unitId = pEqStatusStep->getUnitId();
+					const int status = pEqStatusStep->getStatus(unitId);
+					const int reason = pEqStatusStep->getReasonCode(unitId);
+					m_listener.onEqStatusChanged(this, (int)unitId, status, reason);
+				}
+				return 1;
+			}
 			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);
@@ -735,7 +808,7 @@
 					m_listener.onVcrEventReport(this, pVcrEventReport);
 				}
 
-				// 0426, 先固定返回1(OK)
+				// 0426, 鍏堝浐瀹氳繑鍥�1(OK)
 				pEqVcrEventStep->setReturnCode(1);		
 				return 1;
 			}
@@ -748,12 +821,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);
@@ -800,6 +873,16 @@
 		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);
@@ -808,7 +891,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(),
@@ -819,11 +902,11 @@
 
 
 
-		// 以下解释处理数据
+		// 浠ヤ笅瑙ｉ噴澶勭悊鏁版嵁
 		int code = pIntent->getCode();
 
 
-		// 测试
+		// 娴嬭瘯
 		if (code == FLOW_TEST) {
 			AfxMessageBox(pIntent->getMsg());
 		}
@@ -832,13 +915,13 @@
 		return 0;
 	}
 
-	int CEquipment::fetchedOutJob(CJobDataB* pJobDataB)
+	int CEquipment::fetchedOutJob(int port, CJobDataB* pJobDataB)
 	{
 		if (m_pArm == nullptr) {
 			return -1;
 		}
 
-		// 找到指定的glass id, 
+		// 鎵惧埌鎸囧畾鐨刧lass id, 
 		Lock();
 		CGlass* pContext = nullptr;
 		for (int i = 0; i < SLOT_MAX; i++) {
@@ -855,14 +938,13 @@
 			return -3;
 		}
 
-
 		((CArm*)m_pArm)->tempStore(pContext);
 		pContext->release();
 		Unlock();
 
 
-		if (m_processState != PROCESS_STATE::Ready) {
-			setProcessState(PROCESS_STATE::Ready);
+		if (m_processState[port] != PROCESS_STATE::Ready) {
+			setProcessState(port, PROCESS_STATE::Ready);
 		}
 
 		if (m_listener.onDataChanged != nullptr) {
@@ -872,7 +954,7 @@
 		return 0;
 	}
 
-	int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
+	int CEquipment::storedJob(int port, CJobDataB* pJobDataB, short putSlot)
 	{
 		if (m_pArm == nullptr) {
 			return -1;
@@ -886,19 +968,23 @@
 
 		ASSERT(pGlass);
 		Lock();
-		pGlass->addPath(m_nID, getSlotUnit(putSlot));
+		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需要调用一次release
+		pGlass->release();				// tempFetchOut闇�瑕佽皟鐢ㄤ竴娆elease
 		Unlock();
 
+		/*
 		if (m_processState != PROCESS_STATE::Processing) {
 			setProcessState(PROCESS_STATE::Processing);
 		}
+		*/
 
 		if (m_listener.onDataChanged != nullptr) {
 			m_listener.onDataChanged(this, EDCC_STORED_JOB);
 		}
-		
+
 		return 0;
 	}
 
@@ -946,7 +1032,6 @@
 
 	CGlass* CEquipment::getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo)
 	{
-		CSlot* pSlot = nullptr;
 		for (int i = 0; i < SLOT_MAX; i++) {
 			if (!m_slot[i].isEnable()) continue;
 			CGlass* pGlass = (CGlass*)m_slot[i].getContext();
@@ -961,6 +1046,22 @@
 
 
 		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)
@@ -1099,17 +1200,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;
@@ -1127,19 +1228,19 @@
 		}
 
 		unsigned short operationMode = (unsigned short)((unsigned short)mode + getIndexerOperationModeBaseValue());
-		LOGI("<CEquipment-%s>准备设置indexerOperationMode<%d>", m_strName.c_str(), (int)mode);
+		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());
+				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);
+				LOGI("<CEquipment-%s>杩斿洖鍊�: %d", m_strName.c_str(), retCode);
 			}
 			else {
-				LOGI("<CEquipment-%s>设置indexerOperationMode失败，code:%d", m_strName.c_str(), code);
+				LOGE("<CEquipment-%s>璁剧疆indexerOperationMode澶辫触锛宑ode:%d", m_strName.c_str(), code);
 			}
 
 			if (onWritedRetBlock != nullptr) {
@@ -1159,18 +1260,18 @@
 			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;
@@ -1178,28 +1279,39 @@
 		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;
 	}
 
@@ -1264,6 +1376,12 @@
 					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;
@@ -1274,6 +1392,21 @@
 		}
 
 		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)
@@ -1294,23 +1427,35 @@
 		return nullptr;
 	}
 
-	CSlot* CEquipment::getProcessedSlot(MaterialsType putSlotType)
+	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];
 		}
 
@@ -1326,6 +1471,7 @@
 					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]
@@ -1344,10 +1490,60 @@
 		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()
@@ -1372,6 +1568,13 @@
 		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;
@@ -1384,6 +1587,10 @@
 
 		if (pSlot == nullptr) return -1;
 		pSlot->setContext(nullptr);
+		if (m_listener.onDataChanged != nullptr) {
+			m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
+		}
+
 		return 0;
 	}
 
@@ -1403,14 +1610,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;
 	}
@@ -1421,13 +1659,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;
@@ -1436,7 +1671,20 @@
 	int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
 	{
 		LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
-		return 0;
+
+
+		// 鍙互鍦ㄦ鏇存柊JobDataS鏁版嵁浜�
+		int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
+		if (nRet < 0) {
+			LOGE("<CEquipment-%s>onReceivedJob,鏇存柊JobDataS澶辫触锛実lassUpdateJobDataS杩斿洖%d",
+				m_strName.c_str(), nRet);
+		}
+
+		if (m_listener.onReceivedJob != nullptr) {
+			m_listener.onReceivedJob(this, port, pJobDataS);
+		}
+
+		return nRet;
 	}
 
 	int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
@@ -1445,13 +1693,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);
-
-
 		onSentOutJob(port, &jobDataS);
 
 		return nRet;
@@ -1461,16 +1706,9 @@
 	{
 		LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
 
-
-		// 可以在此更新JobDataS数据了
-		CGlass* pGlass = getGlass(pJobDataS->getGlass1Id().c_str());
-		if (pGlass == nullptr) {
-			LOGE("<CEquipment-%s>onSentOutJob,没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d, ID=%s)，请检查数据，注意风险。",
-				m_strName.c_str(), pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo(),
-				pJobDataS->getGlass1Id().c_str());
-			return -1;
+		if (m_listener.onSentOutJob != nullptr) {
+			m_listener.onSentOutJob(this, port, pJobDataS);
 		}
-		pGlass->updateJobDataS(pJobDataS);
 
 		return 0;
 	}
@@ -1494,7 +1732,7 @@
 		index += sizeof(short);
 
 
-		// 缓存Attribute，用于调试时显示信息
+		// 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
 		unsigned int weight = 201;
 		pStep->addAttribute(new CAttribute("UnitOrPort",
 			std::to_string(unitOrPort).c_str(), "", weight++));
@@ -1522,7 +1760,7 @@
 		LOGI("<CEquipment-%s>onPreFetchedOutJob:port:%d|GlassId:%s",
 			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
 		if (m_listener.onPreFethedOutJob != nullptr) {
-			return m_listener.onPreFethedOutJob(this, pJobDataB);
+			return m_listener.onPreFethedOutJob(this, port, pJobDataB);
 		}
 
 		return TRUE;
@@ -1535,10 +1773,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;
@@ -1563,7 +1801,7 @@
 		index += sizeof(short);
 
 
-		// 缓存Attribute，用于调试时显示信息
+		// 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
 		unsigned int weight = 201;
 		pStep->addAttribute(new CAttribute("UnitOrPort",
 			std::to_string(unitOrPort).c_str(), "", weight++));
@@ -1589,20 +1827,29 @@
 	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;
 	}
@@ -1618,11 +1865,11 @@
 		index += sizeof(short);
 		CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
 		index += 128 * 2;
-		CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+		CToolUnits::convertString(&pszData[index], 256 * 2, strPanelGradeData);
 		index += 256 * 2;
 
 
-		// 缓存Attribute，用于调试时显示信息
+		// 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
 		unsigned int weight = 201;
 		pStep->addAttribute(new CAttribute("CassetteNo",
 			std::to_string(cassetteNo).c_str(), "", weight++));
@@ -1634,26 +1881,35 @@
 			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)
 	{
-		int index = 0;
-		std::string strSvTimeRecord, strSvData;
-		CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
-		index += 128 * 2;
-		CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
-		index += 256 * 2;
+		CSVData svData;
+		int nRet = svData.unserialize(&pszData[0], (int)size);
+		if (nRet < 0) return nRet;
+		Lock();
+		m_svDatas.push_back(svData);
+		Unlock();
 
-
-		// 缓存Attribute，用于调试时显示信息
-		unsigned int weight = 201;
-		pStep->addAttribute(new CAttribute("SV Time Record",
-			strSvTimeRecord.c_str(), "", weight++));
-		pStep->addAttribute(new CAttribute("SV Data",
-			strSvData.c_str(), "", weight++));
-
+		if (m_listener.onSVDataReport != nullptr) {
+			m_listener.onSVDataReport(this, &svData);
+		}
 
 		return 0;
 	}
@@ -1671,7 +1927,7 @@
 
 
 
-		// 缓存Attribute，用于调试时显示信息
+		// 缂撳瓨Attribute锛岀敤浜庤皟璇曟椂鏄剧ず淇℃伅
 		unsigned int weight = 201;
 		pStep->addAttribute(new CAttribute("CassetteSequenceNo",
 			(std::to_string(cassetteSequenceNo)).c_str(), "", weight++));
@@ -1682,15 +1938,178 @@
 		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());
 
-		// 当前要存片，之前肯定有拔片，因此片子在Arm那里
+		// 褰撳墠瑕佸瓨鐗囷紝涔嬪墠鑲畾鏈夋嫈鐗囷紝鍥犳鐗囧瓙鍦ˋrm閭ｉ噷
 		CGlass* pGlass = ((CArm*)m_pArm)->getGlassFromSlot(1);
 		if (pGlass == nullptr) {
-			LOGE("<CFliper-%s>onPreStoredJob,缓存中没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)，请检查数据，注意风险。", m_strName.c_str(),
+			LOGE("<CFliper-%s>onPreStoredJob,缂撳瓨涓病鏈夋壘鍒板搴旂殑Glass(CassetteSequenceNo:%d, JobSequenceNo:%d)锛岃妫�鏌ユ暟鎹紝娉ㄦ剰椋庨櫓銆�", m_strName.c_str(),
 				pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo());
 			return FALSE;
 		}
@@ -1698,25 +2117,26 @@
 		CJobDataS* pJobDataS = pGlass->getJobDataS();
 		ASSERT(pJobDataS);
 		if (!compareJobData(pJobDataB, pJobDataS)) {
-			LOGE("<CEquipemnt-%s>onPreFetchedOutJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
+			LOGE("<CEquipemnt-%s>onPreStoredJob,JobData鏁版嵁涓嶅尮閰�(JobDataB(%d, %d),JobDataS(%d, %d)), 娉ㄦ剰鎺掓煡椋庨櫓!", m_strName.c_str(),
 				pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
 				pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
 			return FALSE;
 		}
 
-		// 如果没有可用位置，报错
+		// 濡傛灉娌℃湁鍙敤浣嶇疆锛屾姤閿�
 		Lock();
-		CSlot* pSlot = getAvailableSlotForGlassExcludeSignal((MaterialsType)pJobDataS->getMaterialsType());
-		if (pSlot == nullptr) {
+		CSlot* pSlot = getSlot(putSlot - 1);
+		ASSERT(pSlot);
+		if (pSlot->getContext() != nullptr) {
 			Unlock();
-			LOGE("<CEquipemnt-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
+			LOGE("<CEquipemnt-%s>onPreStoredJob,鎸囧畾slot(port:%d)鏈夋枡锛岃娉ㄦ剰椋庨櫓锛�", m_strName.c_str(), port);
 			return FALSE;
 		}
 		Unlock();
 
 
 		if (m_listener.onPreStoredJob != nullptr) {
-			if (!m_listener.onPreStoredJob(this, pJobDataB, putSlot)) {
+			if (!m_listener.onPreStoredJob(this, port, pJobDataB, putSlot)) {
 				return FALSE;
 			}
 
@@ -1736,11 +2156,11 @@
 		short putSlot = 0;
 		BOOL bCheck = onPreStoredJob(port, pJobDataB, putSlot);
 		if (bCheck) {
-			return storedJob(pJobDataB, putSlot);
+			return storedJob(port, pJobDataB, putSlot);
 		}
 
-		// 数据异常，处理或显示
-		LOGI("<CEquipment-%s>onStoredJob Error.ort:%d|GlassId:%s",
+		// 鏁版嵁寮傚父锛屽鐞嗘垨鏄剧ず
+		LOGI("<CEquipment-%s>onStoredJob Error.port:%d|GlassId:%s",
 			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
 		return -1;
 	}
@@ -1753,28 +2173,24 @@
 	}
 
 	/*
-	 * 当从CC-Link检测到设备Send Able为On时调用此函数
-	 * 可能会多次重复调用(根据扫描频率), 注意防呆
+	 * 褰撲粠CC-Link妫�娴嬪埌璁惧Send Able涓篛n鏃惰皟鐢ㄦ鍑芥暟
+	 * 鍙兘浼氬娆￠噸澶嶈皟鐢�(鏍规嵁鎵弿棰戠巼), 娉ㄦ剰闃插憜
 	 */
-	int CEquipment::onSendAble()
+	int CEquipment::onSendAble(int port)
 	{
-		LOGI("<CEquipment-%s>onSendAble.", m_strName.c_str());
-
-		if (m_processState != PROCESS_STATE::Complete) {
-			setProcessState(PROCESS_STATE::Complete);
-		}
+		// LOGI("<CEquipment-%s>onSendAble.port:%d", m_strName.c_str(), port);
 
 		return 0;
 	}
 
-	int CEquipment::onReceiveAble()
+	int CEquipment::onReceiveAble(int port)
 	{
-		LOGI("<CEquipment-%s>onReceiveAble.", m_strName.c_str());
+		// LOGI("<CEquipment-%s>onReceiveAble.port:%d", m_strName.c_str(), port);
 
 		return 0;
 	}
 
-	int CEquipment::onProcessStateChanged(PROCESS_STATE state)
+	int CEquipment::onProcessStateChanged(int nSlotNo, PROCESS_STATE prevState, PROCESS_STATE state)
 	{
 		return 0;
 	}
@@ -1818,4 +2234,81 @@
 			);
 		}
 	}
-}
\ No newline at end of file
+
+	InspResult CEquipment::judgeStringToInspResult(std::string& strJudge)
+	{
+		if (strJudge.compare("N") == 0) {
+			return InspResult::Fail;
+		}
+		if (strJudge.compare("G") == 0) {
+			return InspResult::Pass;
+		}
+
+		return InspResult::NotInspected;
+	}
+
+	float CEquipment::toFloat(const char* pszAddr)
+	{
+		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);
+		}
+
+		return 0; 
+	};
+
+	void CEquipment::addFacDataReportStep(int dataDev, int writeSignalDev, int port)
+	{
+		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;
+		}
+	}
+
+	PROCESS_STATE CEquipment::getProcessState(int slotNo) const
+	{
+		if (slotNo <= 0 || slotNo > SLOT_MAX) {
+			return PROCESS_STATE::Ready;
+		}
+		return m_processState[slotNo - 1];
+	}
+
+	std::vector<SERVO::CSVData>& CEquipment::getSVDatas()
+	{
+		return m_svDatas;
+	}
+}

--
Gitblit v1.9.3