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/CCjPage2.h |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index c68c377..1e90aea 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -4,6 +4,7 @@
 #include "CCarrierSlotGrid.h"
 
 
+
 // CPjPage1 瀵硅瘽妗�
 
 class CCjPage2 : public CCjPageBase
@@ -15,19 +16,22 @@
 	virtual ~CCjPage2();
 
 public:
-	void SetExclusionNames(std::vector<std::string>& names);
+	void SetPjWarps(std::vector<PJWarp>& pjs);
 
 protected:
 	void Resize();
-	virtual void OnApply();
+	virtual int OnApply();
 	virtual void OnSetContext(void* pContext);
 
 private:
 	void UpdatePjData();
+	void RefreshPortLocksAndButtons();
+	void SyncMaterialInPort(int port, int material);
 
 private:
 	CCarrierSlotGrid m_grid;
-	std::vector<std::string> m_exclusionNames;
+	std::vector<PJWarp> m_pjWarps;
+	int m_nSelRadioId;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -47,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