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/CPath.cpp | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPath.cpp b/SourceCode/Bond/Servo/CPath.cpp
index 1731ee9..5898b5b 100644
--- a/SourceCode/Bond/Servo/CPath.cpp
+++ b/SourceCode/Bond/Servo/CPath.cpp
@@ -16,10 +16,11 @@
m_pNext = nullptr;
}
- CPath::CPath(unsigned int nEqId, unsigned int nUnit)
+ CPath::CPath(unsigned int nEqId, unsigned int nUnit, unsigned int nSlot)
{
m_nEqID = nEqId;
m_nUnit = nUnit;
+ m_nSlot = nSlot;
m_timeOut = 0;
m_timeIn = CToolUnits::getTimestamp();
m_bProcessed = FALSE;
@@ -49,7 +50,7 @@
void CPath::getSimpleDescription(std::string& strOut)
{
- strOut = CServoUtilsTool::getEqUnitName(m_nEqID, m_nUnit);
+ strOut = CServoUtilsTool::getEqUnitName(m_nEqID, m_nUnit, m_nSlot);
}
void CPath::serialize(CArchive& ar)
@@ -57,6 +58,7 @@
if (ar.IsStoring()) {
ar << m_nEqID;
ar << m_nUnit;
+ ar << m_nSlot;
ar << m_timeIn;
ar << m_timeOut;
ar << m_bProcessed;
@@ -71,6 +73,7 @@
ar >> m_nEqID;
ar >> m_nUnit;
+ ar >> m_nSlot;
ar >> m_timeIn;
ar >> m_timeOut;
ar >> m_bProcessed;
@@ -96,6 +99,11 @@
return m_nUnit;
}
+ unsigned int CPath::getSlot()
+ {
+ return m_nSlot;
+ }
+
void CPath::setInTime(ULONGLONG time)
{
m_timeIn = time;
--
Gitblit v1.9.3