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/BondEq/RegexEdit.cpp | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/BondEq/RegexEdit.cpp b/SourceCode/Bond/BondEq/RegexEdit.cpp
index f3943e1..eaf8879 100644
--- a/SourceCode/Bond/BondEq/RegexEdit.cpp
+++ b/SourceCode/Bond/BondEq/RegexEdit.cpp
@@ -41,6 +41,34 @@
m_invalidInputCallback = callback;
}
+bool CRegexEdit::FindMatch(const std::string& pattern, std::string& foundText)
+{
+ CString currentText;
+ GetWindowText(currentText);
+
+ std::string text(CT2A(currentText.GetString()));
+ std::regex regexPattern(pattern);
+ std::smatch match;
+
+ if (std::regex_search(text, match, regexPattern)) {
+ foundText = match.str();
+ return true;
+ }
+ return false;
+}
+
+void CRegexEdit::ReplaceMatch(const std::string& pattern, const std::string& replacement)
+{
+ CString currentText;
+ GetWindowText(currentText);
+
+ std::string text(CT2A(currentText.GetString()));
+ std::regex regexPattern(pattern);
+ std::string result = std::regex_replace(text, regexPattern, replacement);
+
+ SetWindowText(CString(result.c_str()));
+}
+
std::regex CRegexEdit::GetCurrentRegex() const
{
switch (m_enRegexType)
--
Gitblit v1.9.3