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/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