From 0de0a72329a77fbf20bc299c542e435a6d47256b Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期六, 21 六月 2025 17:12:01 +0800
Subject: [PATCH] Merge branch 'liuyang' into clh

---
 SourceCode/Bond/Servo/PortConfigurationDlg.h |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.h b/SourceCode/Bond/Servo/PortConfigurationDlg.h
index ac7a710..f08af7f 100644
--- a/SourceCode/Bond/Servo/PortConfigurationDlg.h
+++ b/SourceCode/Bond/Servo/PortConfigurationDlg.h
@@ -1,6 +1,7 @@
 锘�#pragma once
 #include "afxdialogex.h"
 #include "GridCtrl.h"
+#include "CLoadPort.h"
 
 // CPortConfigurationDlg 瀵硅瘽妗�
 
@@ -20,11 +21,20 @@
 protected:
 	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
 	virtual BOOL OnInitDialog();
+	afx_msg void OnSelchangeComboPort();
+	afx_msg void OnBnClickedButtonApply();
 	DECLARE_MESSAGE_MAP()
 
 private:
-	CGridCtrl m_wndGrid;
-
+	int GetLoadPortEqID(const std::string& strPortName);
+	void LoadPortConfigToUI(SERVO::CLoadPort* pPort);
 	void InitGrid();
 	void FillGrid();
+
+	SERVO::CLoadPort* m_pPort[4];
+
+	CGridCtrl m_wndGrid;
+	CComboBox m_comboPort;
+	CComboBox m_comboRecipe;
+	CComboBox m_comboMaterialsType;
 };

--
Gitblit v1.9.3