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/CReport.h | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReport.h b/SourceCode/Bond/Servo/CReport.h
index a2078e1..41952df 100644
--- a/SourceCode/Bond/Servo/CReport.h
+++ b/SourceCode/Bond/Servo/CReport.h
@@ -7,7 +7,7 @@
{
public:
CReport();
- CReport(unsigned int reportId);
+ CReport(unsigned int reportId, const std::vector<unsigned int>& vids);
virtual ~CReport();
public:
@@ -15,9 +15,14 @@
BOOL addVariable(CVariable* pVariable);
BOOL deleteVarialble(unsigned int nVarialbleId);
CVariable* getVariable(unsigned int nVarialbleId);
+ std::vector<CVariable*>& getVariables();
+ std::string getVariablesIdsText();
+ bool getVariableName(unsigned int vid, std::string& strName);
+ const std::vector<unsigned int>& getVids() const { return m_vids; }
private:
unsigned int m_nReportId;
+ std::vector<unsigned int> m_vids;
std::vector<CVariable*> m_variabels;
};
}
--
Gitblit v1.9.3