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/CPortStatusReport.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/SourceCode/Bond/Servo/CPortStatusReport.h b/SourceCode/Bond/Servo/CPortStatusReport.h index 526c94a..fb73f36 100644 --- a/SourceCode/Bond/Servo/CPortStatusReport.h +++ b/SourceCode/Bond/Servo/CPortStatusReport.h @@ -14,6 +14,7 @@ public: void copyEx(CPortStatusReport& other); short getPortStatus(); + void setPortStatus(short status); short getCassetteSequenceNo(); std::string& getCassetteId(); short getLoadingCassetteType(); @@ -28,6 +29,9 @@ public: bool canPickFromPort(); bool isJobExistenceSlot(); + short getJobExistenceSlot(); + void setJobExistenceSlot(short map); + void setCassetteId(const char* pszId); private: void WriteString(CArchive& ar, std::string& string); @@ -40,7 +44,7 @@ short m_nJobExistenceSlot[12]; // 12 * 16 = 192 个slot是否存在glass short m_nLoadingCassetteType; // 1: Actual Cassette 2 : Empty Cassette short m_nQTimeFlag; - short m_nCassetteMappingState; // 1: mapping use 2: mapping not use + short m_nCassetteMappingState; // 1: mapping use, 2: mapping not use short m_nCassetteStatus; }; } -- Gitblit v1.9.3