From 0026ea3b1a6588f3e40b8276162f54b2a22bc7ae Mon Sep 17 00:00:00 2001
From: chenluhua1980 <Chenluhua@qq.com>
Date: 星期一, 19 一月 2026 14:32:27 +0800
Subject: [PATCH] 1.修复 ： 多 PJ 支持仍是单槽实现：isProcessJobsEmpty/validate 仍只允许 1 个 PJ/CJ；Host 一次下多 PJ 或运行中追加 PJ 会被拒绝/无明确反馈。需要：协议上明示只支持 1，或补齐 ACK/NAK 与队列管理、PJobSpace 动态更新。
---
SourceCode/Bond/Servo/CPageProdOverview.cpp | 35 ++++++++++++++++++++++++++++++-----
1 files changed, 30 insertions(+), 5 deletions(-)
diff --git a/SourceCode/Bond/Servo/CPageProdOverview.cpp b/SourceCode/Bond/Servo/CPageProdOverview.cpp
index 6ca851e..11813f4 100644
--- a/SourceCode/Bond/Servo/CPageProdOverview.cpp
+++ b/SourceCode/Bond/Servo/CPageProdOverview.cpp
@@ -5,11 +5,12 @@
#include "Servo.h"
#include "CPageProdOverview.h"
#include "afxdialogex.h"
+#include "CPanelProduction.h"
namespace
{
constexpr UINT_PTR kTimerRefreshId = 2001;
- constexpr UINT kTimerRefreshIntervalMs = 5000;
+ constexpr UINT kTimerRefreshIntervalMs = 10000;
}
IMPLEMENT_DYNAMIC(CPageProdOverview, CDialogEx)
@@ -129,12 +130,36 @@
void CPageProdOverview::RefreshData()
{
+ auto* pPanel = dynamic_cast<CPanelProduction*>(GetParent());
+ if (pPanel == nullptr) {
+ pPanel = dynamic_cast<CPanelProduction*>(GetParent() ? GetParent()->GetParent() : nullptr);
+ }
+ if (pPanel == nullptr) {
+ m_labelDayOut.setText(_T("--"));
+ m_labelNightOut.setText(_T("--"));
+ m_labelDayTakt.setText(_T("--"));
+ m_labelNightTakt.setText(_T("--"));
+ return;
+ }
+
+ ProductionShiftSummary day;
+ ProductionShiftSummary night;
+ if (!pPanel->TryGetDayNightSummaries(day, night)) {
+ m_labelDayOut.setText(_T("--"));
+ m_labelNightOut.setText(_T("--"));
+ m_labelDayTakt.setText(_T("--"));
+ m_labelNightTakt.setText(_T("--"));
+ return;
+ }
+
CString text;
- text.Format(_T("%d"), 123);
+ text.Format(_T("%lld"), day.output.pairsTotal);
m_labelDayOut.setText(text);
- text.Format(_T("%d"), 1235);
+ text.Format(_T("%lld"), night.output.pairsTotal);
m_labelNightOut.setText(text);
- m_labelDayTakt.setText(_T("1236"));
- m_labelNightTakt.setText(_T("1238"));
+ text.Format(_T("%.1fs"), day.output.avgTaktSeconds);
+ m_labelDayTakt.setText(text);
+ text.Format(_T("%.1fs"), night.output.avgTaktSeconds);
+ m_labelNightTakt.setText(text);
}
--
Gitblit v1.9.3