From cf1497e3bba45ddc3b31cf9768954248bedc0bc1 Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期三, 14 一月 2026 16:03:21 +0800 Subject: [PATCH] 1.修复以下问题:Only-1 Job 支持:isProcessJobsEmpty()/validate 决定了当前实现只支持单个 PJ/CJ。Host 如果按标准一次下多 PJ 或在运行中追加 PJ,会被拒绝但无明确回应,容易引起 Host/设备状态脱节。 --- SourceCode/Bond/Servo/CPanelProduction.h | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/SourceCode/Bond/Servo/CPanelProduction.h b/SourceCode/Bond/Servo/CPanelProduction.h index cbf285f..a4bd705 100644 --- a/SourceCode/Bond/Servo/CPanelProduction.h +++ b/SourceCode/Bond/Servo/CPanelProduction.h @@ -4,6 +4,7 @@ #include "AccordionWnd.h" #include "ProductionStats.h" #include "CPageProdOverview.h" +#include "CPageCtrlState.h" // CPanelProduction dialog class CPanelProduction : public CDialogEx @@ -24,13 +25,15 @@ HWND m_hPlaceholder; CAccordionWnd* m_pAccordionWnd; - // Production shift summary (updated by background thread) - ProductionShiftSummary m_shiftSummary; + // Production shift summaries (updated by background thread) + ProductionShiftSummary m_daySummary; + ProductionShiftSummary m_nightSummary; BOOL m_bShiftSummaryValid; CCriticalSection m_csShiftSummary; CWinThread* m_pStatsThread; CEvent m_evStopStats; CPageProdOverview* m_pPageProdOverview; + CPageCtrlState* m_pPageCtrlState; protected: virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support @@ -49,8 +52,8 @@ afx_msg void OnVLineMoveX(NMHDR* nmhdr, LRESULT* result); afx_msg void OnBnClickedButtonClose(); - // Thread-safe snapshot for UI timer display - BOOL TryGetShiftSummary(ProductionShiftSummary& outSummary); + // Thread-safe snapshots for UI timer display + BOOL TryGetDayNightSummaries(ProductionShiftSummary& outDay, ProductionShiftSummary& outNight); private: static UINT AFX_CDECL StatsThreadProc(LPVOID pParam); -- Gitblit v1.9.3