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/CReadStep.cpp | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.cpp b/SourceCode/Bond/Servo/CReadStep.cpp
index 787d92a..06181b8 100644
--- a/SourceCode/Bond/Servo/CReadStep.cpp
+++ b/SourceCode/Bond/Servo/CReadStep.cpp
@@ -95,6 +95,7 @@
ASSERT(m_pEquipment);
m_pEquipment->onStepEvent(this, STEP_EVENT_READDATA);
}
+ if (m_bReadContinue) continue;
// 0426新增
// 1.1，写return code or data
@@ -154,10 +155,11 @@
CStep::getAttributeVector(attrubutes);
std::string strTemp;
+ unsigned int weight = 21;
attrubutes.addAttribute(new CAttribute("Current Step",
- std::to_string(m_nCurStep).c_str(), ""));
+ std::to_string(m_nCurStep).c_str(), "", weight++));
attrubutes.addAttribute(new CAttribute("Signal Dev",
- ("W" + CToolUnits::toHexString(m_nWriteSignalDev, strTemp)).c_str(), ""));
+ ("W" + CToolUnits::toHexString(m_nWriteSignalDev, strTemp)).c_str(), "", weight++));
}
void CReadStep::init()
@@ -209,4 +211,21 @@
{
return 0;
}
+
+ int CReadStep::setReturnCode(short code)
+ {
+ memcpy(m_szReturnBuf, &code, sizeof(short));
+ m_nReturnDataSize = sizeof(short);
+
+ return 0;
+ }
+
+ int CReadStep::setReturnData(const char* pszData, unsigned int size)
+ {
+ ASSERT(size < 1024);
+ memcpy(m_szReturnBuf, pszData, size);
+ m_nReturnDataSize = size;
+
+ return 0;
+ }
}
--
Gitblit v1.9.3