From da9df9d46ed3fc50e0c03497bd9f76b8aa1a4595 Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期三, 14 一月 2026 15:37:48 +0800
Subject: [PATCH] 1.修复以下问题： 作业前置条件不足导致 PJ 验证失败：onPRJobMultiCreate 调 CMaster::setProcessJobs，CProcessJob::validate 要求“当前没有其它 PJ”（issue 1000），且 carrierPresent/slotUsable 必须为真。只要本地还有未结批的 PJ/CJ 或载具/槽位状态未就绪（ID 未绑、Slot 未使能），Host 发送的 CreateMultiPJ 会直接被丢弃（返回 size=0），但当前代码没有向 Host 回 ACK/NAK，Host 会误以为创建成功。
---
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