From bdf0dc4cb183d3fec40e1d51b3bb94b7e53d0a55 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期日, 04 一月 2026 10:45:07 +0800
Subject: [PATCH] 1.修复报文字段差异风险： S1F3：项目用 getSubItemU4(0) 取 SVID；日志里有 U2 的情况，可能导致解析失败后回退成 SV=0。 S6F11：项目发送 DATAID(U4) + CEID(U4)；日志样例里第一个字段是 U2，可能存在类型/字段定义不一致。

---
 SourceCode/Bond/Servo/CPageGlassList.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/SourceCode/Bond/Servo/CPageGlassList.h b/SourceCode/Bond/Servo/CPageGlassList.h
index 09e548a..38a35c7 100644
--- a/SourceCode/Bond/Servo/CPageGlassList.h
+++ b/SourceCode/Bond/Servo/CPageGlassList.h
@@ -1,6 +1,7 @@
 锘�#pragma once
 #include "CExpandableListCtrl.h"
 #include "GlassLogDb.h"
+#include <unordered_map>
 
 // ====== 缂栬瘧寮�鍏宠鏄� ======
 // USE_MOCK_SENSOR_DATA: 1=鍚敤妯℃嫙浼犳劅鍣ㄦ暟鎹敓鎴愶紱0=浣跨敤鐪熷疄鏁版嵁
@@ -65,7 +66,7 @@
 	void ExportBasicInfo(CString& csvContent, const GlassLogDb::Row& row);
 	void ExportProcessParams(CString& csvContent, const GlassLogDb::Row& row);
 	void ExportSensorData(CString& csvContent, const GlassLogDb::Row& row);
-	static std::vector<std::string> getMachineColumnOrder(int machineId);
+	static std::vector<std::string> getMachineColumnOrder(int machineId, const std::unordered_map<std::string, std::vector<SERVO::SVDataItem>>* actualData = nullptr);
 	static std::string timePointToString(const std::chrono::system_clock::time_point& tp);
 	static int64_t timePointToMs(const std::chrono::system_clock::time_point& tp);
 	void GenerateMockSVData(SERVO::CGlass& glass);

--
Gitblit v1.9.3