From b78a202c2933d345e1983de26948dbdae5d72382 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 12 二月 2026 10:28:06 +0800
Subject: [PATCH] 1.加上限制条件,Port1必须配置Port2, Port3必须配Port4,且是同一ProcessJob

---
 SourceCode/Bond/Servo/CCjPage2.h |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index bbbdb59..a49ee7a 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -5,12 +5,6 @@
 
 
 
-struct PJWarp {
-	void* pj;
-	int port;
-	bool checkSlot[8];
-};
-
 // CPjPage1 瀵硅瘽妗�
 
 class CCjPage2 : public CCjPageBase
@@ -26,15 +20,18 @@
 
 protected:
 	void Resize();
-	virtual void OnApply();
+	virtual int OnApply();
 	virtual void OnSetContext(void* pContext);
 
 private:
 	void UpdatePjData();
+	void RefreshPortLocksAndButtons();
+	void SyncMaterialAcrossSelectedPorts(int material);
 
 private:
 	CCarrierSlotGrid m_grid;
 	std::vector<PJWarp> m_pjWarps;
+	int m_nSelRadioId;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -54,4 +51,10 @@
 	afx_msg void OnBnClickedRadio2();
 	afx_msg void OnBnClickedRadio3();
 	afx_msg void OnBnClickedRadio4();
+	afx_msg void OnGridSelChanged(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnGridMatChanged(NMHDR* pNMHDR, LRESULT* pResult);
+	afx_msg void OnBnClickedButtonPort1ProcessStart();
+	afx_msg void OnBnClickedButtonPort2ProcessStart();
+	afx_msg void OnBnClickedButtonPort3ProcessStart();
+	afx_msg void OnBnClickedButtonPort4ProcessStart();
 };

--
Gitblit v1.9.3