From d7fbb147a1582e93c3028d8328b2e7eb3736d6e9 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 08 一月 2026 20:07:42 +0800
Subject: [PATCH] 1.本地控件状态改变后上报EAP

---
 SourceCode/Bond/Servo/Model.cpp |  372 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 338 insertions(+), 34 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 7544937..bb5d5ff 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+锘�#include "stdafx.h"
 #include "Model.h"
 #include "Log.h"
 #include "Common.h"
@@ -7,6 +7,9 @@
 #include "AlarmManager.h"
 #include "CGlassPool.h"
 #include "TransferManager.h"
+#include "RecipeManager.h"
+#include "GlassLogDb.h"
+#include <map>
 
 
 CModel::CModel()
@@ -19,11 +22,38 @@
 {
 }
 
+void CModel::refreshDerivedSVs()
+{
+	// CJobSpace: how many ControlJobs can be created (current implementation supports 0/1).
+	m_hsmsPassive.setVariableValue("CJobSpace", (__int64)(m_master.canCreateControlJob() ? 1 : 0));
+
+	// PJobSpace: how many ProcessJobs can be created (current implementation supports 0/1).
+	m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
+}
+
+void CModel::setControlState(ControlState newState)
+{
+	const auto prev = m_currentControlState;
+	if (newState != m_currentControlState) {
+		m_hsmsPassive.setVariableValue("PreviousControlState", (__int64)static_cast<uint8_t>(prev));
+		m_currentControlState = newState;
+	}
+
+	// Always keep SV in sync (even if state didn't change or variables were just loaded).
+	m_hsmsPassive.setVariableValue("CurrentControlState", (__int64)static_cast<uint8_t>(m_currentControlState));
+
+	if (newState != prev) {
+		// S6F11 (CEID=600): ControlStateChanged
+		m_hsmsPassive.requestEventReportSend("ControlStateChanged");
+		notifyInt(RX_CODE_CONTROL_STATE_CHANGED, static_cast<int>(m_currentControlState));
+	}
+}
+
 IObservable* CModel::getObservable()
 {
 	if (m_pObservable == nullptr) {
 		m_pObservable = RX_AllocaObservable([&](IObservableEmitter* e) -> void {
-			m_pObservableEmitter = e;			// 保存发射器
+			m_pObservableEmitter = e;			// 淇濆瓨鍙戝皠鍣�
 		});
 	}
 
@@ -47,9 +77,30 @@
 	for (int i = 0; i < 4; i++) {
 		m_configuration.getPortParms(i, portEnable, portType, portMode,
 			cassetteType, transferMode, autoChangeEnable);
-		m_master.setPortType(i, portEnable, portType, portMode, cassetteType,
+		m_master.setPortTypeEx(i, portEnable, portType, portMode, cassetteType,
 			transferMode, autoChangeEnable);
+
+		int seed = m_configuration.getPortCassetteSnSeed(i + 1);
+		m_master.setPortCassetteSnSeed(i + 1, seed);
 	}
+}
+
+void CModel::setPortType(unsigned int index, SERVO::PortType type)
+{
+	m_master.setPortType(index, (int)type);
+	m_configuration.setPortType(index, (int)type);
+}
+
+void CModel::setPortCassetteType(unsigned int index, SERVO::CassetteType type)
+{
+	m_master.setPortCassetteType(index, type);
+	m_configuration.setPortCassetteType(index, (int)type);
+}
+
+void CModel::setPortEnable(unsigned int index, BOOL bEnable)
+{
+	m_master.setPortEnable(index, bEnable);
+	m_configuration.setPortEnable(index, bEnable);
 }
 
 int CModel::init()
@@ -60,7 +111,7 @@
 	m_configuration.setFilepath((LPTSTR)(LPCTSTR)strIniFile);
 	m_configuration.getUnitId(strUnitId);
 
-	// 机器型号和软件版本号应从配置中读取，当前先固定值
+	// 鏈哄櫒鍨嬪彿鍜岃蒋浠剁増鏈彿搴斾粠閰嶇疆涓鍙栵紝褰撳墠鍏堝浐瀹氬��
 	CString strModeType = _T("Master");
 	CString strSoftRev = _T("1.0.2");
 
@@ -75,7 +126,7 @@
 	::CreateDirectory(strLogDir, NULL);
 	CLog::GetLog()->SetOnLogCallback([&](int level, const char* pszMessage) -> void {
 		notifyTextAndInt(RX_CODE_LOG, pszMessage, level);
-	});
+		});
 	CLog::GetLog()->SetAutoAppendTimeString(TRUE);
 	CLog::GetLog()->SetOutputTarget(OT_FILE);
 	CLog::GetLog()->SetLogsDir(strLogDir);
@@ -84,26 +135,41 @@
 
 
 	SECSListener listener;
-	listener.onEQOffLine = [&](void* pFrom) -> void {
-		LOGI("远程请求OffLine");
+	listener.onEQOffLine = [this](void* pFrom) -> void {
+		LOGI("杩滅▼璇锋眰OffLine");
+		(void)pFrom;
+		setControlState(ControlState::OfflineHost);
 	};
-	listener.onEQOnLine = [&](void* pFrom) -> void {
-		LOGI("远程请求OnLine");
+	listener.onEQOnLine = [this](void* pFrom) -> void {
+		LOGI("杩滅▼璇锋眰OnLine");
+		(void)pFrom;
+		// Customer flow: S1F17 RequestOnline defaults to OnlineRemote.
+		setControlState(ControlState::OnlineRemote);
 	};
-	listener.onCommand = [&](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
+	listener.onCommand = [this](void* pFrom, const char* pszName, std::vector<CommandParameter>& params) -> void {
 		LOGI("onCommand:%s", pszName);
+		(void)pFrom;
 		for (auto& item : params) {
 			LOGI("param:%s,%s", item.szName, item.szValue);
 		}
+
+		if (pszName == nullptr) return;
+		// S2F41 GoLocal / GoRemote (RCMD)
+		if (_strcmpi(pszName, "GoLocal") == 0 || _strcmpi(pszName, "LOCAL") == 0 || _strcmpi(pszName, "GoLOCAL") == 0) {
+			setControlState(ControlState::OnlineLocal);
+		}
+		else if (_strcmpi(pszName, "GoRemote") == 0 || _strcmpi(pszName, "REMOTE") == 0 || _strcmpi(pszName, "GoREMOTE") == 0) {
+			setControlState(ControlState::OnlineRemote);
+		}
 	};
 	listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
-		// 在此填充常量值，目前仅是加1后返回
+		// 鍦ㄦ濉厖甯搁噺鍊硷紝鐩墠浠呮槸鍔�1鍚庤繑鍥�
 		for (auto& item : eqcs) {
-			sprintf_s(item.szValue, 256, "Test%d", item.id+1);
+			sprintf_s(item.szValue, EQCONSTANT_VALUE_MAX, "Test%d", item.id + 1);
 		}
 	};
 	listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
-		// 在此保存和设置机器常量值
+		// 鍦ㄦ淇濆瓨鍜岃缃満鍣ㄥ父閲忓��
 		for (auto& item : eqcs) {
 			LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
 		}
@@ -125,24 +191,121 @@
 			m_master.enableAlarmReport(bEnable);
 		}
 	};
+	listener.onQueryPPIDList = [&](void* pFrom) ->std::vector<std::string> {
+		std::vector<std::string> ppids;
+		auto temp = RecipeManager::getInstance().getAllPPID();
+		for (auto item : temp) {
+			if (item.length() > PPID_NAME_MAX) {
+				ppids.push_back(item.substr(0, PPID_NAME_MAX));
+			}
+			else {
+				ppids.push_back(item);
+			}
+		}
+		return ppids;
+	};
+	listener.onCarrierAction = [&](void* pFrom,
+		unsigned int DATAID,
+		const char* pszCarrierAction,
+		const char* pszCarrierId,
+		unsigned char PTN,
+		std::string& strErrorTxt) -> unsigned int {
+			if (PTN < 1 || 4 < PTN) {
+				strErrorTxt = "invalid data or argument";
+				return CAACK_3;
+			}
+
+			const unsigned int portIndex = PTN - 1;
+			SERVO::CLoadPort* pLoadPort = (SERVO::CLoadPort*)m_master.getEquipment(EQ_ID_LOADPORT1 + portIndex);
+			LOGI("<Model>onCarrierAction %d, %s, %d, %d", DATAID, pszCarrierAction, pszCarrierId, PTN);
+
+			if (_strcmpi(pszCarrierAction, "ProceedWithCarrier") == 0) {
+				// 鏂囨。娴佺▼锛歅roceedWithCarrier 涔嬪悗璁惧杩涘叆 Check SlotMap锛圵FH锛夛紝
+				// 鐪熸鐨勨�滃紑濮嬧�濈敱 ProceedWithSlotMap 鍐崇瓥瑙﹀彂銆�
+				// 浠呭綋鏈紑鍚� CompareMapsBeforeProceeding 鏃讹紝鎵嶆部鐢ㄦ棫閫昏緫鐩存帴 Start銆�
+				LOGI("<CModel>ProceedWithCarrier");
+				if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
+					m_master.proceedWithCarrier(portIndex);
+				}
+				return CAACK_0;
+			}
+			else if (_strcmpi(pszCarrierAction, "ProceedWithSlotMap") == 0) {
+				// TODO(Host鍗忓晢):
+				// 鏂囨。涓� ProceedWithSlotMap 鍙兘浼氭惡甯� LotID / PanelIDList / SlotMap 绛夋暟鎹紙鏈�澶�13鐗囷級鐢ㄤ簬鏍煎紡鏍￠獙涓庣粦瀹氥��
+				// 褰撳墠 S3F17 瑙ｆ瀽缁撴瀯浠呮敮鎸� {DATAID, CarrierAction, CarrierID, PTN}锛屽皻鏈疄鐜颁笂杩版墿灞曞瓧娈电殑瑙ｆ瀽/鏍￠獙銆�
+				// 鏈潵鑻ュ鎴风‘璁� SECS-II 缁撴瀯锛岄渶瑕佸湪 CHsmsPassive::replyCarrierAction() 鎵╁睍瑙ｆ瀽骞跺湪姝ゅ钀藉簱/鏍￠獙銆�
+				// 浠呭湪 CompareMapsBeforeProceeding 鍚敤锛圚ost 妯″紡锛変笅鍏佽姝ゅ姩浣�
+				LOGI("<CModel>ProceedWithSlotMap");
+				if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
+					strErrorTxt = "rejected - SlotMap check disabled";
+					return CAACK_5;
+				}
+
+				m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
+				m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
+				m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+
+				// Host 纭 SlotMap 鍚庡啀寮�濮嬪姞宸�/娴佺▼
+				m_master.proceedWithCarrier(portIndex);
+				return CAACK_0;
+			}
+			else if (_strcmpi(pszCarrierAction, "CarrierRelease") == 0) {
+				LOGI("<CModel>CarrierRelease");
+				m_master.carrierRelease(portIndex);
+				return CAACK_0;
+			}
+
+			strErrorTxt = "rejected - invalid state";
+			return CAACK_5;
+	};
+	listener.onPRJobMultiCreate = [&](void* pFrom, std::vector<SERVO::CProcessJob*>& pjs) -> int {
+		for (auto p : pjs) {
+			LOGI("<Model>onPRJobMultiCreate %s %s", p->id().c_str(), p->recipeSpec().c_str());
+		}
+		int nRet = m_master.setProcessJobs(pjs);
+		auto processJobs = m_master.getProcessJobs();
+		std::vector<SERVO::CVariable> vars;
+		for (auto pj : processJobs) {
+			SERVO::CVariable var("", "PRJOBID", "A50", "PRJOBID");
+			var.setValue(pj->id().c_str());
+			vars.push_back(var);
+		}
+
+		m_hsmsPassive.setVariableValue("PJQueued", vars);
+		m_hsmsPassive.requestEventReportSend_PJ_Queued();
+		return nRet;
+	};
+	listener.onControlJobCreate = [&](void* pFrom, SERVO::CControlJob& controlJob) -> int {
+		LOGI("<Model>onControlJobCreate %s %d", controlJob.id().c_str(), controlJob.priority());
+		int nRet = m_master.setControlJob(controlJob);
+		return nRet;
+	};
 	m_hsmsPassive.setListener(listener);
 	m_hsmsPassive.setEquipmentModelType((LPTSTR)(LPCTSTR)strModeType);
 	m_hsmsPassive.setSoftRev((LPTSTR)(LPCTSTR)strSoftRev);
 	CString strVarialbleFile;
 	strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+	setControlState(m_currentControlState);
+	refreshDerivedSVs();
 	m_hsmsPassive.init(this, "APP", 7000);
 	strVarialbleFile.Format(_T("%s\\ReportList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
 	strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_hsmsPassive.loadCollectionEvents((LPTSTR)(LPCTSTR)strVarialbleFile);
-	m_hsmsPassive.init(this, "APP", 7000);
+	strVarialbleFile.Format(_T("%s\\HsmsPassive.cache"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	m_hsmsPassive.loadCacheFromFile(strVarialbleFile);
+
 
 	SERVO::MasterListener masterListener;
 	masterListener.onMasterStateChanged = [&](void* pMaster, SERVO::MASTERSTATE state) -> void {
 		LOGI("<CModel>Master state changed(%d)", (int)state);
 		notify(RX_CODE_MASTER_STATE_CHANGED);
 	};
+	masterListener.onControlJobChanged = [this](void* pMaster) {
+		(void)pMaster;
+		this->refreshDerivedSVs();
+		};
 	masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
 		LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
 			bAlive ? _T("ON") : _T("OFF"));
@@ -172,9 +335,18 @@
 			alarmData.strUnitName = alarmManager.getUnitNameById(alarmData.nDeviceId, alarmData.nUnitId);
 			alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
 			alarmData.strEndTime = "";
-
+			alarmData.strDescription = "";
+			
 			const AlarmInfo* alarmInfo = alarmManager.getAlarmInfoByID(alarmData.nId);
-			alarmData.strDescription = alarmInfo != nullptr ? alarmInfo->strAlarmText : "";
+			if (alarmInfo != nullptr) {
+				if (alarmInfo->strDescription.empty()) {
+					alarmData.strDescription = alarmInfo->strAlarmText;
+				}
+				else {
+					alarmData.strDescription = alarmInfo->strAlarmText + "," + alarmInfo->strDescription + ".";
+				}
+			}
+
 
 			int nAlarmEventId = 0;
 			bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
@@ -203,6 +375,13 @@
 	};
 	masterListener.onEqVcrEventReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, SERVO::CVcrEventReport* pReport) {
 		LOGE("<CModel>onEqVcrEventReport.");
+		if (pReport != nullptr) {
+			m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
+			int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
+			if (nRet != ER_NOERROR) {
+				LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
+			}
+		}
 	};
 	masterListener.onEqDataChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int code) {
 		LOGE("<CModel>onEqDataChanged.");
@@ -210,11 +389,11 @@
 	};
 	masterListener.onRobotTaskEvent = [&](void* pMaster, SERVO::CRobotTask* pTask, int code) {
 		if (pTask == nullptr) {
-			LOGE("<CModel>onRobotTaskEvent: 空任务指针，忽略事件 code=%d", code);
+			LOGE("<CModel>onRobotTaskEvent: 绌轰换鍔℃寚閽堬紝蹇界暐浜嬩欢 code=%d", code);
 			return;
 		}
 
-		// 任务描述与 ID 用于日志
+		// 浠诲姟鎻忚堪涓� ID 鐢ㄤ簬鏃ュ織
 		SERVO::CGlass* pGlass = (SERVO::CGlass*)pTask->getContext();
 		const std::string& strDesc = pTask->getDescription();
 		std::string strClassID;
@@ -226,48 +405,48 @@
 			}
 		}
 
-		// 日志输出与状态处理
+		// 鏃ュ織杈撳嚭涓庣姸鎬佸鐞�
 		switch (code) {
 		case ROBOT_EVENT_CREATE:
-			LOGI("<CModel>onRobotTaskEvent: 新任务创建(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+			LOGI("<CModel>onRobotTaskEvent: 鏂颁换鍔″垱寤�(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
 			break;
 		case ROBOT_EVENT_FINISH:
-			LOGI("<CModel>onRobotTaskEvent: 任务完成(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+			LOGI("<CModel>onRobotTaskEvent: 浠诲姟瀹屾垚(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
 			break;
 		case ROBOT_EVENT_ERROR:
-			LOGE("<CModel>onRobotTaskEvent: 任务错误(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+			LOGE("<CModel>onRobotTaskEvent: 浠诲姟閿欒(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
 			break;
 		case ROBOT_EVENT_ABORT:
-			LOGE("<CModel>onRobotTaskEvent: 任务停止(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+			LOGE("<CModel>onRobotTaskEvent: 浠诲姟鍋滄(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
 			break;
 		case ROBOT_EVENT_RESTORE:
-			LOGE("<CModel>onRobotTaskEvent: 任务回撤(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
+			LOGE("<CModel>onRobotTaskEvent: 浠诲姟鍥炴挙(%s, ClassID=%s).", strDesc.c_str(), strClassID.c_str());
 			break;
 		default:
-			LOGE("<CModel>onRobotTaskEvent: 未知事件 code=%d, 任务=%s", code, strDesc.c_str());
+			LOGE("<CModel>onRobotTaskEvent: 鏈煡浜嬩欢 code=%d, 浠诲姟=%s", code, strDesc.c_str());
 			break;
 		}
 
-		// 安全格式化时间
+		// 瀹夊叏鏍煎紡鍖栨椂闂�
 		auto format_time = [](time_t t) -> std::string {
 			if (t <= 0 || t == _I64_MIN || t == _I64_MAX) { 
 				return "";
 			}
 
-			// 使用 localtime_s 确保线程安全
+			// 浣跨敤 localtime_s 纭繚绾跨▼瀹夊叏
 			tm tmBuf{};
 			errno_t err = localtime_s(&tmBuf, &t);
 			if (err != 0 || tmBuf.tm_mon < 0 || tmBuf.tm_mon > 11) {
 				return "";
 			}
 
-			// 格式化时间字符串
+			// 鏍煎紡鍖栨椂闂村瓧绗︿覆
 			char buf[64] = {};
 			strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &tmBuf);
 			return std::string(buf);
 		};
 
-		// 构造 TransferData 数据结构
+		// 鏋勯�� TransferData 鏁版嵁缁撴瀯
 		TransferData data;
 		data.strClassID = strClassID;
 		data.strCreateTime = format_time(pTask->getCreateTime());
@@ -276,7 +455,7 @@
 		data.strEndTime = format_time(pTask->getFinishTime());
 		data.strDescription = pTask->getSimpleDescription();
 
-		// 状态映射
+		// 鐘舵�佹槧灏�
 		static const char* STATUS_STR[] = {
 			"Ready", "Running", "Picking", "Picked", "Placing", "Restoring", "Error", "Abort", "Restored", "Completed"
 		};
@@ -289,31 +468,151 @@
 			data.strStatus = "Unknown";
 		}
 
-		// 写入数据库
+		// 鍐欏叆鏁版嵁搴�
 		if (code == ROBOT_EVENT_FINISH || code == ROBOT_EVENT_ERROR
 			|| code == ROBOT_EVENT_ABORT || code == ROBOT_EVENT_RESTORE) {
 			int nRecordId = 0;
 			TransferManager::getInstance().addTransferRecord(data, nRecordId);
-			LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
+			LOGI("<CModel>onRobotTaskEvent: 浠诲姟璁板綍宸蹭繚瀛橈紝RecordID=%d", nRecordId);
 		}
 		notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
 
 	};
+	masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
+		LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
+		static std::map<int, short> s_prevPortStatus;
+		const int eqId = (pEquipment != nullptr) ? pEquipment->getID() : 0;
+		const short prevStatus = s_prevPortStatus[eqId];
+		s_prevPortStatus[eqId] = status;
+		if (status == PORT_INUSE) {
+			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+			if (pLoadPort != nullptr) {
+				m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
+				if (prevStatus != PORT_INUSE && pLoadPort->isCompareMapsBeforeProceeding()) {
+					// TODO(Host鍗忓晢):
+					// 鏂囨。涓爣鏄庯細1-Empty锛�3-Exist锛屽洜姝ゆ垜浠彲鑳介渶瑕佸皢uint鐨刴ap杞崲涓簂ist涓婁紶 
+					m_hsmsPassive.setVariableValue("SlotMap", pLoadPort->getScanCassetteMap());
+					m_hsmsPassive.requestEventReportSend_CheckSlotMap();
+				}
+			}
+			m_hsmsPassive.requestEventReportSend_CarrierID_Readed();
+		}
+		else if (status == PORT_BLOCKED) {
+			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+			if (pLoadPort != nullptr) {
+				m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
+			}
+			m_hsmsPassive.requestEventReportSend_Port_Blocked();
+		}
+		else if (status == PORT_LOAD_READY) {
+			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+			if (pLoadPort != nullptr) {
+				m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
+			}
+			m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
+		}
+		else if (status == PORT_UNLOAD_READY) {
+			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+			if (pLoadPort != nullptr) {
+				m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
+				if (prevStatus == PORT_INUSE) {
+					m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
+					m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
+				}
+			}
+			m_hsmsPassive.requestEventReportSend_Port_Unload_Ready();
+		}
+		else if (status == PORT_EMPTY) {
+			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+			if (pLoadPort != nullptr) {
+				m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
+			}
+			m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
+		}
+		notifyPtr(RX_CODE_LOADPORT_STATUS_CHANGED, pEquipment);
+	};
+	masterListener.onProcessStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int slotNo, SERVO::PROCESS_STATE state) {
+		// SubEqpStart/SubEqpEnd: align to log's EV_SubEqpStart/EV_SubEqpEnd stage (no report payload required).
+		(void)pMaster;
+		if (pEquipment != nullptr) {
+			m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+		}
+		m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+		if (state == SERVO::PROCESS_STATE::Processing) {
+			m_hsmsPassive.requestEventReportSend_SubEqpStart();
+		}
+		else if (state == SERVO::PROCESS_STATE::Complete) {
+			m_hsmsPassive.requestEventReportSend_SubEqpEnd();
+		}
+	};
+	masterListener.onCTRoundEnd = [&](void* pMaster, int round) {
+		m_configuration.setContinuousTransferCount(round);
+	};
+	masterListener.onCjStart = [&](void* pMaster, void* pj) {
+		m_hsmsPassive.setVariableValue("CJStartID", ((SERVO::CControlJob*)pj)->id().c_str());
+		m_hsmsPassive.requestEventReportSend_CJ_Start();
+	};
+	masterListener.onCjEnd = [&](void* pMaster, void* pj) {
+		m_hsmsPassive.setVariableValue("CJEndID", ((SERVO::CControlJob*)pj)->id().c_str());
+		m_hsmsPassive.requestEventReportSend_CJ_End();
+
+		// 缁撴壒锛屼繚瀛楥ontrolJob
+		// 
+	};
+	masterListener.onPjStart = [&](void* pMaster, void* pj) {
+		m_hsmsPassive.setVariableValue("PJStartID", ((SERVO::CProcessJob*)pj)->id().c_str());
+		m_hsmsPassive.requestEventReportSend_PJ_Start();
+	};
+	masterListener.onPjEnd = [&](void* pMaster, void* pj) {
+		m_hsmsPassive.setVariableValue("PJEndID", ((SERVO::CProcessJob*)pj)->id().c_str());
+		m_hsmsPassive.requestEventReportSend_PJ_End();
+	};
+	masterListener.onPanelStart = [&](void* pMaster, void* pPanel) {
+		m_hsmsPassive.setVariableValue("PanelStartID", ((SERVO::CGlass*)pPanel)->getID().c_str());
+		m_hsmsPassive.requestEventReportSend_Panel_Start();
+	};
+	masterListener.onPanelEnd = [&](void* pMaster, void* pPanel) {
+		m_hsmsPassive.setVariableValue("PanelEndID", ((SERVO::CGlass*)pPanel)->getID().c_str());
+		m_hsmsPassive.requestEventReportSend_Panel_End();
+		// Placeholder payload to match log shape: EV_PROCESS_DATA_REPORT can carry a single A-string (may be empty).
+		m_hsmsPassive.setVariableValue("ProcessDataReportText", "");
+		m_hsmsPassive.requestEventReportSend_ProcessDataReport();
+		auto& db = GlassLogDb::Instance();
+		db.insertFromCGlass((*(SERVO::CGlass*)pPanel));
+		SERVO::CGlass* pBuddy = ((SERVO::CGlass*)pPanel)->getBuddy();
+		if (pBuddy != nullptr) {
+			db.insertFromCGlass(*pBuddy);
+		}
+	};
 	m_master.setListener(masterListener);
+	m_master.setContinuousTransferCount(m_configuration.getContinuousTransferCount());
 
 
-	// master 设置缓存文件
+	// master 璁剧疆缂撳瓨鏂囦欢
 	CString strMasterDataFile;
 	strMasterDataFile.Format(_T("%s\\Master.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_master.setCacheFilepath((LPTSTR)(LPCTSTR)strMasterDataFile);
+	m_master.setCompareMapsBeforeProceeding(m_configuration.isCompareMapsBeforeProceeding());
+	m_master.setJobMode(m_configuration.isJobMode());
+
+	// 鍔犳埅Job
+	strMasterDataFile.Format(_T("%s\\MasterState.dat"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	std::string strPath = std::string((LPTSTR)(LPCTSTR)strMasterDataFile);
+	m_master.setStateFile(strPath);
 
 
-	// 加载警告信息
+
+	// 鍔犺浇璀﹀憡淇℃伅
 	AlarmManager& alarmManager = AlarmManager::getInstance();
 	char szBuffer[MAX_PATH];
 	sprintf_s(szBuffer, MAX_PATH, "%s\\AlarmList.csv", (LPTSTR)(LPCTSTR)m_strWorkDir);
 	alarmManager.readAlarmFile(szBuffer);
 
+
+	// Glass鏁版嵁搴�
+	strLogDir.Format(_T("%s\\db\\process.db"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	std::string path((LPTSTR)(LPCTSTR)strLogDir);
+	GlassLogDb::Init(path);
 
 
 	return 0;
@@ -321,6 +620,11 @@
 
 int CModel::term()
 {
+	m_configuration.setPortCassetteSnSeed(1, m_master.getPortCassetteSnSeed(1));
+	m_configuration.setPortCassetteSnSeed(2, m_master.getPortCassetteSnSeed(2));
+	m_configuration.setPortCassetteSnSeed(3, m_master.getPortCassetteSnSeed(3));
+	m_configuration.setPortCassetteSnSeed(4, m_master.getPortCassetteSnSeed(4));
+	m_hsmsPassive.saveCache();
 	m_hsmsPassive.term();
 	CLog::GetLog()->SetOnLogCallback(nullptr);
 	m_master.term();

--
Gitblit v1.9.3