From fc8d367963a16de61dfbc4a0ff34c78c91ec2cfe Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 05 九月 2025 09:21:28 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/Servo/CEquipment.cpp |  638 +++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 521 insertions(+), 117 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipment.cpp b/SourceCode/Bond/Servo/CEquipment.cpp
index ea36b48..c4c19a8 100644
--- a/SourceCode/Bond/Servo/CEquipment.cpp
+++ b/SourceCode/Bond/Servo/CEquipment.cpp
@@ -7,26 +7,11 @@
 #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_bEnable = TRUE;
 		m_listener = { };
 		m_alive = { FALSE, 0, FALSE };
 		m_bCimState = FALSE;
@@ -35,11 +20,14 @@
 		m_bLocalAlarm = FALSE;
 		m_bAutoRecipeChange = FALSE;
 		m_bVCREnable[0] = FALSE;
-		memset(m_bLinkSignal, 0, sizeof(m_bLinkSignal));
+		memset(m_bLinkSignalToUpstream, 0, sizeof(m_bLinkSignalToUpstream));
+		memset(m_bLinkSignalToDownstream, 0, sizeof(m_bLinkSignalToDownstream));
 		m_pCclink = nullptr;
 		m_nBaseAlarmId = 0;
 		m_pArm = nullptr;
 		m_processState = PROCESS_STATE::Ready;
+		m_blockReadBit = { 0 };
+		m_nTestFlag = 0;
 		InitializeCriticalSection(&m_criticalSection);
 	}
 
@@ -68,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)
@@ -399,15 +397,31 @@
 		BOOL bFlag;
 		int index = 0;
 		for (int i = 0; i < 8; i++) {
-			m_bLinkSignal[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
-			m_bLinkSignal[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
-			m_bLinkSignal[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
-			m_bLinkSignal[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
+			m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
+			m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+			m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
+			m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] = isBitOn(pszData, size, index + 3);
 			index += 0x40;
+
+			if (m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE]) {
+				onSendAble(i+1);
+			}
 		}		 
-		if(m_bLinkSignal[0][SIGNAL_SEND_ABLE]) {
-			onSendAble();
+
+
+		index += 0x40 * 2;
+		for (int i = 0; i < 8; i++) {
+			m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_INLINE] = isBitOn(pszData, size, index + 0);
+			m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_TROUBLE] = isBitOn(pszData, size, index + 1);
+			m_bLinkSignalToDownstream[i][SIGNAL_INTERLOCK] = isBitOn(pszData, size, index + 2);
+			m_bLinkSignalToDownstream[i][SIGNAL_RECEIVE_ABLE] = isBitOn(pszData, size, index + 3);
+			index += 0x40;
+
+			if (m_bLinkSignalToDownstream[0][SIGNAL_RECEIVE_ABLE]) {
+				onReceiveAble(i + 1);
+			}
 		}
+
 
 		// 其它信号及响应
 		index = 0x540;
@@ -482,6 +496,11 @@
 		// 主配方上报
 		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);
 
@@ -512,8 +531,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);
@@ -581,6 +604,24 @@
 
 		// Indexer Operation Mode Change
 		CHECK_WRITE_STEP_SIGNAL(STEP_ID_IN_OP_CMD_REPLY, pszData, size);
+
+		// Panel Data Report
+		CHECK_READ_STEP_SIGNAL(STEP_ID_PANEL_DATA_REPORT, pszData, size);
+
+		// Panel Data Request
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_PANEL_DATA_REQUEST, pszData, size);	
+
+		// Job Data Request
+		CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_DATA_REQUEST, pszData, size);
+
+		// job process start/end report
+		CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_START_REPORT, pszData, size);
+		CHECK_READ_STEP_SIGNAL(STEP_ID_JOB_PROCESS_END_REPORT, pszData, size);
+
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT1_CASSETTE_CTR_CMD_REPLY, pszData, size);
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT2_CASSETTE_CTR_CMD_REPLY, pszData, size);
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT3_CASSETTE_CTR_CMD_REPLY, pszData, size);
+		CHECK_WRITE_STEP_SIGNAL(STEP_ID_PROT4_CASSETTE_CTR_CMD_REPLY, pszData, size);
 	}
 
 	BOOL CEquipment::isBitOn(const char* pszData, size_t size, int index)
@@ -633,25 +674,47 @@
 		return m_bVCREnable[index];
 	}
 
-	BOOL CEquipment::isLinkSignalOn(unsigned int path, unsigned int signal)
+	BOOL CEquipment::isLinkSignalUpstreamOn(unsigned int path, unsigned int signal)
 	{
 		if (path >= PATH_MAX) return FALSE;
 		if (signal >= SIGNAL_MAX) return FALSE;
-		return m_bLinkSignal[path][signal];
+		return m_bLinkSignalToUpstream[path][signal];
 	}
 
-	void CEquipment::setLinkSignal(unsigned int path, unsigned int signal, BOOL bOn)
+	BOOL CEquipment::isLinkSignalDownstreamOn(unsigned int path, unsigned int signal)
+	{
+		if (path >= PATH_MAX) return FALSE;
+		if (signal >= SIGNAL_MAX) return FALSE;
+		return m_bLinkSignalToDownstream[path][signal];
+	}
+
+	void CEquipment::setLinkSignalUpstream(unsigned int path, unsigned int signal, BOOL bOn)
 	{
 		if (path >= PATH_MAX) return;
 		if (signal >= SIGNAL_MAX) return;
-		m_bLinkSignal[path][signal] = bOn;
+		m_bLinkSignalToUpstream[path][signal] = bOn;
 	}
 
-	void CEquipment::setLinkSignalBlock(unsigned int path, BOOL* pSignal)
+	void CEquipment::setLinkSignalUpstreamBlock(unsigned int path, BOOL* pSignal)
 	{
 		if (path >= PATH_MAX) return;
 		for (int i = 0; i < SIGNAL_MAX; i++) {
-			m_bLinkSignal[path][i] = pSignal[i];
+			m_bLinkSignalToUpstream[path][i] = pSignal[i];
+		}
+	}
+
+	void CEquipment::setLinkSignalDownstream(unsigned int path, unsigned int signal, BOOL bOn)
+	{
+		if (path >= PATH_MAX) return;
+		if (signal >= SIGNAL_MAX) return;
+		m_bLinkSignalToDownstream[path][signal] = bOn;
+	}
+
+	void CEquipment::setLinkSignalDownstreamBlock(unsigned int path, BOOL* pSignal)
+	{
+		if (path >= PATH_MAX) return;
+		for (int i = 0; i < SIGNAL_MAX; i++) {
+			m_bLinkSignalToDownstream[path][i] = pSignal[i];
 		}
 	}
 
@@ -750,6 +813,21 @@
 		return m_outputPins;
 	}
 
+	CRecipeList* CEquipment::getRecipeList(int unitNo)
+	{
+		return m_recipesManager.getRecipeList(unitNo);
+	}
+
+	bool CEquipment::saveRecipeList(int unitNo, std::string& strFilepath)
+	{
+		return m_recipesManager.saveRecipeList(unitNo, strFilepath);
+	}
+
+	bool CEquipment::readRecipeList(int unitNo, std::string& strFilepath)
+	{
+		return m_recipesManager.readRecipeList(unitNo, strFilepath);
+	}
+
 	int CEquipment::recvIntent(CPin* pPin, CIntent* pIntent)
 	{
 		ASSERT(pPin);
@@ -782,7 +860,7 @@
 		return 0;
 	}
 
-	int CEquipment::fetchedOutJob(CJobDataB* pJobDataB)
+	int CEquipment::fetchedOutJob(int port, CJobDataB* pJobDataB)
 	{
 		if (m_pArm == nullptr) {
 			return -1;
@@ -805,7 +883,6 @@
 			return -3;
 		}
 
-
 		((CArm*)m_pArm)->tempStore(pContext);
 		pContext->release();
 		Unlock();
@@ -822,7 +899,7 @@
 		return 0;
 	}
 
-	int CEquipment::storedJob(CJobDataB* pJobDataB, short putSlot)
+	int CEquipment::storedJob(int port, CJobDataB* pJobDataB, short putSlot)
 	{
 		if (m_pArm == nullptr) {
 			return -1;
@@ -848,7 +925,7 @@
 		if (m_listener.onDataChanged != nullptr) {
 			m_listener.onDataChanged(this, EDCC_STORED_JOB);
 		}
-		
+
 		return 0;
 	}
 
@@ -896,7 +973,6 @@
 
 	CGlass* CEquipment::getGlassWithCassette(int cassetteSequenceNo, int jobSequenceNo)
 	{
-		CSlot* pSlot = nullptr;
 		for (int i = 0; i < SLOT_MAX; i++) {
 			if (!m_slot[i].isEnable()) continue;
 			CGlass* pGlass = (CGlass*)m_slot[i].getContext();
@@ -1102,7 +1178,7 @@
 		return 0;
 	}
 
-	int CEquipment::masterRecipeListRequest(short unitNo)
+	int CEquipment::masterRecipeListRequest(short unitNo, ONSYNCINGSTATECHANGED block)
 	{
 		SERVO::CEqWriteStep* pStep = (SERVO::CEqWriteStep*)getStepWithName(STEP_EQ_MASTER_RECIPE_LIST_REQ);
 		if (pStep == nullptr) {
@@ -1110,6 +1186,7 @@
 		}
 
 		LOGI("<CEquipment-%s>正在请求单元<%d>主配方列表", m_strName.c_str(), unitNo);
+		m_recipesManager.setOnSyncingStateChanged(block);
 		if (m_recipesManager.syncing() != 0) {
 			return -2;
 		}
@@ -1127,28 +1204,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);
+				LOGI("<CEquipment-%s>请求单元<%d>主配方参数列表失败，code:%d", m_strName.c_str(), unitNo, code);
 			}
 
 			return 0;
-			});
+		});
+
 		return 0;
 	}
 
@@ -1166,6 +1254,28 @@
 	}
 
 	CSlot* CEquipment::getAvailableSlotForGlass(MaterialsType type)
+	{
+		for (int i = 0; i < SLOT_MAX; i++) {
+			if (!m_slot[i].isEnable()) continue;
+			if (m_slot[i].isLock()) continue;
+			if (!m_slot[i].isEmpty()) continue;
+			int lsPath = m_slot[i].getLinkSignalPath();
+			if (!m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+				|| m_bLinkSignalToDownstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+				|| !m_bLinkSignalToDownstream[lsPath][SIGNAL_INTERLOCK]
+				|| !m_bLinkSignalToDownstream[lsPath][SIGNAL_RECEIVE_ABLE]) continue;
+
+			MaterialsType slotType = m_slot[i].getType();
+			if (type == MaterialsType::G1 && slotType == MaterialsType::G2) continue;
+			if (type == MaterialsType::G2 && slotType == MaterialsType::G1) continue;
+
+			return &m_slot[i];
+		}
+
+		return nullptr;
+	}
+
+	CSlot* CEquipment::getAvailableSlotForGlassExcludeSignal(MaterialsType type)
 	{
 		for (int i = 0; i < SLOT_MAX; i++) {
 			if (!m_slot[i].isEnable()) continue;
@@ -1191,6 +1301,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;
@@ -1201,6 +1317,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)
@@ -1221,23 +1352,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) LOGI("getProcessedSlot 001");
 			if (!m_slot[i].isEnable()) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 002");
 			if (m_slot[i].isLock()) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 003");
 			CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+			if (!isSlotProcessed(i)) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 004");
 			if (pGlass == nullptr) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 005");
+			if (!pGlass->isScheduledForProcessing()) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 006");
+			if (bJobMode && pGlass->getProcessJob() == nullptr) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 007");
+			if(pGlass->getInspResult(m_nID, 0) == InspResult::Fail) continue;
 			int lsPath = m_slot[i].getLinkSignalPath();
-			if(!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
-				|| m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
-				|| !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
-				|| !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE] ) continue;
-
+			if(!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+				|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+				|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
+				|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE] ) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 008");
 			MaterialsType glassType = pGlass->getType();
 			if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 009");
 			if (glassType == MaterialsType::G2 && putSlotType == MaterialsType::G1) continue;
-
+			if (m_nTestFlag == 1) LOGI("getProcessedSlot 00a");
 			return &m_slot[i];
 		}
 
@@ -1253,11 +1396,12 @@
 					if (m_slot[i].isLock()) continue;
 					CGlass* pGlass = (CGlass*)m_slot[i].getContext();
 					if (pGlass == nullptr) continue;
+					if (!isSlotProcessed(i+1)) continue;
 					int lsPath = m_slot[i].getLinkSignalPath();
-					if (!m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_INLINE]
-						|| m_bLinkSignal[lsPath][SIGNAL_UPSTREAM_TROUBLE]
-						|| !m_bLinkSignal[lsPath][SIGNAL_INTERLOCK]
-						|| !m_bLinkSignal[lsPath][SIGNAL_SEND_ABLE]) continue;
+					if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+						|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+						|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
+						|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE]) continue;
 
 					MaterialsType glassType = pGlass->getType();
 					if (glassType == MaterialsType::G1 && putSlotType == MaterialsType::G2) continue;
@@ -1266,6 +1410,43 @@
 					return &m_slot[i];
 				}
 			}
+		}
+
+		return nullptr;
+	}
+
+	CSlot* CEquipment::getProcessedSlotCt(unsigned int slot)
+	{
+		if (slot >= 8) return nullptr;
+		if (!m_slot[slot].isEnable()) return nullptr;
+		if (m_slot[slot].isLock()) return nullptr;
+		CGlass* pGlass = (CGlass*)m_slot[slot].getContext();
+		if (pGlass == nullptr) return nullptr;
+		int lsPath = m_slot[slot].getLinkSignalPath();
+		if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+			|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+			|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
+			|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE]) return nullptr;
+		
+		return &m_slot[slot];
+	}
+
+	CSlot* CEquipment::getInspFailSlot()
+	{
+		for (int i = 0; i < SLOT_MAX; i++) {
+			if (!m_slot[i].isEnable()) continue;
+			if (m_slot[i].isLock()) continue;
+			CGlass* pGlass = (CGlass*)m_slot[i].getContext();
+			if (pGlass == nullptr) continue;
+			if (!pGlass->isScheduledForProcessing()) continue;
+			if (pGlass->getInspResult(m_nID, 0) != InspResult::Fail) continue;
+			int lsPath = m_slot[i].getLinkSignalPath();
+			if (!m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_INLINE]
+				|| m_bLinkSignalToUpstream[lsPath][SIGNAL_UPSTREAM_TROUBLE]
+				|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_INTERLOCK]
+				|| !m_bLinkSignalToUpstream[lsPath][SIGNAL_SEND_ABLE]) continue;
+
+			return &m_slot[i];
 		}
 
 		return nullptr;
@@ -1299,6 +1480,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;
@@ -1311,6 +1499,10 @@
 
 		if (pSlot == nullptr) return -1;
 		pSlot->setContext(nullptr);
+		if (m_listener.onDataChanged != nullptr) {
+			m_listener.onDataChanged(this, EDCC_FETCHOUT_JOB);
+		}
+
 		return 0;
 	}
 
@@ -1332,11 +1524,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		processData.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
-
-
 		onProcessData(&processData);
 
 		return nRet;
@@ -1350,11 +1539,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		jobDataS.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
-
-
 		onReceivedJob(port, &jobDataS);
 
 		return nRet;
@@ -1363,7 +1549,16 @@
 	int CEquipment::onReceivedJob(int port, CJobDataS* pJobDataS)
 	{
 		LOGI("<CEquipment-%s>onReceivedJob.", m_strName.c_str());
-		return 0;
+
+
+		// 可以在此更新JobDataS数据了
+		int nRet = ((CArm*)m_pArm)->glassUpdateJobDataS(pJobDataS);
+		if (nRet < 0) {
+			LOGE("<CEquipment-%s>onReceivedJob,更新JobDataS失败，glassUpdateJobDataS返回%d",
+				m_strName.c_str(), nRet);
+		}
+
+		return nRet;
 	}
 
 	int CEquipment::decodeSentOutJobReport(CStep* pStep, int port, const char* pszData, size_t size)
@@ -1374,11 +1569,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		jobDataS.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
-
-
 		onSentOutJob(port, &jobDataS);
 
 		return nRet;
@@ -1387,17 +1579,6 @@
 	int CEquipment::onSentOutJob(int port, CJobDataS* pJobDataS)
 	{
 		LOGI("<CEquipment-%s>onSentOutJob.", m_strName.c_str());
-
-
-		// 可以在此更新JobDataS数据了
-		CGlass* pGlass = getGlass(pJobDataS->getGlass1Id().c_str());
-		if (pGlass == nullptr) {
-			LOGE("<CEquipment-%s>onSentOutJob,没有找到对应的Glass(CassetteSequenceNo:%d, JobSequenceNo:%d, ID=%s)，请检查数据，注意风险。",
-				m_strName.c_str(), pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo(),
-				pJobDataS->getGlass1Id().c_str());
-			return -1;
-		}
-		pGlass->updateJobDataS(pJobDataS);
 
 		return 0;
 	}
@@ -1449,7 +1630,7 @@
 		LOGI("<CEquipment-%s>onPreFetchedOutJob:port:%d|GlassId:%s",
 			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
 		if (m_listener.onPreFethedOutJob != nullptr) {
-			return m_listener.onPreFethedOutJob(this, pJobDataB);
+			return m_listener.onPreFethedOutJob(this, port, pJobDataB);
 		}
 
 		return TRUE;
@@ -1462,7 +1643,7 @@
 
 		BOOL bCheck = onPreFetchedOutJob(port, pJobDataB);
 		if (bCheck) {
-			return fetchedOutJob(pJobDataB);
+			return fetchedOutJob(port, pJobDataB);
 		}
 
 		// 数据异常，处理或显示
@@ -1516,7 +1697,7 @@
 	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());
@@ -1524,9 +1705,8 @@
 
 		// 缓存Attribute，用于调试时显示信息
 		unsigned int weight = 201;
-		CAttributeVector attrubutes;
+		CAttributeVector& attrubutes = pStep->attributeVector();
 		vcrEventReport.getAttributeVector(attrubutes, weight);
-		pStep->addAttributeVector(attrubutes);
 
 		// 0426, 先固定返回1(OK)
 		((CReadStep*)pStep)->setReturnCode((short)VCR_Reply_Code::OK);
@@ -1545,7 +1725,7 @@
 		index += sizeof(short);
 		CToolUnits::convertString(&pszData[index], 128 * 2, strPanelJudgeData);
 		index += 128 * 2;
-		CToolUnits::convertString(&pszData[index], 256 * 2, strPanelJudgeData);
+		CToolUnits::convertString(&pszData[index], 256 * 2, strPanelGradeData);
 		index += 256 * 2;
 
 
@@ -1561,6 +1741,15 @@
 			strPanelGradeData.c_str(), "", weight++));
 
 
+		// 更新检测结果
+		CGlass* pGlass = getGlassWithCassette(cassetteNo, jobSequenceNo);
+		if (pGlass == nullptr) {
+			LOGE("<CEquipment-%s>更新Panel Data失败，找不到对应的Glass.cassetteNo=%d, jobSequenceNo=%d",
+				getName().c_str(), cassetteNo, jobSequenceNo);
+			return -1;
+		}
+		pGlass->setInspResult(m_nID, 0, judgeStringToInspResult(strPanelJudgeData));
+
 		return 0;
 	}
 
@@ -1570,7 +1759,7 @@
 		std::string strSvTimeRecord, strSvData;
 		CToolUnits::convertString(&pszData[index], 8 * 2, strSvTimeRecord);
 		index += 128 * 2;
-		CToolUnits::convertString(&pszData[index], 640 * 2, strSvData);
+		CToolUnits::convertString(&pszData[index], 100 * 2, strSvData);
 		index += 256 * 2;
 
 
@@ -1585,7 +1774,7 @@
 		return 0;
 	}
 
-	int CEquipment::decodePanelDataRequest(CStep* pStep, const char* pszData, size_t size)
+	int CEquipment::decodeJobDataRequest(CStep* pStep, const char* pszData, size_t size)
 	{
 		int index = 0;
 		short cassetteSequenceNo, jobSequenceNo;
@@ -1593,24 +1782,9 @@
 		index += sizeof(short);
 		memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
 		index += sizeof(short);
+		cassetteSequenceNo = 4000;
+		jobSequenceNo = 1;
 
-
-		// efme， 获取数据后返回
-		// Cassette Sequence No		1W
-		// Job Sequence No			1W
-		// Job DataS				256W
-		char szBuffer[1024];
-		index = 0;
-		memcpy(&szBuffer[index], &cassetteSequenceNo, sizeof(short));
-		index += sizeof(short);
-		memcpy(&szBuffer[index], &jobSequenceNo, sizeof(short));
-		index += sizeof(short);
-
-		CJobDataS* pJobDataS = getJobDataSWithCassette(cassetteSequenceNo, jobSequenceNo);
-		if (pJobDataS != nullptr) {
-			index += pJobDataS->serialize(&szBuffer[index], 1024 - sizeof(short) - sizeof(short));
-			((CEqReadStep*)pStep)->setReturnData(szBuffer, index);
-		}
 
 
 		// 缓存Attribute，用于调试时显示信息
@@ -1621,6 +1795,164 @@
 			(std::to_string(jobSequenceNo)).c_str(), "", weight++));
 
 
+		return 0;
+	}
+
+	int CEquipment::decodeJobProcessStartReport(CStep* pStep, const char* pszData, size_t size)
+	{
+		int port = (int)(__int64)pStep->getProp("Port");
+		LOGI("<CEquipment-%s>decodeJobProcessStartReport, port:%d", getName().c_str(), port);
+
+		short cassetteNo, jobSequenceNo, unitNo, subUnitNo, slotNo;
+		int year, month, day, hour, minute, second;
+
+		int index = 0;
+		memcpy(&cassetteNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&unitNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&subUnitNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&slotNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+
+		memcpy(&year, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		month = (int)pszData[index];
+		index += 1;
+		day = (int)pszData[index];
+		index += 1;
+		hour = (int)pszData[index];
+		index += 1;
+		minute = (int)pszData[index];
+		index += 1;
+		second = (int)pszData[index];
+		index += 1;
+
+		LOGI("<CEquipment-%s>cassetteNo:%d, jobSequenceNo:%d,unitNo:%d, subUnitNo:%d, slotNo:%d %d-%d-%d %d:%d:%d", 
+			getName().c_str(),
+			cassetteNo, 
+			jobSequenceNo, 
+			unitNo,
+			subUnitNo,
+			slotNo,
+			year, month, day, hour, minute, second
+			);
+
+
+		if (m_processState != PROCESS_STATE::Processing) {
+			setProcessState(PROCESS_STATE::Processing);
+		}
+
+
+		// 缓存Attribute，用于调试时显示信息
+		unsigned int weight = 201;
+		pStep->addAttribute(new CAttribute("CassetteNo",
+			std::to_string(cassetteNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("JobSequenceNo",
+			std::to_string(jobSequenceNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("UnitNo",
+			std::to_string(unitNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SubUnitNo",
+			std::to_string(subUnitNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SlotNo",
+			std::to_string(slotNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("ProcessStartTime",
+			(std::to_string(year) + std::to_string(day) + std::to_string(day) + std::to_string(hour) + std::to_string(minute) + std::to_string(second)).c_str()
+			, "", weight++));
+
+		return 0;
+	}
+
+	int CEquipment::decodeJobProcessEndReport(CStep* pStep, const char* pszData, size_t size)
+	{
+		int port = (int)(__int64)pStep->getProp("Port");
+		LOGI("<CEquipment-%s>decodeJobProcessEndReport, port:%d", getName().c_str(), port);
+
+		short cassetteNo, jobSequenceNo, unitNo, subUnitNo, slotNo;
+		int year, month, day, hour, minute, second;
+
+		int index = 0;
+		std::string strPanelJudgeData, strPanelGradeData;
+		memcpy(&cassetteNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&jobSequenceNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&unitNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&subUnitNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		memcpy(&slotNo, &pszData[index], sizeof(short));
+		index += sizeof(short);
+
+		memcpy(&year, &pszData[index], sizeof(short));
+		index += sizeof(short);
+		month = (int)pszData[index];
+		index += 1;
+		day = (int)pszData[index];
+		index += 1;
+		hour = (int)pszData[index];
+		index += 1;
+		minute = (int)pszData[index];
+		index += 1;
+		second = (int)pszData[index];
+		index += 1;
+
+		LOGI("<CEquipment-%s>cassetteNo:%d, jobSequenceNo:%d,unitNo:%d, subUnitNo:%d, slotNo:%d %d-%d-%d %d:%d:%d",
+			getName().c_str(),
+			cassetteNo,
+			jobSequenceNo,
+			unitNo,
+			subUnitNo,
+			slotNo,
+			year, month, day, hour, minute, second
+		);
+
+
+		if (m_processState != PROCESS_STATE::Complete) {
+			setProcessState(PROCESS_STATE::Complete);
+		}
+		
+		CGlass* pGlass = getGlassFromSlot(slotNo);
+		if (pGlass == nullptr) {
+			LOGE("<CEquipment-%s>decodeJobProcessEndReport, 找不到对应glass", getName().c_str());
+		}
+		else {
+			CJobDataS* pJs = pGlass->getJobDataS();
+			if (pJs->getCassetteSequenceNo() == cassetteNo
+				&& pJs->getJobSequenceNo() == jobSequenceNo) {
+				pGlass->processEnd(m_nID, getSlotUnit(slotNo));
+				if (m_processState != PROCESS_STATE::Complete) {
+					setProcessState(PROCESS_STATE::Complete);
+				}
+			}
+			else {
+				LOGE("<CEquipment-%s>decodeJobProcessEndReport, jobSequenceNo或jobSequenceNo不匹配",
+					getName().c_str());
+			}
+		}
+
+
+
+
+		// 缓存Attribute，用于调试时显示信息
+		unsigned int weight = 201;
+		pStep->addAttribute(new CAttribute("CassetteNo",
+			std::to_string(cassetteNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("JobSequenceNo",
+			std::to_string(jobSequenceNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("UnitNo",
+			std::to_string(unitNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SubUnitNo",
+			std::to_string(subUnitNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("SlotNo",
+			std::to_string(slotNo).c_str(), "", weight++));
+		pStep->addAttribute(new CAttribute("ProcessStartTime",
+			(std::to_string(year) + std::to_string(day) + std::to_string(day) + std::to_string(hour) + std::to_string(minute) + std::to_string(second)).c_str()
+			, "", weight++));
+			
 		return 0;
 	}
 
@@ -1640,7 +1972,7 @@
 		CJobDataS* pJobDataS = pGlass->getJobDataS();
 		ASSERT(pJobDataS);
 		if (!compareJobData(pJobDataB, pJobDataS)) {
-			LOGE("<CFliper-%s>onPreFetchedOutJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
+			LOGE("<CEquipemnt-%s>onPreStoredJob,JobData数据不匹配(JobDataB(%d, %d),JobDataS(%d, %d)), 注意排查风险!", m_strName.c_str(),
 				pJobDataB->getCassetteSequenceNo(), pJobDataB->getJobSequenceNo(),
 				pJobDataS->getCassetteSequenceNo(), pJobDataS->getJobSequenceNo());
 			return FALSE;
@@ -1648,17 +1980,18 @@
 
 		// 如果没有可用位置，报错
 		Lock();
-		CSlot* pSlot = getAvailableSlotForGlass((MaterialsType)pJobDataS->getMaterialsType());
-		if (pSlot == nullptr) {
+		CSlot* pSlot = getSlot(putSlot - 1);
+		ASSERT(pSlot);
+		if (pSlot->getContext() != nullptr) {
 			Unlock();
-			LOGE("<CFliper-%s>onPreFetchedOutJob,找不到匹配的Slot，不能进料，请注意风险！", m_strName.c_str());
+			LOGE("<CEquipemnt-%s>onPreStoredJob,指定slot(port:%d)有料，请注意风险！", m_strName.c_str(), port);
 			return FALSE;
 		}
 		Unlock();
 
 
 		if (m_listener.onPreStoredJob != nullptr) {
-			if (!m_listener.onPreStoredJob(this, pJobDataB, putSlot)) {
+			if (!m_listener.onPreStoredJob(this, port, pJobDataB, putSlot)) {
 				return FALSE;
 			}
 
@@ -1678,11 +2011,11 @@
 		short putSlot = 0;
 		BOOL bCheck = onPreStoredJob(port, pJobDataB, putSlot);
 		if (bCheck) {
-			return storedJob(pJobDataB, putSlot);
+			return storedJob(port, pJobDataB, putSlot);
 		}
 
 		// 数据异常，处理或显示
-		LOGI("<CEquipment-%s>onStoredJob Error.ort:%d|GlassId:%s",
+		LOGI("<CEquipment-%s>onStoredJob Error.port:%d|GlassId:%s",
 			m_strName.c_str(), port, pJobDataB->getGlassId().c_str());
 		return -1;
 	}
@@ -1698,13 +2031,16 @@
 	 * 当从CC-Link检测到设备Send Able为On时调用此函数
 	 * 可能会多次重复调用(根据扫描频率), 注意防呆
 	 */
-	int CEquipment::onSendAble()
+	int CEquipment::onSendAble(int port)
 	{
-		LOGI("<CEquipment-%s>onSendAble.", m_strName.c_str());
+		// LOGI("<CEquipment-%s>onSendAble.port:%d", m_strName.c_str(), port);
 
-		if (m_processState != PROCESS_STATE::Complete) {
-			setProcessState(PROCESS_STATE::Complete);
-		}
+		return 0;
+	}
+
+	int CEquipment::onReceiveAble(int port)
+	{
+		// LOGI("<CEquipment-%s>onReceiveAble.port:%d", m_strName.c_str(), port);
 
 		return 0;
 	}
@@ -1731,4 +2067,72 @@
 
 		return TRUE;
 	}
+
+	void CEquipment::printDebugString001()
+	{
+		for (int i = 0; i < 8; i++) {
+			LOGI("<CEquipment-%s>Link Signal to UP stream Path#%d, Signal:%s, %s, %s, %s",
+				m_strName.c_str(), i,
+				m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
+				m_bLinkSignalToUpstream[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
+				m_bLinkSignalToUpstream[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
+				m_bLinkSignalToUpstream[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
+			);
+		}
+		for (int i = 0; i < 8; i++) {
+			LOGI("<CEquipment-%s>Link Signal to Down stream Path#%d, Signal:%s, %s, %s, %s",
+				m_strName.c_str(), i,
+				m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_INLINE] ? "ON" : "OFF",
+				m_bLinkSignalToDownstream[i][SIGNAL_UPSTREAM_TROUBLE] ? "ON" : "OFF",
+				m_bLinkSignalToDownstream[i][SIGNAL_INTERLOCK] ? "ON" : "OFF",
+				m_bLinkSignalToDownstream[i][SIGNAL_SEND_ABLE] ? "ON" : "OFF"
+			);
+		}
+	}
+
+	InspResult CEquipment::judgeStringToInspResult(std::string& strJudge)
+	{
+		if (strJudge.compare("N") == 0) {
+			return InspResult::Fail;
+		}
+		if (strJudge.compare("G") == 0) {
+			return InspResult::Pass;
+		}
+
+		return InspResult::NotInspected;
+	}
+
+	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; 
+	};
 }
\ No newline at end of file

--
Gitblit v1.9.3