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/CEquipmentPage1.cpp | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage1.cpp b/SourceCode/Bond/Servo/CEquipmentPage1.cpp
index 56c8cbd..684c23b 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage1.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage1.cpp
@@ -180,7 +180,7 @@
for (int nRow = 0; nRow < SIGNAL_GRID_ROWS; ++nRow) {
for (int nCol = 0; nCol < SIGNAL_GRID_COLS; ++nCol) {
- BOOL bCurrentState = m_pEquipment->isLinkSignalOn(nRow, nCol);
+ BOOL bCurrentState = m_pEquipment->isLinkSignalUpstreamOn(nRow, nCol);
UpdateSignalState(nRow, nCol, bCurrentState);
}
}
@@ -210,8 +210,8 @@
int index = nRow * SIGNAL_GRID_COLS + nCol;
if (index >= 0 && index < (int)m_vSignalList.size() && m_vSignalList[index].bClickable && m_pEquipment != nullptr) {
// 璇诲彇褰撳墠鐘舵�佸苟鍒囨崲
- const BOOL bCurrentState = m_pEquipment->isLinkSignalOn(nRow, nCol);
- m_pEquipment->setLinkSignal(nRow, nCol, !bCurrentState);
+ const BOOL bCurrentState = m_pEquipment->isLinkSignalUpstreamOn(nRow, nCol);
+ m_pEquipment->setLinkSignalUpstream(nRow, nCol, !bCurrentState);
}
});
--
Gitblit v1.9.3