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/CCjPage3.cpp | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/CCjPage3.cpp b/SourceCode/Bond/Servo/CCjPage3.cpp
index 44428e9..aac7455 100644
--- a/SourceCode/Bond/Servo/CCjPage3.cpp
+++ b/SourceCode/Bond/Servo/CCjPage3.cpp
@@ -29,6 +29,7 @@
BEGIN_MESSAGE_MAP(CCjPage3, CCjPageBase)
ON_WM_DESTROY()
+ ON_EN_CHANGE(IDC_EDIT_CJ_ID, &CCjPage3::OnEnChangeEditCjId)
END_MESSAGE_MAP()
@@ -67,7 +68,42 @@
*/
}
-void CCjPage3::OnApply()
+int CCjPage3::OnApply()
{
+ // SERVO::CControlJob*
+ if (m_pContext == nullptr) return -1;
+ SERVO::CControlJob* pControlJob = (SERVO::CControlJob*)m_pContext;
+ // 鏇存柊鍚嶇О
+ BOOL bOkName = TRUE;
+ char szBuffer[256];
+ GetDlgItemText(IDC_EDIT_CJ_ID, szBuffer, 256);
+ pControlJob->setId(std::string(szBuffer));
+
+
+ ContentChanged(1);
+ return 0;
+}
+
+void CCjPage3::OnSetContext(void* pContext)
+{
+ UpdateCjData();
+}
+
+void CCjPage3::UpdateCjData()
+{
+ if (m_pContext == nullptr) return;
+
+ m_bContentChangedLock = TRUE;
+
+ SERVO::CControlJob* pControlJob = (SERVO::CControlJob*)m_pContext;
+ SetDlgItemText(IDC_EDIT_CJ_ID, pControlJob->id().c_str());
+
+
+ m_bContentChangedLock = FALSE;
+}
+
+void CCjPage3::OnEnChangeEditCjId()
+{
+ ContentChanged(0);
}
\ No newline at end of file
--
Gitblit v1.9.3