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/CRobotCmdContainerDlg.cpp | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/SourceCode/Bond/Servo/CRobotCmdContainerDlg.cpp b/SourceCode/Bond/Servo/CRobotCmdContainerDlg.cpp
index 9a9601a..14e2748 100644
--- a/SourceCode/Bond/Servo/CRobotCmdContainerDlg.cpp
+++ b/SourceCode/Bond/Servo/CRobotCmdContainerDlg.cpp
@@ -93,8 +93,13 @@
m_pageRobotCmd[i].Create(IDD_PAGE_ROBOT_CMD, this);
m_pageRobotCmd[i].MoveWindow(rcShrinked);
m_pageRobotCmd[i].ShowWindow(SW_SHOW);
- m_pageRobotCmd[i].EnableWindow(FALSE);
m_pageRobotCmd[i].SetSequenceNo(i + 1);
+ m_pageRobotCmd[i].SetControlsEnabled(i == 0);
+
+ if (i == 0) {
+ m_chkEnable[0].SetCheck(BST_CHECKED);
+ m_chkEnable[0].EnableWindow(FALSE);
+ }
}
// 璁$畻鏁翠綋瀹介珮
@@ -144,6 +149,24 @@
void CRobotCmdContainerDlg::ToggleEnable(int index)
{
+ constexpr int kMaxCount = 4;
+ if (index < 0 || index >= kMaxCount) {
+ return;
+ }
+
BOOL bChecked = m_chkEnable[index].GetCheck();
- m_pageRobotCmd[index].EnableWindow(bChecked);
+ m_pageRobotCmd[index].SetControlsEnabled(bChecked);
+
+ if (bChecked) {
+ for (int i = 1; i < index; ++i) {
+ m_chkEnable[i].SetCheck(BST_CHECKED);
+ m_pageRobotCmd[i].SetControlsEnabled(TRUE);
+ }
+ }
+ else {
+ for (int i = index; i < kMaxCount; ++i) {
+ m_chkEnable[i].SetCheck(BST_UNCHECKED);
+ m_pageRobotCmd[i].SetControlsEnabled(FALSE);
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3