From 50f3078f4efb3718e921b76567bd33d6c3640a44 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 21 一月 2026 22:20:31 +0800
Subject: [PATCH] 1.新增“读即已读”逻辑：CServoDlg::AckAlarm(int alarmId)记录已读并刷新角标；弹窗在显示任一告警时自动调用，导航上一条/下一条都会标记已读，工具条数量会同步更新。
---
SourceCode/Bond/Servo/ProcessJob.cpp | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 90 insertions(+), 13 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProcessJob.cpp b/SourceCode/Bond/Servo/ProcessJob.cpp
index b672e27..eb92df5 100644
--- a/SourceCode/Bond/Servo/ProcessJob.cpp
+++ b/SourceCode/Bond/Servo/ProcessJob.cpp
@@ -7,9 +7,12 @@
namespace SERVO {
static inline std::string trimCopy(std::string s) {
- auto notspace = [](int ch) { return !std::isspace(ch); };
- s.erase(s.begin(), std::find_if(s.begin(), s.end(), notspace));
- s.erase(std::find_if(s.rbegin(), s.rend(), notspace).base(), s.end());
+ s.erase(s.begin(),
+ std::find_if(s.begin(), s.end(),
+ [](char c) { return !std::isspace(static_cast<unsigned char>(c)); }));
+ s.erase(std::find_if(s.rbegin(), s.rend(),
+ [](char c) { return !std::isspace(static_cast<unsigned char>(c)); }).base(),
+ s.end());
return s;
}
@@ -21,6 +24,12 @@
CProcessJob::CProcessJob(std::string pjId)
: m_pjId(trimCopy(pjId))
{
+ clampString(m_pjId, MAX_ID_LEN);
+ }
+
+ void CProcessJob::setId(std::string& id)
+ {
+ m_pjId = trimCopy(id);
clampString(m_pjId, MAX_ID_LEN);
}
@@ -61,9 +70,14 @@
m_pauseEvents.erase(std::unique(m_pauseEvents.begin(), m_pauseEvents.end()), m_pauseEvents.end());
}
- const std::vector<CProcessJob::ValidationIssue>& CProcessJob::issues()
+ const std::vector<CProcessJob::ValidationIssue>& CProcessJob::issues() const
{
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)
@@ -74,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");
@@ -177,9 +187,11 @@
return true;
}
- bool CProcessJob::abort() {
+ bool CProcessJob::abort(std::string reason) {
if (m_state == PJState::Completed || m_state == PJState::Aborted || m_state == PJState::Failed)
return false;
+ m_failReason = trimCopy(reason);
+ clampString(m_failReason, 128);
m_state = PJState::Aborted;
markEnd();
return true;
@@ -266,6 +278,31 @@
}
}
+ bool CProcessJob::setCarrierSlotsAndContexts(std::string carrierId, std::vector<uint8_t> slots, std::vector<void*> contexts)
+ {
+ for (auto& c : m_carriers) {
+ if (c.carrierId.compare(carrierId) == 0) {
+ c.slots = std::move(slots);
+ c.contexts = std::move(contexts);
+ return true;
+ }
+ }
+
+ return false;
+ }
+
+ bool CProcessJob::setCarrierContexts(std::string carrierId, std::vector<void*> contexts)
+ {
+ for (auto& c : m_carriers) {
+ if (c.carrierId.compare(carrierId) == 0) {
+ c.contexts = std::move(contexts);
+ return true;
+ }
+ }
+
+ return false;
+ }
+
// --------- 核心：serialize/deserialize ---------
void CProcessJob::serialize(std::ostream& os) const {
// 头
@@ -278,7 +315,7 @@
// 配方
uint8_t recipeType = static_cast<uint8_t>(m_recipeMethod);
- write_pod(os, m_recipeMethod);
+ write_pod(os, recipeType);
write_string(os, m_recipeSpec);
// 物料（多 Carrier & Slot）
@@ -399,13 +436,13 @@
return "InProcess";
break;
case SERVO::PJState::Paused:
- return "Queued";
+ return "Paused";
break;
case SERVO::PJState::Aborting:
return "Aborting";
break;
case SERVO::PJState::Completed:
- return "Queued";
+ return "Completed";
break;
case SERVO::PJState::Aborted:
return "Aborted";
@@ -420,7 +457,7 @@
return "";
}
- CarrierSlotInfo* CProcessJob::getCarrier(std::string& strId)
+ CarrierSlotInfo* CProcessJob::getCarrier(const std::string& strId)
{
for (auto& item : m_carriers) {
if (item.carrierId.compare(strId) == 0) {
@@ -430,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