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

diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
new file mode 100644
index 0000000..e9561cd
--- /dev/null
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -0,0 +1,58 @@
+锘�#pragma once
+#include "CCjPageBase.h"
+#include "ProcessJob.h"
+#include "CCarrierSlotGrid.h"
+
+
+
+// CPjPage1 瀵硅瘽妗�
+
+class CCjPage2 : public CCjPageBase
+{
+	DECLARE_DYNAMIC(CCjPage2)
+
+public:
+	CCjPage2(CWnd* pParent = nullptr);   // 鏍囧噯鏋勯�犲嚱鏁�
+	virtual ~CCjPage2();
+
+public:
+	void SetPjWarps(std::vector<PJWarp>& pjs);
+
+protected:
+	void Resize();
+	virtual int OnApply();
+	virtual void OnSetContext(void* pContext);
+
+private:
+	void UpdatePjData();
+
+private:
+	CCarrierSlotGrid m_grid;
+	std::vector<PJWarp> m_pjWarps;
+	int m_nSelRadioId;
+
+// 瀵硅瘽妗嗘暟鎹�
+#ifdef AFX_DESIGN_TIME
+	enum { IDD = IDD_CJ_PAGE1 };
+#endif
+
+protected:
+	virtual void DoDataExchange(CDataExchange* pDX);    // DDX/DDV 鏀寔
+
+	DECLARE_MESSAGE_MAP()
+public:
+	virtual BOOL OnInitDialog();
+	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