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/CEqCassetteTransferStateStep.cpp | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqCassetteTransferStateStep.cpp b/SourceCode/Bond/Servo/CEqCassetteTransferStateStep.cpp
index 365da4a..2dc627e 100644
--- a/SourceCode/Bond/Servo/CEqCassetteTransferStateStep.cpp
+++ b/SourceCode/Bond/Servo/CEqCassetteTransferStateStep.cpp
@@ -25,23 +25,24 @@
{
CReadStep::getAttributeVector(attrubutes);
+ unsigned int weight = 31;
std::string strTemp;
attrubutes.addAttribute(new CAttribute("Dev",
- ("W" + CToolUnits::toHexString(m_nPortStatusDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nPortStatusDev, strTemp)).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Port Status",
- getPortStatusDescription(strTemp).c_str(), ""));
+ getPortStatusDescription(strTemp).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("CassetteSequenceNo",
- std::to_string(m_nCassetteSequenceNo).c_str(), ""));
+ std::to_string(m_nCassetteSequenceNo).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("CassetteID",
- m_strCassetteID.c_str(), ""));
+ m_strCassetteID.c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("LoadingCassetteType",
- getLoadingCassetteTypeDescription(strTemp).c_str(), ""));
+ getLoadingCassetteTypeDescription(strTemp).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Q-Time Flag",
- getQTimeFlagDescription(strTemp).c_str(), ""));
+ getQTimeFlagDescription(strTemp).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("CassetteMappingState",
- getCassetteMappingStateDescription(strTemp).c_str(), ""));
+ getCassetteMappingStateDescription(strTemp).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("CassetteStatus",
- getCassetteStatusDescription(strTemp).c_str(), ""));
+ getCassetteStatusDescription(strTemp).c_str(), "", weight++));
}
int CEqCassetteTransferStateStep::onReadData()
@@ -239,7 +240,7 @@
case CASSETTE_MAPPING_USE:
strDescription = _T("mapping use");
break;
- case CASSETTE_MAPPING_USE:
+ case CASSETTE_MAPPING_NOT_USE:
strDescription = _T("mapping not use");
break;
default:
--
Gitblit v1.9.3