From b7d98aad7e8728c5a41c6fab5a21b6c633042527 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期六, 13 九月 2025 11:43:13 +0800
Subject: [PATCH] Merge branch 'master' into liuyang

---
 SourceCode/Bond/SGMeasurement/SGMeasurementDlg.h |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/SourceCode/Bond/SGMeasurement/SGMeasurementDlg.h b/SourceCode/Bond/SGMeasurement/SGMeasurementDlg.h
index ab23343..8b42bd2 100644
--- a/SourceCode/Bond/SGMeasurement/SGMeasurementDlg.h
+++ b/SourceCode/Bond/SGMeasurement/SGMeasurementDlg.h
@@ -1,10 +1,11 @@
-
+锘�
 // SGMeasurementDlg.h: 澶存枃浠�
 //
 
 #pragma once
 
 #include "PLCSignalListener.h"
+#include "ProductResultStorage.h"
 
 #include <map>
 #include <vector>
@@ -233,9 +234,9 @@
 	 * @brief 鍒嗘瀽鎸囧畾绔彛鐨勫瓨鍌ㄦ暟鎹紝骞舵彁鍙栦袱娈电幓鐠冩暟鎹笌绋冲畾鍖猴紝璁＄畻鍋忕Щ銆�
 	 *
 	 * @param nOutNo     杈撳嚭绔彛缂栧彿锛�1~4锛�
-	 * @return float     鎴愬姛杩斿洖璁＄畻鍑虹殑鍋忕Щ閲忥紝澶辫触杩斿洖 -1.0f
+	 * @return double     鎴愬姛杩斿洖璁＄畻鍑虹殑鍋忕Щ閲忥紝澶辫触杩斿洖 -1.0f
 	 */
-	float AnalyzeStoredData(int nOutNo);
+	double AnalyzeStoredData(int nOutNo);
 
 	// === 绯荤粺鐘舵�佷笌杩愯鏁版嵁 ===
 
@@ -340,4 +341,11 @@
 	 * @brief PLC 淇″彿鐩戝惉鍣ㄥ疄渚嬶紝鐢ㄤ簬澶勭悊 PLC 淇″彿浜嬩欢
 	 */
 	CPLCSignalListener m_plcListener;
+
+	// === 浜у搧缁撴灉瀛樺偍 ===
+
+	/**
+	 * @brief 浜у搧缁撴灉瀛樺偍瀹炰緥锛岀敤浜庝繚瀛樺拰绠＄悊娴嬮噺缁撴灉
+	 */
+	CProductResultStorage m_resultStorage;
 };

--
Gitblit v1.9.3