From bc7f1c4e028e69be51079b59dae4ae5c4d43f5bb Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期六, 31 一月 2026 21:54:56 +0800
Subject: [PATCH] 1.状态指示图，目前灰色表示掉线，绿色表示在线。增加Slot的小点表示有没有料，及加工状态 。 2.增加图示
---
SourceCode/Bond/Servo/ProductionStats.h | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProductionStats.h b/SourceCode/Bond/Servo/ProductionStats.h
index 84c8cb5..c884228 100644
--- a/SourceCode/Bond/Servo/ProductionStats.h
+++ b/SourceCode/Bond/Servo/ProductionStats.h
@@ -27,6 +27,10 @@
long long pairsFail = 0;
long long pairsNoResult = 0;
double yield = 0.0; // pairsPass / (pairsPass + pairsFail), 0 if denom==0
+
+ // Average takt time derived from glass_log.t_start/t_end (per pair, seconds)
+ double avgTaktSeconds = 0.0;
+ long long taktSamplePairs = 0;
};
struct ProductionAlarmSummary {
@@ -54,5 +58,9 @@
static bool GetCurrentShiftWindow(CConfiguration& config, ProductionShiftWindow& outWindow);
static bool ComputeCurrentShiftSummary(CConfiguration& config, ProductionShiftSummary& outSummary);
static void LogCurrentShiftSummary(CConfiguration& config);
-};
+ // Computes "current shift" and its adjacent other shift, so UI can always show Day+Night numbers.
+ // - If current is Day: day=current day shift, night=previous night shift.
+ // - If current is Night: night=current night shift, day=previous day shift.
+ static bool ComputeDayNightSummaries(CConfiguration& config, ProductionShiftSummary& outDay, ProductionShiftSummary& outNight);
+};
--
Gitblit v1.9.3