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/CCollectionEvent.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCollectionEvent.h b/SourceCode/Bond/Servo/CCollectionEvent.h
index a0b023d..7dfe985 100644
--- a/SourceCode/Bond/Servo/CCollectionEvent.h
+++ b/SourceCode/Bond/Servo/CCollectionEvent.h
@@ -2,7 +2,6 @@
#include "CReport.h"
#include <vector>
-
namespace SERVO {
class CCollectionEvent
{
@@ -17,13 +16,14 @@
std::string& getDescription();
std::vector<CReport*>& getReports();
std::string getReportIdsText();
+ const std::vector<unsigned int>& getReportIds() const { return m_rptids; }
BOOL addReport(CReport* pReport);
BOOL deleteReport(unsigned int nReportId);
CReport* getReport(unsigned int nReportId);
/* 如果一个CEID只有一个Report的场景,调用此函数设置或取消 */
void setReport(CReport* pReport);
- unsigned int getFirstPortID();
+ unsigned int getFirstReportID();
CReport* getFirstReport();
private:
@@ -33,4 +33,4 @@
std::vector<unsigned int> m_rptids;
std::vector<CReport*> m_reports;
};
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3