From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/CControlJobDlg.h |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/SourceCode/Bond/Servo/CControlJobDlg.h b/SourceCode/Bond/Servo/CControlJobDlg.h
index 83763f0..ed4bdff 100644
--- a/SourceCode/Bond/Servo/CControlJobDlg.h
+++ b/SourceCode/Bond/Servo/CControlJobDlg.h
@@ -1,5 +1,6 @@
 锘�#pragma once
 #include "CExpandableListCtrl.h"
+#include "CControlJob.h"
 
 
 // CControlJobDlg 瀵硅瘽妗�
@@ -11,6 +12,24 @@
 public:
 	CControlJobDlg(CWnd* pParent = nullptr);   // 鏍囧噯鏋勯�犲嚱鏁�
 	virtual ~CControlJobDlg();
+
+public:
+	void SetControlJob(SERVO::CControlJob* pControlJob);
+
+private:
+	void Resize();
+	void ShowGroup1(BOOL bShow);
+	void ShowGroup2(BOOL bShow);
+	void LoadData(SERVO::CControlJob* pControlJob);
+
+private:
+	SERVO::CControlJob* m_pControlJob;
+	CFont m_fontNoJob;
+
+	// 璁板綍涓婁竴娆＄殑 CJ 韬唤锛堟寚閽�/ID锛�
+	SERVO::CControlJob* m_lastCjPtr = nullptr;
+	CString             m_lastCjId;
+	CExpandableListCtrl::Node* m_rootNode = nullptr;
 
 protected:
 	CExpandableListCtrl m_listCtrl;
@@ -27,4 +46,8 @@
 	DECLARE_MESSAGE_MAP()
 public:
 	virtual BOOL OnInitDialog();
+	afx_msg void OnSize(UINT nType, int cx, int cy);
+	afx_msg void OnBnClickedButtonCompletionBath();
+	afx_msg void OnBnClickedButtonReload();
+	afx_msg void OnTimer(UINT_PTR nIDEvent);
 };

--
Gitblit v1.9.3