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/Alarm.cpp | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/BondEq/Alarm.cpp b/SourceCode/Bond/BondEq/Alarm.cpp
index 266e4ca..ef82a47 100644
--- a/SourceCode/Bond/BondEq/Alarm.cpp
+++ b/SourceCode/Bond/BondEq/Alarm.cpp
@@ -107,22 +107,24 @@
if (ar.IsStoring())
{
Lock();
+ ar << m_nUnitId;
+ ar << m_nId;
+ ar << m_nLevel;
ar << m_timeOn;
ar << m_timeOff;
ar << m_nStatus;
- ar << m_nId;
- ar << m_nLevel;
WriteString(ar, m_strText);
Unlock();
}
else
{
Lock();
+ ar >> m_nUnitId;
+ ar >> m_nId;
+ ar >> m_nLevel;
ar >> m_timeOn;
ar >> m_timeOff;
ar >> m_nStatus;
- ar >> m_nId;
- ar >> m_nLevel;
ReadString(ar, m_strText);
Unlock();
}
--
Gitblit v1.9.3