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.h | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/SourceCode/Bond/Servo/CSlot.h b/SourceCode/Bond/Servo/CSlot.h index f7445aa..d1869fc 100644 --- a/SourceCode/Bond/Servo/CSlot.h +++ b/SourceCode/Bond/Servo/CSlot.h @@ -27,7 +27,15 @@ void setName(const char* pszName); BOOL isEmpty(); CContext* getContext(); + CContext* getTempContext(); void setContext(CContext* pContext); + void setLinkSignalPath(int path); + int getLinkSignalPath(); + void serialize(CArchive& ar); + + private: + void WriteString(CArchive& ar, std::string& string); + void ReadString(CArchive& ar, std::string& string); private: int m_nPosition; @@ -35,8 +43,10 @@ MaterialsType m_materialsType; std::string m_strName; CContext* m_pContext; + CContext* m_pTempContext; BOOL m_bEnable; BOOL m_bLock; + int m_nLinkSignalPath; }; } -- Gitblit v1.9.3