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/CEqReadStep.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/Servo/CEqReadStep.h b/SourceCode/Bond/Servo/CEqReadStep.h
index fa9a2b3..bab69cd 100644
--- a/SourceCode/Bond/Servo/CEqReadStep.h
+++ b/SourceCode/Bond/Servo/CEqReadStep.h
@@ -3,7 +3,7 @@
 #include <functional>
 
 
-#define READ_BUFFER_MAX		1024
+#define READ_BUFFER_MAX		2048
 
 #define ROK				0					/* 读数据OK */
 #define RTIMEOUT		-1					/* 读数据超时 */
@@ -11,14 +11,14 @@
 #define RCOMPLETE		1					/* 读数据流程完成 */
 
 namespace SERVO {
-	typedef std::function<int(int code, const char* pszData, size_t size)> ONREAD;
+	typedef std::function<int(void* pFrom, int code, const char* pszData, size_t size)> ONREAD;
 
 	class CEqReadStep : public CReadStep
 	{
 	public:
 		CEqReadStep();
 		CEqReadStep(int dev, size_t readSize, ONREAD onReadBlock);
-		~CEqReadStep();
+		virtual ~CEqReadStep();
 
 	public:
 		virtual void getAttributeVector(CAttributeVector& attrubutes);

--
Gitblit v1.9.3