From 867888458abdc029cbf31b6058edfefe30a20722 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 16:38:24 +0800
Subject: [PATCH] 1.修复重启后，由于PJ不是列队中，导致无法创建调度任务的问题。 2.修复CPjPage2点Port2的物料类型，Port1也跟着变的问题。

---
 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