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/CEquipmentPage3.cpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/SourceCode/Bond/Servo/CEquipmentPage3.cpp b/SourceCode/Bond/Servo/CEquipmentPage3.cpp
index ed1aae9..4f4e440 100644
--- a/SourceCode/Bond/Servo/CEquipmentPage3.cpp
+++ b/SourceCode/Bond/Servo/CEquipmentPage3.cpp
@@ -31,8 +31,8 @@
ON_WM_CTLCOLOR()
ON_WM_DESTROY()
ON_WM_SIZE()
- ON_BN_CLICKED(IDC_BUTTON_DISPATCHING_MODE_EAP, &CEquipmentPage3::OnBnClickedButtonDispatchingModeEap)
- ON_BN_CLICKED(IDC_BUTTON_DISPATCHING_MODE_LOCAL, &CEquipmentPage3::OnBnClickedButtonDispatchingModeLocal)
+ ON_BN_CLICKED(IDC_RADIO_DISPATCHING_EAP, &CEquipmentPage3::OnBnClickedRadioEap)
+ ON_BN_CLICKED(IDC_RADIO_DISPATCHING_LOCAL, &CEquipmentPage3::OnBnClickedRadioLocal)
END_MESSAGE_MAP()
@@ -81,7 +81,7 @@
// TODO: 鍦ㄦ澶勬坊鍔犳秷鎭鐞嗙▼搴忎唬鐮�
}
-void CEquipmentPage3::OnBnClickedButtonDispatchingModeEap()
+void CEquipmentPage3::OnBnClickedRadioEap()
{
ASSERT(m_pEquipment);
m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::EAS,
@@ -91,7 +91,7 @@
AfxMessageBox("璁剧疆EAS妯″紡鎴愬姛锛�");
}
else {
- LOGI("<CEquipment-%s>璁剧疆DispatchingMode澶辫触锛宑ode:%d", m_pEquipment->getName().c_str(), code);
+ LOGE("<CEquipment-%s>璁剧疆DispatchingMode澶辫触锛宑ode:%d", m_pEquipment->getName().c_str(), code);
AfxMessageBox("璁剧疆EAS妯″紡澶辫触锛�");
}
@@ -99,10 +99,11 @@
});
}
-void CEquipmentPage3::OnBnClickedButtonDispatchingModeLocal()
+
+void CEquipmentPage3::OnBnClickedRadioLocal()
{
ASSERT(m_pEquipment);
- m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::Local,
+ m_pEquipment->setDispatchingMode(SERVO::DISPATCHING_MODE::Local,
[&](int code) -> int {
if (code == WOK) {
LOGI("<CEquipment-%s>璁剧疆DispatchingMode鎴愬姛.", m_pEquipment->getName().c_str());
--
Gitblit v1.9.3