From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示

---
 SourceCode/Bond/Servo/CCjPage2.h |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index 5a7338b..e9561cd 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -1,7 +1,8 @@
 锘�#pragma once
 #include "CCjPageBase.h"
 #include "ProcessJob.h"
-#include "CCarrierSlotSelector.h"
+#include "CCarrierSlotGrid.h"
+
 
 
 // CPjPage1 瀵硅瘽妗�
@@ -14,16 +15,21 @@
 	CCjPage2(CWnd* pParent = nullptr);   // 鏍囧噯鏋勯�犲嚱鏁�
 	virtual ~CCjPage2();
 
+public:
+	void SetPjWarps(std::vector<PJWarp>& pjs);
+
 protected:
 	void Resize();
-	virtual void OnApply();
+	virtual int OnApply();
 	virtual void OnSetContext(void* pContext);
 
 private:
 	void UpdatePjData();
 
 private:
-	CCarrierSlotSelector m_selector;
+	CCarrierSlotGrid m_grid;
+	std::vector<PJWarp> m_pjWarps;
+	int m_nSelRadioId;
 
 // 瀵硅瘽妗嗘暟鎹�
 #ifdef AFX_DESIGN_TIME
@@ -39,4 +45,14 @@
 	afx_msg void OnDestroy();
 	afx_msg void OnEnChangeEditPjId();
 	afx_msg void OnCbnSelchangeComboRecipe();
+	afx_msg void OnBnClickedRadio1();
+	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