From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。

---
 SourceCode/Bond/Servo/CEquipmentPage1.h |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.h b/SourceCode/Bond/Servo/CEquipmentPage1.h
index 34106f1..5db7005 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.h
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.h
@@ -24,12 +24,18 @@
 	void setEquipment(SERVO::CEquipment* pEquipment);
 
 private:
+	int m_nCurrentDeviceID;
 	SERVO::CEquipment* m_pEquipment;
 	std::vector<SignalInfo> m_vSignalList;
 	CJobSlotGrid m_ctrlSignalPanel;
+	std::map<int, std::vector<SignalInfo>> m_mapSignalListByID;
 
-	void InitSignalList();
-	void LoadDeviceSignals();
+	void LoadSignalListFromCSV(const CString& strFilePath);
+	void InitSignalListForDevice(int nDeviceID);
+	void UpdateSignalState(int nRow, int nCol, bool bNewState);
+	void InitSignalSlotTextAndClickable();
+	void UpdateAllSignalStatesFromDevice();
+	void ResetSignalPanel();
 
 
 // 瀵硅瘽妗嗘暟鎹�
@@ -46,4 +52,5 @@
 	afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
 	afx_msg void OnDestroy();
 	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 };

--
Gitblit v1.9.3