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/Model.h | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.h b/SourceCode/Bond/Servo/Model.h
index d2c4e0c..839e949 100644
--- a/SourceCode/Bond/Servo/Model.h
+++ b/SourceCode/Bond/Servo/Model.h
@@ -3,6 +3,16 @@
#include "HsmsPassive.h"
#include "CMaster.h"
#include "CGlassPool.h"
+#include <cstdint>
+
+enum class ControlState : uint8_t {
+ OfflineEquipment = 0,
+ OfflineAttempt = 1,
+ Online = 2,
+ OfflineHost = 3,
+ OnlineLocal = 4,
+ OnlineRemote = 5,
+};
class CModel
{
@@ -15,8 +25,17 @@
SERVO::CMaster& getMaster();
void setWorkDir(const char* pszWorkDir);
void loadPortParams();
+ void setPortType(unsigned int index, SERVO::PortType type);;
+ void setPortCassetteType(unsigned int index, SERVO::CassetteType type);
+ void setPortEnable(unsigned int index, BOOL bEnable);
int init();
int term();
+
+ ControlState getControlState() const noexcept { return m_currentControlState; }
+ void setControlState(ControlState newState);
+
+private:
+ void refreshDerivedSVs();
public:
int notify(int code);
@@ -43,5 +62,7 @@
IObservableEmitter* m_pObservableEmitter;
CString m_strWorkDir;
CString m_strDataDir;
-};
+private:
+ ControlState m_currentControlState{ ControlState::OfflineEquipment };
+};
--
Gitblit v1.9.3