From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。
---
SourceCode/Bond/Servo/PageLog.h | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/PageLog.h b/SourceCode/Bond/Servo/PageLog.h
index 8670821..3cf2753 100644
--- a/SourceCode/Bond/Servo/PageLog.h
+++ b/SourceCode/Bond/Servo/PageLog.h
@@ -7,6 +7,12 @@
#define ID_MSG_LOGDLG_HIDE WM_USER + 1023
+
+enum class FilterMode {
+ Include, // 只保留匹配行
+ Exclude // 排除匹配行
+};
+
// CPageLog 对话框
class CPageLog : public CDialogEx
@@ -19,7 +25,7 @@
private:
- void InitRxWindow();
+ void InitRxWindows();
void AppendLog(int level, const char* pszText);
void Resize();
@@ -29,14 +35,15 @@
HBRUSH m_hbrBkgnd;
IObserver* m_pObserver;
int m_nLevel;
- CString m_strIncludeText;
- BOOL m_bIncludeRegex;
+ CString m_strFilterText;
+ BOOL m_bRegex;
std::vector<std::string> m_customIncludeTexts;
private:
CBlButton m_btnLevel;
CBlButton m_btnInclude;
CLogEdit m_logEdit;
+ FilterMode m_filterMode;
// 对话框数据
@@ -51,7 +58,6 @@
public:
virtual BOOL OnInitDialog();
afx_msg void OnSize(UINT nType, int cx, int cy);
- afx_msg void OnTimer(UINT_PTR nIDEvent);
afx_msg void OnDestroy();
afx_msg void OnClose();
afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
--
Gitblit v1.9.3