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/PageTransferLog.cpp |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/SourceCode/Bond/Servo/PageTransferLog.cpp b/SourceCode/Bond/Servo/PageTransferLog.cpp
index 978a8e0..9ec52d4 100644
--- a/SourceCode/Bond/Servo/PageTransferLog.cpp
+++ b/SourceCode/Bond/Servo/PageTransferLog.cpp
@@ -51,7 +51,7 @@
 	CDialogEx::DoDataExchange(pDX);
 }
 
-void CPageTransferLog::InitRxWindow()
+void CPageTransferLog::InitRxWindows()
 {
 	/* code */
 	// 璁㈤槄鏁版嵁
@@ -408,7 +408,7 @@
 {
 	if (nIDEvent == 1) {
 		KillTimer(1);
-		InitRxWindow();
+		InitRxWindows();
 	}
 	CDialogEx::OnTimer(nIDEvent);
 }
@@ -497,4 +497,13 @@
 		m_nCurPage++;
 		UpdatePageData();
 	}
+}
+
+BOOL CPageTransferLog::PreTranslateMessage(MSG* pMsg)
+{
+	if (pMsg->wParam == VK_RETURN || pMsg->wParam == VK_ESCAPE) {
+		return TRUE;
+	}
+
+	return CDialogEx::PreTranslateMessage(pMsg);
 }
\ No newline at end of file

--
Gitblit v1.9.3