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/Model.cpp | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index fb2cf9d..f571def 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -168,18 +168,6 @@
setControlState(ControlState::OnlineRemote);
}
};
- listener.onEQConstantRequest = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
- // 鍦ㄦ濉厖甯搁噺鍊硷紝鐩墠浠呮槸鍔�1鍚庤繑鍥�
- for (auto& item : eqcs) {
- sprintf_s(item.szValue, EQCONSTANT_VALUE_MAX, "Test%d", item.id + 1);
- }
- };
- listener.onEQConstantSend = [&](void* pFrom, std::vector<EQConstant>& eqcs) -> void {
- // 鍦ㄦ淇濆瓨鍜岃缃満鍣ㄥ父閲忓��
- for (auto& item : eqcs) {
- LOGI("onEQConstantRequest: %d, %s", item.id, item.szValue);
- }
- };
listener.onDatetimeSync = [&](void* pFrom, SYSTEMTIME& time) -> void {
LOGI("onDatetimeSync: %d%02d%02d%02d%02d%02d", time.wYear,
time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
@@ -311,6 +299,10 @@
CString strVarialbleFile;
strVarialbleFile.Format(_T("%s\\VariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
m_hsmsPassive.loadVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ strVarialbleFile.Format(_T("%s\\DataVariableList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_hsmsPassive.loadDataVarialbles((LPTSTR)(LPCTSTR)strVarialbleFile);
+ strVarialbleFile.Format(_T("%s\\EquipmentConstantList.txt"), (LPTSTR)(LPCTSTR)m_strWorkDir);
+ m_hsmsPassive.loadEquipmentConstants((LPTSTR)(LPCTSTR)strVarialbleFile);
setControlState(m_currentControlState);
refreshDerivedSVs();
m_hsmsPassive.init(this, "APP", 7000);
--
Gitblit v1.9.3