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/CVcrEventReport.cpp | 30 +++++++++++++++++++++++++++---
1 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CVcrEventReport.cpp b/SourceCode/Bond/Servo/CVcrEventReport.cpp
index 914b0d0..9741a11 100644
--- a/SourceCode/Bond/Servo/CVcrEventReport.cpp
+++ b/SourceCode/Bond/Servo/CVcrEventReport.cpp
@@ -46,7 +46,7 @@
int CVcrEventReport::serialize(char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 640) return -1;
+ if (nBufferSize < 30) return -1;
int index = 0;
int strLen = min(20, m_strGlassId.size());
@@ -71,9 +71,9 @@
return 15 * 2;
}
- int CVcrEventReport::unserialize(char* pszBuffer, int nBufferSize)
+ int CVcrEventReport::unserialize(const char* pszBuffer, int nBufferSize)
{
- if (nBufferSize < 640) return -1;
+ if (nBufferSize < 30) return -1;
int index = 0;
CToolUnits::convertString(&pszBuffer[index], 20, m_strGlassId);
@@ -97,6 +97,30 @@
return 15 * 2;
}
+ void CVcrEventReport::getAttributeVector(CAttributeVector& attrubutes, int beginWeight)
+ {
+ unsigned int weight = beginWeight;
+ std::string strTemp;
+
+ attrubutes.addAttribute(new CAttribute("GlassId",
+ m_strGlassId.c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("CassetteSequenceNo",
+ std::to_string(m_nCassetteSequenceNo).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("JobSequenceNo",
+ std::to_string(m_nJobSequenceNo).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("UnitNo",
+ std::to_string(m_nUnitNo).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("VcrNo",
+ std::to_string(m_nVcrNo).c_str(), "", weight++));
+
+ attrubutes.addAttribute(new CAttribute("VcrResult",
+ std::to_string(m_nVcrResult).c_str(), "", weight++));
+ }
+
std::string& CVcrEventReport::getVcrResultDescription(std::string& strDescription)
{
static char* pszDescription[4] = {
--
Gitblit v1.9.3