From b25ce186da97a1a774ddf89504f97d8c244fda66 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期四, 29 一月 2026 09:25:06 +0800
Subject: [PATCH] 1.移除 SubEqpStart/End（CEID 10015/10016） 2.UnitStart/UnitEnd 增加 PanelID（5006/5007） 3.Report/CEID 两个表都同步了对应 VIDs/备注
---
SourceCode/Bond/x64/Debug/CollectionEventList.txt | 2 --
SourceCode/Bond/Servo/Model.cpp | 18 ++++++++----------
SourceCode/Bond/x64/Debug/ReportList.txt | 6 ++----
3 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/SourceCode/Bond/Servo/Model.cpp b/SourceCode/Bond/Servo/Model.cpp
index 2c1b261..22b263c 100644
--- a/SourceCode/Bond/Servo/Model.cpp
+++ b/SourceCode/Bond/Servo/Model.cpp
@@ -811,25 +811,23 @@
m_hsmsPassive.setVariableValue("CurrentProcessState", (__int64)state);
m_hsmsPassive.requestEventReportSend("ProcessStateChanged");
- // SubEqp events (per equipment, ignore slot distinction except payload)
- static std::map<int, SERVO::PROCESS_STATE> s_prevSubEqpState;
- if (state == SERVO::PROCESS_STATE::Processing) {
- m_hsmsPassive.requestEventReportSend_SubEqpStart();
- }
- else if (state == SERVO::PROCESS_STATE::Complete) {
- m_hsmsPassive.requestEventReportSend_SubEqpEnd();
- }
- s_prevSubEqpState[eqId] = state;
-
// Unit events (per equipment slot)
static std::map<int, std::map<int, SERVO::PROCESS_STATE>> s_prevUnitState;
const auto prevUnitState = s_prevUnitState[eqId][slotNo];
if (prevUnitState != state) {
m_hsmsPassive.requestEventReportSend("UnitStateChange");
+ std::string panelId;
+ if (pEquipment != nullptr && slotNo > 0) {
+ if (auto* pGlass = pEquipment->getGlassFromSlot(slotNo)) {
+ panelId = pGlass->getID();
+ }
+ }
if (state == SERVO::PROCESS_STATE::Processing) {
+ m_hsmsPassive.setVariableValue("PanelStartID", panelId.c_str());
m_hsmsPassive.requestEventReportSend("UnitStart");
}
else if (state == SERVO::PROCESS_STATE::Complete) {
+ m_hsmsPassive.setVariableValue("PanelEndID", panelId.c_str());
m_hsmsPassive.requestEventReportSend("UnitEnd");
}
s_prevUnitState[eqId][slotNo] = state;
diff --git a/SourceCode/Bond/x64/Debug/CollectionEventList.txt b/SourceCode/Bond/x64/Debug/CollectionEventList.txt
index b42a9e6..0e9bd39 100644
--- a/SourceCode/Bond/x64/Debug/CollectionEventList.txt
+++ b/SourceCode/Bond/x64/Debug/CollectionEventList.txt
@@ -4,8 +4,6 @@
600,ControlStateChanged,,(600)
700,ProcessStateChanged,,(700)
10018,ProcessDataReport,,(33)
-10015,SubEqpStart,,(10015)
-10016,SubEqpEnd,,(10016)
10017,SubEqpStateChange,,(10017)
10000,RecipeChanged,,(10000)
10030,CarrierArrived,,(10300)
diff --git a/SourceCode/Bond/x64/Debug/ReportList.txt b/SourceCode/Bond/x64/Debug/ReportList.txt
index 7ec2058..ea79b80 100644
--- a/SourceCode/Bond/x64/Debug/ReportList.txt
+++ b/SourceCode/Bond/x64/Debug/ReportList.txt
@@ -47,10 +47,8 @@
65000,(500,5018,5019,6500,6501,6502,6503)
66000,(500,5018,5019,6600,6601)
67000,(500,5018,5019,6700,6701,6702,6703)
-10015,(5018,5019)
-10016,(5018,5019)
10017,(500,5018,5019,5024)
-12000,(500,5018,5019)
+12000,(500,5018,5019,5006)
12001,(500,5018,5019)
-12002,(500,5018,5019)
+12002,(500,5018,5019,5007)
--
Gitblit v1.9.3