From b25ce186da97a1a774ddf89504f97d8c244fda66 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 29 一月 2026 09:25:06 +0800
Subject: [PATCH] 1.移除 SubEqpStart/End（CEID 10015/10016） 2.UnitStart/UnitEnd 增加 PanelID（5006/5007） 3.Report/CEID 两个表都同步了对应 VIDs/备注

---
 SourceCode/Bond/Servo/Model.cpp |  319 ++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 278 insertions(+), 41 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 31788e7..22b263c 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -10,6 +10,7 @@
 #include "RecipeManager.h"
 #include "GlassLogDb.h"
 #include "CParam.h"
+#include "CJobDataS.h"
 #include <algorithm>
 #include <iomanip>
 #include <sstream>
@@ -34,6 +35,79 @@
 
 	// PJobSpace: how many ProcessJobs can be created (current implementation supports 0/1).
 	m_hsmsPassive.setVariableValue("PJobSpace", (__int64)(m_master.isProcessJobsEmpty() ? 1 : 0));
+}
+
+void CModel::notifyControlJobChanged()
+{
+	// 1) 鍒锋柊娲剧敓 SV
+	refreshDerivedSVs();
+	// 2) 閫氱煡涓婂眰 UI锛圧X_CODE_CONTROLJOB_CHANGED锛�
+	notify(RX_CODE_CONTROLJOB_CHANGED);
+}
+
+bool CModel::raiseSoftAlarm(int alarmId,
+	const std::string& desc,
+	int level /*= -1*/,
+	int deviceId /*= 0*/,
+	int unitId /*= 0*/,
+	const char* deviceName /*= "Software"*/,
+	const char* unitName /*= "App"*/)
+{
+	AlarmManager& alarmManager = AlarmManager::getInstance();
+	const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
+
+	int severity = level;
+	if (severity < 0 && info != nullptr) severity = info->nAlarmLevel;
+	if (severity < 0) severity = 0;
+
+	std::string descText = desc;
+	if (descText.empty() && info != nullptr) {
+		descText = !info->strDescription.empty() ? info->strDescription : info->strAlarmText;
+	}
+	if (descText.empty()) {
+		descText = CToolUnits::formatString("Alarm %d", alarmId);
+	}
+
+	AlarmData alarmData;
+	alarmData.nId = alarmId;
+	alarmData.nSeverityLevel = severity;
+	alarmData.nDeviceId = deviceId;
+	alarmData.nUnitId = unitId;
+	alarmData.strDeviceName = deviceName;
+	alarmData.strUnitName = unitName;
+	// 鑻ユ湭鏄惧紡鎻愪緵璁惧/鍗曞厓鍚嶇О锛屽皾璇曢�氳繃 deviceId/unitId 瑙ｆ瀽锛坰oft alarm 榛樿鍧囦负 0锛�
+	if (alarmData.strDeviceName.empty()) {
+		alarmData.strDeviceName = alarmManager.getDeviceNameById(deviceId);
+	}
+	if (alarmData.strUnitName.empty()) {
+		alarmData.strUnitName = alarmManager.getUnitNameById(deviceId, unitId);
+	}
+	alarmData.strStartTime = CToolUnits::timeToString2(CToolUnits::getTimestamp());
+	alarmData.strEndTime = "";
+	alarmData.strDescription = descText;
+
+	int nAlarmEventId = 0;
+	bool result = alarmManager.addAlarm(alarmData, nAlarmEventId);
+	if (result) {
+		notify(RX_CODE_ALARM_SET);
+		if (m_master.isAlarmReportEnable()) {
+			m_hsmsPassive.requestAlarmReport(1, alarmId, descText.c_str());
+		}
+	}
+	return result;
+}
+
+void CModel::clearSoftAlarm(int alarmId, int deviceId, int unitId)
+{
+	AlarmManager& alarmManager = AlarmManager::getInstance();
+	alarmManager.clearAlarmByAttributes(alarmId, deviceId, unitId, CToolUnits::getCurrentTimeString());
+	notify(RX_CODE_ALARM_CLEAR);
+	if (m_master.isAlarmReportEnable()) {
+		const AlarmInfo* info = alarmManager.getAlarmInfoByID(alarmId);
+		std::string descText;
+		if (info != nullptr) descText = info->strAlarmText;
+		m_hsmsPassive.requestAlarmReport(0, alarmId, descText.c_str());
+	}
 }
 
 void CModel::setControlState(ControlState newState)
@@ -110,6 +184,7 @@
 
 int CModel::init()
 {
+	const ULONGLONG boot_model_begin = GetTickCount64();
 	CString strIniFile;
 	CString strUnitId;
 	strIniFile.Format(_T("%s\\ServoConfiguration.ini"), (LPTSTR)(LPCTSTR)m_strWorkDir);
@@ -124,6 +199,9 @@
 	// CGlassPool
 	m_glassPool.initPool();
 
+	// 灏� Model 涓婁笅鏂囦紶閫掔粰 Master锛屼究浜� Master 瑙﹀彂杞欢绾ф姤璀︾瓑璺ㄥ眰鎿嶄綔
+	m_master.setModelCtx(this);
+
 
 	// Log
 	CString strLogDir;
@@ -137,6 +215,7 @@
 	CLog::GetLog()->SetLogsDir(strLogDir);
 	CLog::GetLog()->SetEquipmentId((LPTSTR)(LPCTSTR)strUnitId);
 	LOGI("\r\n\r\n~~~ Prog Start! ~~~");
+	LOGI("[BOOT][MODEL] init begin");
 
 
 	SECSListener listener;
@@ -167,18 +246,6 @@
 			setControlState(ControlState::OnlineRemote);
 		}
 	};
-	listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
-		// 鍦ㄦ濉厖甯搁噺鍊硷紝鐩墠浠呮槸鍔�1鍚庤繑鍥�
-		for (auto& item : eqcs) {
-			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);
-		}
-	};
 	listener.onDatetimeSync = [&](void* pFrom, SYSTEMTIME& time) -> void {
 		LOGI("onDatetimeSync: %d%02d%02d%02d%02d%02d", time.wYear,
 			time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
@@ -189,6 +256,21 @@
 		if (ids.empty()) {
 			m_master.enableEventReport(bEnable);
 		}
+	};
+	listener.onDeletePPID = [&](void* pFrom, const std::vector<std::string>& ppids) -> bool {
+		(void)pFrom;
+		bool allOk = true;
+		std::vector<std::string> targets = ppids;
+		if (targets.empty()) {
+			// L:0 => delete all PPIDs
+			targets = RecipeManager::getInstance().getAllPPID();
+		}
+		for (auto& ppid : targets) {
+			bool ok = RecipeManager::getInstance().deleteRecipeByPPID(ppid);
+			allOk = allOk && ok;
+			LOGI("<CModel>DeletePPID: %s, result=%s", ppid.c_str(), ok ? "OK" : "FAIL");
+		}
+		return allOk;
 	};
 	listener.onEnableDisableAlarmReport = [&](void* pFrom, bool bEnable, unsigned int id) -> void {
 		LOGI("onEnableDisableAlarmReport bEnable:%s, id:%d", bEnable ? _T("YES") : _T("NO"), id);
@@ -229,6 +311,11 @@
 				// 鐪熸鐨勨�滃紑濮嬧�濈敱 ProceedWithSlotMap 鍐崇瓥瑙﹀彂銆�
 				// 浠呭綋鏈紑鍚� CompareMapsBeforeProceeding 鏃讹紝鎵嶆部鐢ㄦ棫閫昏緫鐩存帴 Start銆�
 				LOGI("<CModel>ProceedWithCarrier");
+				if (m_master.getControlJob() == nullptr || m_master.isProcessJobsEmpty()) {
+					strErrorTxt = "rejected - ControlJob/ProcessJob not ready";
+					LOGW("<CModel>ProceedWithCarrier rejected: no CJ/PJ, port=%d", portIndex + 1);
+					return CAACK_5;
+				}
 				if (pLoadPort == nullptr || !pLoadPort->isCompareMapsBeforeProceeding()) {
 					m_master.proceedWithCarrier(portIndex);
 				}
@@ -246,11 +333,24 @@
 					return CAACK_5;
 				}
 
+				const short scanMap = pLoadPort->getScanCassetteMap();
+				const short downloadMap = pLoadPort->getDownloadCassetteMap();
 				m_hsmsPassive.withVariableLock([&] {
-					m_hsmsPassive.setVariableValue("SlotMapScan", pLoadPort->getScanCassetteMap());
-					m_hsmsPassive.setVariableValue("SlotMapDownload", pLoadPort->getDownloadCassetteMap());
-					m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+					m_hsmsPassive.setVariableValue("SlotMapScan", scanMap);
+					m_hsmsPassive.setVariableValue("SlotMapDownload", downloadMap);
+					if (scanMap != downloadMap) {
+						m_hsmsPassive.requestEventReportSend_SlotMapVerificationNG();
+						m_hsmsPassive.requestEventReportSend("SlotMapMismatch");
+					}
+					else {
+						m_hsmsPassive.requestEventReportSend_SlotMapVerificationOK();
+					}
 				});
+
+				if (scanMap != downloadMap) {
+					strErrorTxt = "rejected - SlotMap mismatch";
+					return CAACK_5;
+				}
 
 				// Host 纭 SlotMap 鍚庡啀寮�濮嬪姞宸�/娴佺▼
 				m_master.proceedWithCarrier(portIndex);
@@ -269,6 +369,23 @@
 		for (auto p : pjs) {
 			LOGI("<Model>onPRJobMultiCreate %s %s", p->id().c_str(), p->recipeSpec().c_str());
 		}
+
+		auto rejectAll = [&](uint32_t code, const std::string& msg) -> int {
+			LOGW("<Model>onPRJobMultiCreate rejected: %s", msg.c_str());
+			for (auto p : pjs) {
+				if (p != nullptr) p->addIssue(code, msg);
+			}
+			return -1;
+		};
+
+		// 鍗� PJ 妯″紡锛氬彧鎺ュ彈 1 鏉′笖褰撳墠鏃犲湪鍒� PJ
+		if (pjs.size() != 1) {
+			return rejectAll(1200, "Only 1 ProcessJob supported (single-PJ mode)");
+		}
+		if (!m_master.isProcessJobsEmpty()) {
+			return rejectAll(1201, "ProcessJob exists, cannot create new in single-PJ mode");
+		}
+
 		int nRet = m_master.setProcessJobs(pjs);
 		auto processJobs = m_master.getProcessJobs();
 		std::vector<SERVO::CVariable> vars;
@@ -295,6 +412,10 @@
 	CString strVarialbleFile;
 	strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+	strVarialbleFile.Format(_T("%s\\DataVariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	m_hsmsPassive.loadDataVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+	strVarialbleFile.Format(_T("%s\\EquipmentConstantList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
 	setControlState(m_currentControlState);
 	refreshDerivedSVs();
 	m_hsmsPassive.init(this, "APP", 7000);
@@ -302,8 +423,19 @@
 	m_hsmsPassive.loadReports((LPTSTR)(LPCTSTR)strVarialbleFile);
 	strVarialbleFile.Format(_T("%s\\CollectionEventList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_hsmsPassive.loadCollectionEvents((LPTSTR)(LPCTSTR)strVarialbleFile);
+	{
+		auto events = m_hsmsPassive.getCollectionEvents();
+		std::vector<unsigned int> ceids;
+		ceids.reserve(events.size());
+		for (auto e : events) {
+			if (e != nullptr) ceids.push_back(e->getEventId());
+		}
+		m_master.setAllowedCeids(ceids);
+	}
 	strVarialbleFile.Format(_T("%s\\HsmsPassive.cache"), (LPTSTR)(LPCTSTR)m_strWorkDir);
 	m_hsmsPassive.loadCacheFromFile(strVarialbleFile);
+	LOGI("[BOOT][MODEL] HSMS config loaded, cost=%llu ms",
+		(unsigned long long)(GetTickCount64() - boot_model_begin));
 
 
 	SERVO::MasterListener masterListener;
@@ -319,7 +451,7 @@
 	};
 	masterListener.onControlJobChanged = [this](void* pMaster) {
 		(void)pMaster;
-		this->refreshDerivedSVs();
+		this->notifyControlJobChanged();
 		};
 	masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
 		LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
@@ -393,9 +525,9 @@
 		if (pReport != nullptr) {
 			m_hsmsPassive.withVariableLock([&] {
 				m_hsmsPassive.setVariableValue("VCRPanelID", pReport->getGlassId().c_str());
-				int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read_OK();
+				int nRet = m_hsmsPassive.requestEventReportSend_OCR_PanelID_Read(pReport->getVcrResult());
 				if (nRet != ER_NOERROR) {
-					LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read_OK failed, ret=%d", nRet);
+					LOGE("<CModel>requestEventReportSend_OCR_PanelID_Read failed, ret=%d", nRet);
 				}
 			});
 		}
@@ -495,6 +627,87 @@
 		notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
 
 	};
+	masterListener.onJobReceived = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
+		(void)pMaster;
+		(void)port;
+		if (pEquipment == nullptr || pJobDataS == nullptr) return;
+		{
+			const std::string& g1 = pJobDataS->getGlass1Id();
+			const std::string& g2 = pJobDataS->getGlass2Id();
+			std::string glassId;
+			if (!g1.empty() && !g2.empty()) {
+				glassId = g1 + "+" + g2;
+			}
+			else if (!g1.empty()) {
+				glassId = g1;
+			}
+			else {
+				glassId = g2;
+			}
+			const int slotNo = pJobDataS->getTargetSlotNo();
+			m_hsmsPassive.withVariableLock([&] {
+				m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+				m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+				m_hsmsPassive.setVariableValue("MaterialId", glassId.c_str());
+				m_hsmsPassive.requestEventReportSend("GlassReceivedJob");
+			});
+		}
+		const int eqId = pEquipment->getID();
+		const int recipeId = pJobDataS->getMasterRecipe();
+		std::string recipe = RecipeManager::getInstance().getPPIDById(recipeId);
+		if (recipe.empty()) {
+			recipe = std::to_string(recipeId);
+		}
+		const std::string prev = pEquipment->getCurrentRecipe();
+		if (recipe.empty() || recipe == prev) {
+			pEquipment->setCurrentRecipe(recipe);
+			return;
+		}
+		pEquipment->setCurrentRecipe(recipe);
+		m_hsmsPassive.withVariableLock([&] {
+			m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
+			m_hsmsPassive.setVariableValue("EQPPExecName", recipe.c_str());
+			m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+			const char* recipeVid = nullptr;
+			switch (eqId) {
+			case EQ_ID_Bonder1: recipeVid = "Bonder1CurrentRecipe"; break;
+			case EQ_ID_Bonder2: recipeVid = "Bonder2CurrentRecipe"; break;
+			case EQ_ID_VACUUMBAKE: recipeVid = "VacuumBakeCurrentRecipe"; break;
+			case EQ_ID_BAKE_COOLING: recipeVid = "BakeCoolingCurrentRecipe"; break;
+			case EQ_ID_MEASUREMENT: recipeVid = "MeasurementCurrentRecipe"; break;
+			case EQ_ID_EFEM: recipeVid = "EFEMCurrentRecipe"; break;
+			default: break;
+			}
+			if (recipeVid != nullptr) {
+				m_hsmsPassive.setVariableValue(recipeVid, recipe.c_str());
+			}
+			m_hsmsPassive.requestEventReportSend("RecipeChanged");
+		});
+	};
+	masterListener.onJobSentOut = [&](void* pMaster, SERVO::CEquipment* pEquipment, int port, SERVO::CJobDataS* pJobDataS) {
+		(void)pMaster;
+		(void)port;
+		if (pEquipment == nullptr || pJobDataS == nullptr) return;
+		const std::string& g1 = pJobDataS->getGlass1Id();
+		const std::string& g2 = pJobDataS->getGlass2Id();
+		std::string glassId;
+		if (!g1.empty() && !g2.empty()) {
+			glassId = g1 + "+" + g2;
+		}
+		else if (!g1.empty()) {
+			glassId = g1;
+		}
+		else {
+			glassId = g2;
+		}
+		const int slotNo = pJobDataS->getSourceSlotNo();
+		m_hsmsPassive.withVariableLock([&] {
+			m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+			m_hsmsPassive.setVariableValue("SubEqpSlot", slotNo);
+			m_hsmsPassive.setVariableValue("MaterialId", glassId.c_str());
+			m_hsmsPassive.requestEventReportSend("GlassSentOutJob");
+		});
+	};
 	masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
 		LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
 		static std::map<int, short> s_prevPortStatus;
@@ -505,9 +718,15 @@
 
 		// Unified PortStateChange event + SV maintenance
 		if (pLoadPort != nullptr) {
+			const unsigned int portIndex = pLoadPort->getIndex() + 1;
+			char stateVid[64] = {0};
+			char modeVid[64] = {0};
+			sprintf_s(stateVid, "PortTransferState_P%u", portIndex);
+			sprintf_s(modeVid, "AccessMode_P%u", portIndex);
 			m_hsmsPassive.withVariableLock([&] {
-				m_hsmsPassive.setVariableValue("PortTransferState", (__int64)status); // maintain SVID=100
-				m_hsmsPassive.setVariableValue("PortStateChangePortId", pLoadPort->getID());
+				m_hsmsPassive.setVariableValue(stateVid, (__int64)status);
+				m_hsmsPassive.setVariableValue(modeVid, (__int64)pLoadPort->getPortMode());
+				m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
 				m_hsmsPassive.setVariableValue("PortState", (__int64)status);
 				m_hsmsPassive.requestEventReportSend("PortStateChange");
 			});
@@ -516,7 +735,10 @@
 		if (status == PORT_INUSE) {
 			m_hsmsPassive.withVariableLock([&] {
 				if (pLoadPort != nullptr) {
-					m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
+					const unsigned int portIndex = pLoadPort->getIndex() + 1;
+					char carrierVid[64] = {0};
+					sprintf_s(carrierVid, "CarrierID_P%u", portIndex);
+					m_hsmsPassive.setVariableValue(carrierVid, pLoadPort->getCassetteId().c_str());
 					if (prevStatus != PORT_INUSE && pLoadPort->isCompareMapsBeforeProceeding()) {
 						// TODO(Host鍗忓晢):
 						// 鏂囨。涓爣鏄庯細1-Empty锛�3-Exist锛屽洜姝ゆ垜浠彲鑳介渶瑕佸皢uint鐨刴ap杞崲涓簂ist涓婁紶 
@@ -531,7 +753,7 @@
 			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
 			m_hsmsPassive.withVariableLock([&] {
 				if (pLoadPort != nullptr) {
-					m_hsmsPassive.setVariableValue("BlockedPortId", pLoadPort->getID());
+					m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
 				}
 				m_hsmsPassive.requestEventReportSend_Port_Blocked();
 			});
@@ -540,7 +762,7 @@
 			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
 			m_hsmsPassive.withVariableLock([&] {
 				if (pLoadPort != nullptr) {
-					m_hsmsPassive.setVariableValue("LoadReadyPortId", pLoadPort->getID());
+					m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
 				}
 				m_hsmsPassive.requestEventReportSend_Port_Load_Ready();
 			});
@@ -549,9 +771,9 @@
 			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
 			m_hsmsPassive.withVariableLock([&] {
 				if (pLoadPort != nullptr) {
-					m_hsmsPassive.setVariableValue("UnloadReadyPortId", pLoadPort->getID());
+					m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
 					if (prevStatus == PORT_INUSE) {
-						m_hsmsPassive.setVariableValue("ReadyToReleasePortId", pLoadPort->getID());
+						m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
 						m_hsmsPassive.requestEventReportSend_Port_Ready_To_Release();
 					}
 				}
@@ -562,7 +784,7 @@
 			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
 			m_hsmsPassive.withVariableLock([&] {
 				if (pLoadPort != nullptr) {
-					m_hsmsPassive.setVariableValue("LoadPortNotAssocPortId", pLoadPort->getID());
+					m_hsmsPassive.setVariableValue("PortId", pLoadPort->getID());
 				}
 				m_hsmsPassive.requestEventReportSend_LoadPortNotAssoc();
 			});
@@ -589,34 +811,37 @@
 			m_hsmsPassive.setVariableValue("CurrentProcessState", (__int64)state);
 			m_hsmsPassive.requestEventReportSend("ProcessStateChanged");
 
-			// SubEqp events (per equipment, ignore slot distinction except payload)
-			static std::map<int, SERVO::PROCESS_STATE> s_prevSubEqpState;
-			const auto prevEqState = s_prevSubEqpState[eqId];
-			if (prevEqState != state) {
-				// state change
-				m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
-			}
-			if (state == SERVO::PROCESS_STATE::Processing) {
-				m_hsmsPassive.requestEventReportSend_SubEqpStart();
-			}
-			else if (state == SERVO::PROCESS_STATE::Complete) {
-				m_hsmsPassive.requestEventReportSend_SubEqpEnd();
-			}
-			s_prevSubEqpState[eqId] = state;
-
 			// Unit events (per equipment slot)
 			static std::map<int, std::map<int, SERVO::PROCESS_STATE>> s_prevUnitState;
 			const auto prevUnitState = s_prevUnitState[eqId][slotNo];
 			if (prevUnitState != state) {
 				m_hsmsPassive.requestEventReportSend("UnitStateChange");
+				std::string panelId;
+				if (pEquipment != nullptr && slotNo > 0) {
+					if (auto* pGlass = pEquipment->getGlassFromSlot(slotNo)) {
+						panelId = pGlass->getID();
+					}
+				}
 				if (state == SERVO::PROCESS_STATE::Processing) {
+					m_hsmsPassive.setVariableValue("PanelStartID", panelId.c_str());
 					m_hsmsPassive.requestEventReportSend("UnitStart");
 				}
 				else if (state == SERVO::PROCESS_STATE::Complete) {
+					m_hsmsPassive.setVariableValue("PanelEndID", panelId.c_str());
 					m_hsmsPassive.requestEventReportSend("UnitEnd");
 				}
 				s_prevUnitState[eqId][slotNo] = state;
 			}
+		});
+	};
+	masterListener.onEqStatusChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, int unitId, int status, int reason) {
+		(void)pMaster;
+		if (pEquipment == nullptr) return;
+		m_hsmsPassive.withVariableLock([&] {
+			m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+			m_hsmsPassive.setVariableValue("SubEqpSlot", unitId);
+			m_hsmsPassive.setVariableValue("EquipmentStatus", (__int64)status);
+			m_hsmsPassive.requestEventReportSend("SubEqpStateChange");
 		});
 	};
 	masterListener.onSVDataReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, const std::vector<CParam>& params) {
@@ -626,6 +851,10 @@
 		auto sendSv = [&](const auto& vidMap, const char* evName) {
 			const size_t count = (std::min)(params.size(), vidMap.size());
 			m_hsmsPassive.withVariableLock([&] {
+				if (pEquipment != nullptr) {
+					m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+				}
+				m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
 				m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
 				for (size_t idx = 0; idx < count; ++idx) {
 					const std::string val = formatParamValue(params[idx]);
@@ -668,6 +897,10 @@
 		auto sendProcess = [&](const auto& vidMap, const char* evName) {
 			const size_t count = (std::min)(params.size(), vidMap.size());
 			m_hsmsPassive.withVariableLock([&] {
+				if (pEquipment != nullptr) {
+					m_hsmsPassive.setVariableValue("SubEqpName", pEquipment->getName().c_str());
+				}
+				m_hsmsPassive.setVariableValue("SubEqpSlot", 0);
 				m_hsmsPassive.setVariableValue("Clock", CToolUnits::getCurrentTimeString().c_str());
 				for (size_t idx = 0; idx < count; ++idx) {
 					const std::string val = formatParamValue(params[idx]);
@@ -771,6 +1004,8 @@
 	char szBuffer[MAX_PATH];
 	sprintf_s(szBuffer, MAX_PATH, "%s\\AlarmList.csv", (LPTSTR)(LPCTSTR)m_strWorkDir);
 	alarmManager.readAlarmFile(szBuffer);
+	LOGI("[BOOT][MODEL] Alarm list loaded, cost=%llu ms",
+		(unsigned long long)(GetTickCount64() - boot_model_begin));
 
 
 	// Glass鏁版嵁搴�
@@ -779,6 +1014,8 @@
 	GlassLogDb::Init(path);
 
 
+	LOGI("[BOOT][MODEL] init finished, total cost=%llu ms",
+		(unsigned long long)(GetTickCount64() - boot_model_begin));
 	return 0;
 }
 

--
Gitblit v1.9.3