From fd381da2f50420d8c861ad9cf213d7b1586f0188 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期四, 18 九月 2025 18:06:18 +0800
Subject: [PATCH] 1.Port物料选择控件完善； 2.继续处理CControlJobManagerDlg的功能；
---
SourceCode/Bond/Servo/CCjPage2.h | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index bbbdb59..284aeb4 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -6,9 +6,11 @@
struct PJWarp {
+ BOOL addToCj;
void* pj;
int port;
- bool checkSlot[8];
+ BOOL checkSlot[8];
+ int material[8];
};
// CPjPage1 瀵硅瘽妗�
@@ -26,7 +28,7 @@
protected:
void Resize();
- virtual void OnApply();
+ virtual int OnApply();
virtual void OnSetContext(void* pContext);
private:
@@ -35,6 +37,7 @@
private:
CCarrierSlotGrid m_grid;
std::vector<PJWarp> m_pjWarps;
+ int m_nSelRadioId;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -54,4 +57,6 @@
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);
};
--
Gitblit v1.9.3