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/BondEq/AlarmMonitor.cpp | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/SourceCode/Bond/BondEq/AlarmMonitor.cpp b/SourceCode/Bond/BondEq/AlarmMonitor.cpp
index 37528f3..de5d6e7 100644
--- a/SourceCode/Bond/BondEq/AlarmMonitor.cpp
+++ b/SourceCode/Bond/BondEq/AlarmMonitor.cpp
@@ -161,29 +161,9 @@
void CAlarmMonitor::Serialize(CArchive& ar)
{
- if (ar.IsStoring())
- {
- Lock();
- int count = (int)m_mapAlarming.size();
- ar << count;
- for (auto item : m_mapAlarming) {
- item.second->Serialize(ar);
- }
- Unlock();
+ if (ar.IsStoring()) {
}
- else
- {
- Lock();
- int count;
- ar >> count;
- for (int i = 0; i < count; i++) {
- CAlarm* pAlarm = new CAlarm();
- pAlarm->addRef();
- pAlarm->Serialize(ar);
- addAlarming(pAlarm);
- pAlarm->release();
- }
- Unlock();
+ else {
}
}
--
Gitblit v1.9.3