From af5c7a6ce19dd295701348f5f7eb6ce53c91826a Mon Sep 17 00:00:00 2001 From: chenluhua1980 <Chenluhua@qq.com> Date: 星期四, 12 二月 2026 10:58:44 +0800 Subject: [PATCH] 1.工创建PJ, 然后生产,当时有3片料,PJ只选了两片。其中两片配对生产了,按道理就不应该去取第三片了,但实际上它还去取了。修复此Bug --- 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