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 | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/SourceCode/Bond/Servo/CSlot.cpp b/SourceCode/Bond/Servo/CSlot.cpp
index 958d5c6..629f7ac 100644
--- a/SourceCode/Bond/Servo/CSlot.cpp
+++ b/SourceCode/Bond/Servo/CSlot.cpp
@@ -12,6 +12,7 @@
m_bLock = FALSE;
m_pContext = nullptr;
m_pTempContext = nullptr;
+ m_nLinkSignalPath = 0;
}
CSlot::~CSlot()
@@ -119,26 +120,25 @@
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 << m_nPosition;
- ar << m_nNo;
- ar << (int)m_materialsType;
- WriteString(ar, m_strName);
ar << (__int64)m_pContext;
- ar << m_bEnable;
ar << m_bLock;
}
else {
- int i32;
__int64 i64;
- ar >> m_nPosition;
- ar >> m_nNo;
- ar >> i32; m_materialsType = (MaterialsType)i32;
- ReadString(ar, m_strName);
ar >> i64; m_pTempContext = (CContext*)i64;
- ar >> m_bEnable;
ar >> m_bLock;
}
}
--
Gitblit v1.9.3