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/CEFEM.h | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.h b/SourceCode/Bond/Servo/CEFEM.h
index aade245..12603d3 100644
--- a/SourceCode/Bond/Servo/CEFEM.h
+++ b/SourceCode/Bond/Servo/CEFEM.h
@@ -4,6 +4,7 @@
#include "CAligner.h"
#include "CFliper.h"
#include "CArmTray.h"
+#include "Context.h"
namespace SERVO {
@@ -33,6 +34,7 @@
virtual int getIndexerOperationModeBaseValue();
public:
+ void setContext(CContext* pContext);
void setPort(unsigned int index, CLoadPort* pPort);
void setAligner(CAligner* pAligner);
void setFliper(CFliper* pFliper);
@@ -57,6 +59,7 @@
int robotSendTransferAndHome(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot, ONWRITED onWritedBlock = nullptr);
int robotSendGetAndPut(int seq, int armNo, int getPos, int getSlot, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
int robotSendPutAndHome(int seq, int armNo, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
+ void printDebugRobotState();
private:
CLoadPort* m_pPort[4];
@@ -64,6 +67,7 @@
CFliper* m_pFliper;
CArmTray* m_pArmTray[2];
RMDATA m_robotData;
+ CContext* m_pActiveContext;
};
}
--
Gitblit v1.9.3