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/CSlot.cpp | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 57 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index 0a254cb..629f7ac 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -10,11 +10,17 @@
m_pContext = nullptr;
m_bEnable = FALSE;
m_bLock = FALSE;
+ m_pContext = nullptr;
+ m_pTempContext = nullptr;
+ m_nLinkSignalPath = 0;
}
CSlot::~CSlot()
{
-
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ m_pContext = nullptr;
+ }
}
BOOL CSlot::isEnable()
@@ -92,13 +98,61 @@
return m_pContext == nullptr;
}
+ void CSlot::setContext(CContext* pContext)
+ {
+ if (m_pContext != nullptr) {
+ m_pContext->release();
+ }
+
+ m_pContext = pContext;
+ if (m_pContext != nullptr) {
+ m_pContext->addRef();
+ }
+ }
+
CContext* CSlot::getContext()
{
return m_pContext;
}
- void CSlot::setContext(CContext* pContext)
+ CContext* CSlot::getTempContext()
{
- m_pContext = pContext;
+ return m_pTempContext;
+ }
+
+ void CSlot::setLinkSignalPath(int path)
+ {
+ m_nLinkSignalPath = path;
+ }
+
+ int CSlot::getLinkSignalPath()
+ {
+ return m_nLinkSignalPath;
+ }
+
+ void CSlot::serialize(CArchive& ar)
+ {
+ if (ar.IsStoring()) {
+ ar << (__int64)m_pContext;
+ ar << m_bLock;
+ }
+ else {
+ __int64 i64;
+ ar >> i64; m_pTempContext = (CContext*)i64;
+ ar >> m_bLock;
+ }
+ }
+
+ void CSlot::WriteString(CArchive& ar, std::string& string)
+ {
+ CString strTemp = string.c_str();
+ ar << strTemp;
+ }
+
+ void CSlot::ReadString(CArchive& ar, std::string& string)
+ {
+ CString strTemp;
+ ar >> strTemp;
+ string = (LPTSTR)(LPCTSTR)strTemp;
}
}
--
Gitblit v1.9.3