From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。
---
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