From 1c080b5ca821ef6e1d40025289195b18fa2973b5 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 26 一月 2026 22:46:48 +0800
Subject: [PATCH] 1.把 m_bufGlass 的释放提前到 CMaster::term()，确保在 m_glassPool.term() 之前完成，避免析构时再触碰已被回收的 Glass。析构里仍保留原逻辑，若 term() 已清空则不会重复释放。
---
SourceCode/Bond/Servo/ProcessJob.cpp | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProcessJob.cpp b/SourceCode/Bond/Servo/ProcessJob.cpp
index e58845b..eb92df5 100644
--- a/SourceCode/Bond/Servo/ProcessJob.cpp
+++ b/SourceCode/Bond/Servo/ProcessJob.cpp
@@ -75,6 +75,11 @@
return m_issues;
}
+ void CProcessJob::addIssue(uint32_t code, const std::string& msg)
+ {
+ m_issues.push_back({ code, msg });
+ }
+
bool CProcessJob::validate(const IResourceView& rv)
{
m_issues.clear();
@@ -83,10 +88,6 @@
auto add = [&](uint32_t code, std::string msg) {
m_issues.push_back({ code, std::move(msg) });
};
-
- if (!rv.isProcessJobsEmpty()) {
- add(1000, "ProcessJobs Conflict!");
- }
// —— 基本 / 标识 ——
if (m_pjId.empty()) add(1001, "PJID empty");
@@ -466,4 +467,44 @@
return nullptr;
}
+
+ void CProcessJob::setLotId(std::string strLotId)
+ {
+ m_strLotId = strLotId;
+ }
+
+ std::string& CProcessJob::getLotId()
+ {
+ return m_strLotId;
+ }
+
+ void CProcessJob::setProductId(std::string strProductId)
+ {
+ m_strProductId = strProductId;
+ }
+
+ std::string& CProcessJob::getProductId()
+ {
+ return m_strProductId;
+ }
+
+ void CProcessJob::setOperationId(std::string strOperationId)
+ {
+ m_strOperationId = strOperationId;
+ }
+
+ std::string& CProcessJob::getOperationId()
+ {
+ return m_strOperationId;
+ }
+
+ void CProcessJob::setPjWarp(PJWarp pjWarp)
+ {
+ m_pjWarp = pjWarp;
+ }
+
+ PJWarp& CProcessJob::getPjWarp()
+ {
+ return m_pjWarp;
+ }
}
--
Gitblit v1.9.3