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/CReport.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReport.h b/SourceCode/Bond/Servo/CReport.h
index a2078e1..41952df 100644
--- a/SourceCode/Bond/Servo/CReport.h
+++ b/SourceCode/Bond/Servo/CReport.h
@@ -7,7 +7,7 @@
{
public:
CReport();
- CReport(unsigned int reportId);
+ CReport(unsigned int reportId, const std::vector<unsigned int>& vids);
virtual ~CReport();
public:
@@ -15,9 +15,14 @@
BOOL addVariable(CVariable* pVariable);
BOOL deleteVarialble(unsigned int nVarialbleId);
CVariable* getVariable(unsigned int nVarialbleId);
+ std::vector<CVariable*>& getVariables();
+ std::string getVariablesIdsText();
+ bool getVariableName(unsigned int vid, std::string& strName);
+ const std::vector<unsigned int>& getVids() const { return m_vids; }
private:
unsigned int m_nReportId;
+ std::vector<unsigned int> m_vids;
std::vector<CVariable*> m_variabels;
};
}
--
Gitblit v1.9.3