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/CAttribute.h | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CAttribute.h b/SourceCode/Bond/Servo/CAttribute.h
index b87c662..b91e6cc 100644
--- a/SourceCode/Bond/Servo/CAttribute.h
+++ b/SourceCode/Bond/Servo/CAttribute.h
@@ -6,13 +6,20 @@
{
public:
CAttribute();
- CAttribute(const char* pszName, const char* pszValue, const char* pszDescription);
- ~CAttribute();
+ CAttribute(const char* pszName, const char* pszValue, const char* pszDescription, unsigned int weight);
+ virtual ~CAttribute();
+
+ public:
+ std::string& getName();
+ std::string& getValue();
+ std::string& getDescription();
+ unsigned int getWeight();
private:
std::string m_strName;
std::string m_strValue;
std::string m_strDescription;
+ unsigned int m_nWeight; // 权重,用于排序
};
}
--
Gitblit v1.9.3