From bea6407b376a4e426f0b120bae569fba6ab867db Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 08 十一月 2025 17:55:47 +0800
Subject: [PATCH] 1.CMaster.cpp 第 1644/1667/1691 行在记录 SV 曲线时通过 getGlassFromSlot(0) 取玻璃，而各设备的 initSlots() 都是从 1 开始编号（例如 CBonder.cpp (line 408)、CVacuumBake.cpp (line 415) 等）。槽位 0 永远不存在，所以 pGlass 始终是 nullptr，pGlass->addSVData(...) 的分支从未执行。结果 SERVO::CGlass::m_svDatas 里没有任何曲线数据，GlassJson::ToPrettyString 生成的 pretty 字符串也就没有 sv_datas，导出 CSV 时自然读不到曲线。 同一段代码还有一个潜在 Bug：虽然判断了 channel - 1 < bonderTypes.size()，但真正索引却用的是 bonderTypes[channel]。索引偏移会导致数据类型错位，最后一个通道甚至可能越界。即使修正了槽位，这里也需要同步改成 bonderTypes[channel - 1]（另外两处 vacuumbakeTypes、coolingTypes 也一样）。

---
 SourceCode/Bond/Servo/Model.cpp |  252 ++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 234 insertions(+), 18 deletions(-)

diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 064a164..8530738 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -7,6 +7,8 @@
 #include "AlarmManager.h"
 #include "CGlassPool.h"
 #include "TransferManager.h"
+#include "RecipeManager.h"
+#include "GlassLogDb.h"
 
 
 CModel::CModel()
@@ -47,9 +49,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()
@@ -75,7 +98,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);
@@ -99,7 +122,7 @@
 	listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
 		// 在此填充常量值，目前仅是加1后返回
 		for (auto& item : eqcs) {
-			sprintf_s(item.szValue, 256, "Test%d", item.id+1);
+			sprintf_s(item.szValue, 256, "Test%d", item.id + 1);
 		}
 	};
 	listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
@@ -108,11 +131,95 @@
 			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);
+		m_master.datetimeSync(time);
+	};
+	listener.onEnableDisableEventReport = [&](void* pFrom, bool bEnable, std::vector<unsigned int> ids) -> void {
+		LOGI("EanbleDisableEventReport bEnable:%s", bEnable ? _T("YES") : _T("NO"));
+		if (ids.empty()) {
+			m_master.enableEventReport(bEnable);
+		}
+	};
+	listener.onEnableDisableAlarmReport = [&](void* pFrom, bool bEnable, unsigned int id) -> void {
+		LOGI("onEnableDisableAlarmReport bEnable:%s, id:%d", bEnable ? _T("YES") : _T("NO"), id);
+		if (id == 0) {
+			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;
+			}
 
+			if (_strcmpi(pszCarrierAction, "ProceedWithCarrier") == 0) {
+				m_master.proceedWithCarrier(PTN);
+				return CAACK_0;
+			}
+			else if (_strcmpi(pszCarrierAction, "CarrierRelease") == 0) {
+				m_master.carrierRelease(PTN);
+				return CAACK_0;
+			}
+
+			strErrorTxt = "rejected - invalid state";
+			return CAACK_5;
+			LOGI("<Model>onCarrierAction %d, %s, %d, %d", DATAID, pszCarrierAction, pszCarrierId, PTN);
+	};
+	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);
 	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);
+	strVarialbleFile.Format(_T("%s\\HsmsPassive.cache"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+	m_hsmsPassive.loadCacheFromFile(strVarialbleFile);
 
 
 	SERVO::MasterListener masterListener;
@@ -121,13 +228,13 @@
 		notify(RX_CODE_MASTER_STATE_CHANGED);
 	};
 	masterListener.onEqAlive = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bAlive) -> void {
-		LOGI("<CModel>Equipment onAlive:%s(%s).\n", pEquipment->getName().c_str(),
+		LOGI("<CModel>Equipment onAlive:%s(%s).", pEquipment->getName().c_str(),
 			bAlive ? _T("ON") : _T("OFF"));
 		notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
 
 	};
 	masterListener.onEqCimStateChanged = [&](void* pMaster, SERVO::CEquipment* pEquipment, BOOL bOn) -> void {
-		LOGI("<CModel>Equipment Cim State:%s(%s).\n", pEquipment->getName().c_str(),
+		LOGI("<CModel>Equipment Cim State:%s(%s).", pEquipment->getName().c_str(),
 			bOn ? _T("ON") : _T("OFF"));
 		notifyPtr(RX_CODE_EQ_ALIVE, pEquipment);
 
@@ -149,9 +256,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);
@@ -172,9 +288,11 @@
 			notify(RX_CODE_ALARM_CLEAR);
 		}
 
-		m_hsmsPassive.requestAlarmReport(state,
-			pEquipment->getBaseAlarmId() + alarmId,
-			strAlarmText.c_str());
+		if (m_master.isAlarmReportEnable()) {
+			m_hsmsPassive.requestAlarmReport(state,
+				pEquipment->getBaseAlarmId() + alarmId,
+				strAlarmText.c_str());
+		}
 	};
 	masterListener.onEqVcrEventReport = [&](void* pMaster, SERVO::CEquipment* pEquipment, SERVO::CVcrEventReport* pReport) {
 		LOGE("<CModel>onEqVcrEventReport.");
@@ -190,8 +308,16 @@
 		}
 
 		// 任务描述与 ID 用于日志
+		SERVO::CGlass* pGlass = (SERVO::CGlass*)pTask->getContext();
 		const std::string& strDesc = pTask->getDescription();
-		const std::string& strClassID = pTask->getId();
+		std::string strClassID;
+		if (pGlass != nullptr) {
+			strClassID = pGlass->getID();
+			if (pGlass->getBuddy() != nullptr) {
+				strClassID += "/";
+				strClassID += pGlass->getBuddy()->getID();
+			}
+		}
 
 		// 日志输出与状态处理
 		switch (code) {
@@ -245,31 +371,111 @@
 
 		// 状态映射
 		static const char* STATUS_STR[] = {
-			"Unknown", "Ready", "Running", "Picking", "Placing", "Restoring", "Error", "Abort", "Completed"
+			"Ready", "Running", "Picking", "Picked", "Placing", "Restoring", "Error", "Abort", "Restored", "Completed"
 		};
 		auto state = pTask->getState();
 		int index = static_cast<int>(state);
-		if (index > 0 && index < static_cast<int>(std::size(STATUS_STR))) {
+		if (index >= 0 && index < static_cast<int>(std::size(STATUS_STR))) {
 			data.strStatus = STATUS_STR[index];
 		}
 		else {
-			data.strStatus = STATUS_STR[0];
+			data.strStatus = "Unknown";
 		}
 
 		// 写入数据库
-		int nRecordId = 0;
-		TransferManager::getInstance().addTransferRecord(data, nRecordId);
-
+		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);
+		}
 		notifyPtrAndInt(RX_CODE_EQ_ROBOT_TASK, pTask, nullptr, code);
-		LOGI("<CModel>onRobotTaskEvent: 任务记录已保存，RecordID=%d", nRecordId);
+
+	};
+	masterListener.onLoadPortStatusChanged = [&] (void* pMaster, SERVO::CEquipment* pEquipment, short status, __int64 data) {
+		LOGE("<CModel>onLoadPortStatusChanged. status = %d", status);
+		if (status == PORT_INUSE) {
+			SERVO::CLoadPort* pLoadPort = dynamic_cast<SERVO::CLoadPort*>(pEquipment);
+			if (pLoadPort != nullptr) {
+				m_hsmsPassive.setVariableValue("CarrierID", pLoadPort->getCassetteId().c_str());
+			}
+			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());
+			}
+			m_hsmsPassive.requestEventReportSend_Port_Unload_Ready();
+		}
+		notifyPtr(RX_CODE_LOADPORT_STATUS_CHANGED, pEquipment);
+	};
+	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();
+
+		// 结批，保存ControlJob
+		// 
+	};
+	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();
+		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 设置缓存文件
 	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);
+
 
 
 	// 加载警告信息
@@ -279,12 +485,22 @@
 	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;
 }
 
 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