From 944e8f3dea723404e21168e97116cca2c09c70cb Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期二, 27 一月 2026 15:26:29 +0800 Subject: [PATCH] 1.扫码事件上报,之前只上报OK一种情况,现在有事种状态。 2.Port事件上报关联PortID, 统一修改为VID:PortID,之前分开很多种。 --- SourceCode/Bond/Servo/CPanelProduction.h | 16 +++++++++++----- 1 files changed, 11 insertions(+), 5 deletions(-) diff --git a/SourceCode/Bond/Servo/CPanelProduction.h b/SourceCode/Bond/Servo/CPanelProduction.h index 527db4f..a4bd705 100644 --- a/SourceCode/Bond/Servo/CPanelProduction.h +++ b/SourceCode/Bond/Servo/CPanelProduction.h @@ -1,8 +1,10 @@ 锘�#pragma once #include "BlButton.h" #include <afxmt.h> - +#include "AccordionWnd.h" #include "ProductionStats.h" +#include "CPageProdOverview.h" +#include "CPageCtrlState.h" // CPanelProduction dialog class CPanelProduction : public CDialogEx @@ -21,13 +23,17 @@ int m_nPanelWidth; CBlButton m_btnClose; 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 @@ -46,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