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 | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEFEM.h b/SourceCode/Bond/Servo/CEFEM.h
index df6ab8d..12603d3 100644
--- a/SourceCode/Bond/Servo/CEFEM.h
+++ b/SourceCode/Bond/Servo/CEFEM.h
@@ -1,5 +1,10 @@
#pragma once
#include "CEquipment.h"
+#include "CLoadPort.h"
+#include "CAligner.h"
+#include "CFliper.h"
+#include "CArmTray.h"
+#include "Context.h"
namespace SERVO {
@@ -15,12 +20,54 @@
virtual void init();
virtual void term();
virtual void initPins();
- virtual int onStepEvent(CStep* pStep, int code);
+ virtual void initSteps();
+ virtual void initSlots();
virtual void onTimer(UINT nTimerid);
virtual void serialize(CArchive& ar);
virtual void getAttributeVector(CAttributeVector& attrubutes);
virtual int recvIntent(CPin* pPin, CIntent* pIntent);
- virtual BOOL glassWillArrive(CGlass* pGlass);
+ virtual void onReceiveLBData(const char* pszData, size_t size);
+ virtual int onReceivedJob(int port, CJobDataS* pJobDataS);
+ virtual int onSentOutJob(int port, CJobDataS* pJobDataS);
+ virtual int onFetchedOutJob(int port, CJobDataB* pJobDataB);
+ virtual int onStoredJob(int port, CJobDataB* pJobDataB);
+ virtual int getIndexerOperationModeBaseValue();
+
+ public:
+ void setContext(CContext* pContext);
+ void setPort(unsigned int index, CLoadPort* pPort);
+ void setAligner(CAligner* pAligner);
+ void setFliper(CFliper* pFliper);
+ void setArmTray(unsigned int index, CArmTray* pArmTray);
+ int robotCmd(ROBOT_CMD_PARAM& robotCmdParam, ONWRITED onWritedBlock = nullptr);
+ int robotCmds(ROBOT_CMD_PARAM* robotCmdParam, unsigned int count, ONWRITED onWritedBlock = nullptr);
+ RMDATA& getRobotMonitoringData();
+
+ // 快捷封装
+ int robotSendHome(int seq, ONWRITED onWritedBlock = nullptr);
+ int robotSendTransfer(int seq, int armNo, int fromPos, int toPos, int fromSlot, int toSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToGet(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToPut(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendGet(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendPut(int seq, int armNo, int pos, int slot, ONWRITED onWritedBlock = nullptr);
+ int robotSendExchange(int seq, int armNo, int pos, int getSlot, int putSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendCommandClear(int seq, ONWRITED onWritedBlock = nullptr);
+ int robotSendBatchGet(int seq, int getPos, int getSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendBatchPut(int seq, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToGetAndHome(int seq, int armNo, int getPos, int getSlot, ONWRITED onWritedBlock = nullptr);
+ int robotSendMoveToPutAndHome(int seq, int armNo, int putPos, int putSlot, ONWRITED onWritedBlock = nullptr);
+ 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];
+ CAligner* m_pAligner;
+ CFliper* m_pFliper;
+ CArmTray* m_pArmTray[2];
+ RMDATA m_robotData;
+ CContext* m_pActiveContext;
};
}
--
Gitblit v1.9.3