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/CReadStep.h | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CReadStep.h b/SourceCode/Bond/Servo/CReadStep.h
index 2b0df3b..8d048a4 100644
--- a/SourceCode/Bond/Servo/CReadStep.h
+++ b/SourceCode/Bond/Servo/CReadStep.h
@@ -11,8 +11,10 @@
public:
unsigned WorkingProc();
+ virtual void setReadContinue(BOOL bContinue) { m_bReadContinue = bContinue; };
virtual void setWriteSignalDev(int dev);
- virtual void onReadSignal(BOOL bSignal);
+ virtual void setReturnDev(int dev);
+ virtual void onReadSignal(int nSignalType);
virtual int onReadData();
virtual void init();
virtual void term();
@@ -21,6 +23,8 @@
virtual int onTimeout();
inline void nextStep();
inline void resetStep();
+ virtual int setReturnCode(short code);
+ virtual int setReturnData(const char* pszData, unsigned int size);
protected:
HANDLE m_hWorkThreadHandle;
@@ -28,8 +32,16 @@
HANDLE m_hWorkStop;
HANDLE m_hReadSignalOn;
HANDLE m_hReadSignalOff;
+ int m_nSignalType;
int m_nCurStep;
int m_nWriteSignalDev; // 对方BIT地址
+
+ // return code or data
+ protected:
+ char m_szReturnBuf[1024];
+ int m_nReturnDataSize;
+ int m_nReturnDevNo;
+ BOOL m_bReadContinue{ FALSE };
};
}
--
Gitblit v1.9.3