From 6b6297c6fc0aa5c059d35732c7ee22ebca93967f Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:43:40 +0800
Subject: [PATCH] 1.修复以下问题： ProceedWithCarrier 直接发 CCC_PROCESS_START：CModel::onCarrierAction 在 CompareMapsBeforeProceeding 关闭时，收到 ProceedWithCarrier 就调用 master.proceedWithCarrier（仅发送 Cassette Process Start，不校验 PJ/CJ 是否存在、SlotMap 是否验通过）。若 Host 流程异常（未下 PJ/CJ）或本地尚未准备好，会把设备推进加工态但无作业可跑。

---
 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