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/PortConfigurationDlg.h | 29 +++++++++++++++++++++++++++++
1 files changed, 29 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/PortConfigurationDlg.h b/SourceCode/Bond/Servo/PortConfigurationDlg.h
index a016273..0475d2d 100644
--- a/SourceCode/Bond/Servo/PortConfigurationDlg.h
+++ b/SourceCode/Bond/Servo/PortConfigurationDlg.h
@@ -1,6 +1,9 @@
锘�#pragma once
#include "afxdialogex.h"
#include "GridCtrl.h"
+#include "CLoadPort.h"
+#include "CCustomCheckBox.h"
+
// CPortConfigurationDlg 瀵硅瘽妗�
@@ -12,6 +15,10 @@
CPortConfigurationDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
virtual ~CPortConfigurationDlg();
+public:
+ void setCurSelPort(int sel);
+ BOOL IsCheckedAll();
+
// 瀵硅瘽妗嗘暟鎹�
#ifdef AFX_DESIGN_TIME
enum { IDD = IDD_DIALOG_PORT_CONFIGURATION };
@@ -20,8 +27,30 @@
protected:
virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
virtual BOOL OnInitDialog();
+ afx_msg void OnSelchangeComboPort();
+ afx_msg void OnBnClickedButtonApply();
+ afx_msg LRESULT OnCheckAllClicked(WPARAM wParam, LPARAM lParam);
DECLARE_MESSAGE_MAP()
private:
+ int GetLoadPortEqID(const std::string& strPortName);
+ void LoadPortConfigToUI(SERVO::CLoadPort* pPort);
+ void InitGrid();
+
+private:
+ SERVO::CLoadPort* m_pPort[4];
+ int m_nCurSelPort;
+
CGridCtrl m_wndGrid;
+ CComboBox m_comboPort;
+ CComboBox m_comboRecipe;
+ CComboBox m_comboMaterialsType;
+
+ CCustomCheckBox* m_pCheckBox;
+ BOOL m_bCheckedAll;
+
+public:
+ afx_msg void OnDestroy();
+ afx_msg void OnBnClickedButtonProcessStart();
+ afx_msg void OnBnClickedButtonProcessCancel();
};
--
Gitblit v1.9.3