From 2d69213b1b41b5b039e5dc6f6b7c55d53fd03037 Mon Sep 17 00:00:00 2001
From: LAPTOP-SNT8I5JK\Boounion <Chenluhua@qq.com>
Date: 星期二, 13 五月 2025 09:34:04 +0800
Subject: [PATCH] Merge branch 'clh'
---
SourceCode/Bond/Servo/ProductionLogDlg.h | 68 ++++++++++++++++++++++++++++++++++
1 files changed, 68 insertions(+), 0 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProductionLogDlg.h b/SourceCode/Bond/Servo/ProductionLogDlg.h
index f9ff622..a4e455e 100644
--- a/SourceCode/Bond/Servo/ProductionLogDlg.h
+++ b/SourceCode/Bond/Servo/ProductionLogDlg.h
@@ -5,7 +5,73 @@
// CProductionLogDlg 瀵硅瘽妗�
+<<<<<<< HEAD
+//class CProductionLogDlg : public CDialogEx
+//{
+// DECLARE_DYNAMIC(CProductionLogDlg)
+//
+//public:
+// CProductionLogDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+// virtual ~CProductionLogDlg();
+//
+//private:
+// void InitRxWindow();
+// void Resize();
+// void UpdatePageData();
+// void UpdatePageControls();
+// void FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<ProductionStep>& vecSteps);
+// void InsertStepData(CListCtrl* pListCtrl, const ProductionStep& step);
+// std::string getCurrentTimeString();
+//
+//private:
+// COLORREF m_crBkgnd;
+// HBRUSH m_hbrBkgnd;
+// IObserver* m_pObserver;
+//
+// // 鎼滅储鍏抽敭瀛�
+// std::string m_strKeyword;
+// std::string m_strProductId;
+// std::string m_strBatchNo;
+// std::string m_strDeviceId;
+// std::string m_strOperatorName;
+// std::string m_strStatus;
+//
+// // 椤电爜
+// int m_nCurPage;
+// int m_nTotalPages;
+//
+// // 鏃ユ湡
+// int m_nDateTimeFlag;
+// char m_szTimeStart[64];
+// char m_szTimeEnd[64];
+//
+// // 鎺т欢
+// CDateTimeCtrl m_dateTimeStart;
+// CDateTimeCtrl m_dateTimeEnd;
+// CListCtrlEx m_listCtrl;
+//
+//// 瀵硅瘽妗嗘暟鎹�
+//#ifdef AFX_DESIGN_TIME
+// enum { IDD = IDD_DIALOG_PRODUCTION_LOG };
+//#endif
+//
+//protected:
+// virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV 鏀寔
+// virtual BOOL OnInitDialog();
+// afx_msg HBRUSH OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor);
+// afx_msg void OnDestroy();
+// afx_msg void OnClose();
+// afx_msg void OnSize(UINT nType, int cx, int cy);
+// afx_msg void OnCbnSelchangeComboDatetime();
+// afx_msg void OnBnClickedButtonSearch();
+// afx_msg void OnBnClickedButtonExport();
+// afx_msg void OnBnClickedButtonPrevPage();
+// afx_msg void OnBnClickedButtonNextPage();
+// DECLARE_MESSAGE_MAP()
+//};
+=======
+/*
class CProductionLogDlg : public CDialogEx
{
DECLARE_DYNAMIC(CProductionLogDlg)
@@ -69,3 +135,5 @@
afx_msg void OnBnClickedButtonNextPage();
DECLARE_MESSAGE_MAP()
};
+*/
+>>>>>>> clh
--
Gitblit v1.9.3