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/BEQLibrary/Unit.h | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/BEQLibrary/Unit.h b/SourceCode/Bond/BEQLibrary/Unit.h
index 9bc540d..90708c9 100644
--- a/SourceCode/Bond/BEQLibrary/Unit.h
+++ b/SourceCode/Bond/BEQLibrary/Unit.h
@@ -6,8 +6,9 @@
#define LAYER_LOAD_INIT 0
-#define LAYER_LOAD_REQ 1
-#define LAYER_UNLOAD_REQ 2
+#define LAYER_NOT_READY 1
+#define LAYER_LOAD_REQ 2
+#define LAYER_UNLOAD_REQ 3
namespace BEQ {
typedef std::function<void(void* pUnit, EQ_STATE)> ONSTATECHANGED;
@@ -25,6 +26,7 @@
ONALARM onRemoveAlarm;
ONSTEPCHANGED onStepChanged;
ONDATACHANGED onDataChanged;
+ ONREQLOAD onReqNotReady;
ONREQLOAD onReqLoad;
ONREQLOAD onReqUnload;
} UnitListener;
@@ -63,6 +65,7 @@
virtual unsigned long long getDataTime();
virtual void addData(const char* pszName, const char* pszDataText, bool bComplete);
virtual void addRecipe(int id, const char* pszName, bool bComplete);
+ virtual int reqNotReady(int layer);
virtual int reqLoad(int layer);
virtual int reqUnload(int layer);
--
Gitblit v1.9.3