From 334b16b4abb4cbe3d1d4e4f211efd6f4468ae09f Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期五, 19 九月 2025 15:12:52 +0800
Subject: [PATCH] 1.ControlJob和ProcessJob的中断操作，强制结批增加字符串描述原因，方便生产跟踪。
---
SourceCode/Bond/Servo/CCjPage2.h | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage2.h b/SourceCode/Bond/Servo/CCjPage2.h
index c68c377..284aeb4 100644
--- a/SourceCode/Bond/Servo/CCjPage2.h
+++ b/SourceCode/Bond/Servo/CCjPage2.h
@@ -4,6 +4,15 @@
#include "CCarrierSlotGrid.h"
+
+struct PJWarp {
+ BOOL addToCj;
+ void* pj;
+ int port;
+ BOOL checkSlot[8];
+ int material[8];
+};
+
// CPjPage1 瀵硅瘽妗�
class CCjPage2 : public CCjPageBase
@@ -15,11 +24,11 @@
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:
@@ -27,7 +36,8 @@
private:
CCarrierSlotGrid m_grid;
- std::vector<std::string> m_exclusionNames;
+ std::vector<PJWarp> m_pjWarps;
+ int m_nSelRadioId;
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
@@ -47,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