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/CEqWriteStep.h | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEqWriteStep.h b/SourceCode/Bond/Servo/CEqWriteStep.h
index 602408b..0684a30 100644
--- a/SourceCode/Bond/Servo/CEqWriteStep.h
+++ b/SourceCode/Bond/Servo/CEqWriteStep.h
@@ -5,6 +5,7 @@
#define WOK 0
#define WTIMEOUT -1
+#define WREAD_RET_ERR -2
namespace SERVO {
typedef std::function<int(int code)> ONWRITED;
@@ -13,7 +14,7 @@
{
public:
CEqWriteStep();
- ~CEqWriteStep();
+ virtual ~CEqWriteStep();
public:
void setDataDev(int nDev);
@@ -23,6 +24,7 @@
int writeDataEx(const char* pszData, int size, ONWRITED onWritedBlock = nullptr);
virtual int onComplete();
virtual int onTimeout();
+ virtual int onReadRetDataError();
private:
int m_nDataDev;
--
Gitblit v1.9.3