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.cpp | 412 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 411 insertions(+), 1 deletions(-)
diff --git a/SourceCode/Bond/Servo/ProductionLogDlg.cpp b/SourceCode/Bond/Servo/ProductionLogDlg.cpp
index ee5d364..ef8546f 100644
--- a/SourceCode/Bond/Servo/ProductionLogDlg.cpp
+++ b/SourceCode/Bond/Servo/ProductionLogDlg.cpp
@@ -8,11 +8,19 @@
#include "Common.h"
#include <iomanip>
+<<<<<<< HEAD
//#define PAGE_SIZE 100
//#define PAGE_BACKGROUND_COLOR RGB(252, 252, 255)
//
//// CProductionLogDlg 瀵硅瘽妗�
//
+=======
+#define PAGE_SIZE 100
+#define PAGE_BACKGROUND_COLOR RGB(252, 252, 255)
+
+// CProductionLogDlg 瀵硅瘽妗�
+
+>>>>>>> clh
//IMPLEMENT_DYNAMIC(CProductionLogDlg, CDialogEx)
//
//CProductionLogDlg::CProductionLogDlg(CWnd* pParent /*=nullptr*/)
@@ -38,7 +46,11 @@
// m_szTimeStart[0] = '\0';
// m_szTimeEnd[0] = '\0';
//}
+<<<<<<< HEAD
//
+=======
+
+>>>>>>> clh
//CProductionLogDlg::~CProductionLogDlg()
//{
//}
@@ -69,6 +81,7 @@
// theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())->subscribe(m_pObserver);
// }
//}
+<<<<<<< HEAD
//
//void CProductionLogDlg::Resize()
//{
@@ -461,4 +474,401 @@
// // 鐐瑰嚮涓嬩竴椤�
// m_nCurPage++;
// UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
-//}
\ No newline at end of file
+//}
+=======
+
+/*
+void CProductionLogDlg::Resize()
+{
+ CRect rcClient;
+ GetClientRect(&rcClient);
+
+ m_listCtrl.MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
+}
+
+void CProductionLogDlg::UpdatePageData()
+{
+ // 鏍规嵁杩囨护鏉′欢鍔犺浇鏁版嵁锛堟敮鎸佸垎椤点�佹ā绯婃煡璇€�佹椂闂磋寖鍥达級
+ auto vecData = ProductionLogManager::getInstance().getFilteredSteps(
+ m_strProductId, // 浜у搧ID
+ m_strBatchNo, // 鎵规鍙�
+ m_strDeviceId, // 璁惧ID
+ m_strOperatorName, // 鎿嶄綔鍛�
+ m_strStatus, // 鐘舵��
+ m_szTimeStart, // 璧峰鏃堕棿
+ m_szTimeEnd, // 缁撴潫鏃堕棿
+ m_nCurPage, // 褰撳墠椤电爜
+ PAGE_SIZE // 姣忛〉鏉℃暟
+ );
+
+ // 濉厖鏁版嵁鍒板垪琛ㄦ帶浠�
+ FillDataToListCtrl(&m_listCtrl, vecData);
+
+ // 鏇存柊鍒嗛〉鎺т欢
+ UpdatePageControls();
+}
+
+void CProductionLogDlg::UpdatePageControls()
+{
+ // 鏇存柊鍒嗛〉淇℃伅
+ CString strPage;
+ strPage.Format(_T("绗� %d 椤�"), m_nCurPage);
+ SetDlgItemText(IDC_LABEL_PAGE_NUMBER, strPage);
+
+ // 鍚敤/绂佺敤缈婚〉鎸夐挳
+ GetDlgItem(IDC_BUTTON_PREV_PAGE)->EnableWindow(m_nCurPage > 1);
+ GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
+}
+
+void CProductionLogDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<ProductionStep>& vecSteps)
+{
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
+ // 娓呯┖褰撳墠CListCtrl涓殑鎵�鏈夐」
+ pListCtrl->DeleteAllItems();
+
+ // 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
+ for (const auto& step : vecSteps) {
+ InsertStepData(pListCtrl, step);
+ }
+
+ // 鑾峰彇鍒楁暟
+ int nColCount = pListCtrl->GetHeaderCtrl()->GetItemCount();
+ pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
+}
+
+void CProductionLogDlg::InsertStepData(CListCtrl* pListCtrl, const ProductionStep& step)
+{
+ if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
+ return;
+ }
+
+ int nRowCount = pListCtrl->GetItemCount();
+ if (nRowCount >= PAGE_SIZE) {
+ pListCtrl->DeleteItem(nRowCount - 1);
+ }
+
+ CString str;
+ int nNewItem = pListCtrl->InsertItem(0, _T(""));
+ str.Format(_T("%d"), step.nStepId); pListCtrl->SetItemText(nNewItem, 1, str);
+ pListCtrl->SetItemText(nNewItem, 2, step.strProductId.c_str());
+ pListCtrl->SetItemText(nNewItem, 3, step.strBatchNo.c_str());
+ str.Format(_T("%d"), step.nDeviceId); pListCtrl->SetItemText(nNewItem, 4, str);
+ pListCtrl->SetItemText(nNewItem, 5, step.strOperator.c_str());
+ pListCtrl->SetItemText(nNewItem, 6, step.strStartTime.c_str());
+ pListCtrl->SetItemText(nNewItem, 7, step.strEndTime.c_str());
+ str.Format(_T("%d"), step.nYield); pListCtrl->SetItemText(nNewItem, 8, str);
+ str.Format(_T("%d"), step.nGoodCount); pListCtrl->SetItemText(nNewItem, 9, str);
+ str.Format(_T("%d"), step.nBadCount); pListCtrl->SetItemText(nNewItem, 10, str);
+ pListCtrl->SetItemText(nNewItem, 11, step.strStatus.c_str());
+}
+
+std::string CProductionLogDlg::getCurrentTimeString()
+{
+ auto now = std::chrono::system_clock::now();
+ auto time_t_now = std::chrono::system_clock::to_time_t(now);
+
+ std::tm tm_now = {};
+ localtime_s(&tm_now, &time_t_now);
+
+ std::stringstream ss;
+ ss << std::put_time(&tm_now, "%Y-%m-%d %H:%M:%S");
+ return ss.str();
+}
+
+void CProductionLogDlg::DoDataExchange(CDataExchange* pDX)
+{
+ DDX_Control(pDX, IDC_DATETIMEPICKER_START, m_dateTimeStart);
+ DDX_Control(pDX, IDC_DATETIMEPICKER_END, m_dateTimeEnd);
+ DDX_Control(pDX, IDC_LIST_PRODUCTION_LOG, m_listCtrl);
+ CDialogEx::DoDataExchange(pDX);
+}
+
+BEGIN_MESSAGE_MAP(CProductionLogDlg, CDialogEx)
+ ON_WM_CTLCOLOR()
+ ON_WM_DESTROY()
+ ON_WM_CLOSE()
+ ON_WM_SIZE()
+ ON_CBN_SELCHANGE(IDC_COMBO_DATETIME, &CProductionLogDlg::OnCbnSelchangeComboDatetime)
+ ON_BN_CLICKED(IDC_BUTTON_SEARCH, &CProductionLogDlg::OnBnClickedButtonSearch)
+ ON_BN_CLICKED(IDC_BUTTON_EXPORT, &CProductionLogDlg::OnBnClickedButtonExport)
+ ON_BN_CLICKED(IDC_BUTTON_PREV_PAGE, &CProductionLogDlg::OnBnClickedButtonPrevPage)
+ ON_BN_CLICKED(IDC_BUTTON_NEXT_PAGE, &CProductionLogDlg::OnBnClickedButtonNextPage)
+END_MESSAGE_MAP()
+
+// CProductionLogDlg 娑堟伅澶勭悊绋嬪簭
+BOOL CProductionLogDlg::OnInitDialog()
+{
+ CDialogEx::OnInitDialog();
+ InitRxWindow();
+
+ // 鍒濆鍖栨椂闂磋寖鍥撮�夋嫨
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
+ pComboBox->AddString(_T("涓嶉檺"));
+ pComboBox->AddString(_T("浠婂ぉ"));
+ pComboBox->AddString(_T("涓冨ぉ鍐�"));
+ pComboBox->AddString(_T("鏈湀"));
+ pComboBox->AddString(_T("浠婂勾"));
+ pComboBox->AddString(_T("鑷畾涔�"));
+ pComboBox->SetCurSel(0);
+
+ m_dateTimeStart.EnableWindow(FALSE);
+ m_dateTimeEnd.EnableWindow(FALSE);
+
+ // 璇诲彇鍒楀閰嶇疆
+ CString strIniFile, strItem;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPCTSTR)theApp.m_strAppDir);
+ int width[12] = { 0, 60, 100, 100, 70, 100, 140, 140, 60, 60, 60, 80 };
+ for (int i = 0; i < 12; ++i) {
+ strItem.Format(_T("Col_%d_Width"), i);
+ width[i] = GetPrivateProfileInt("ProductionListCtrl", strItem, width[i], strIniFile);
+ }
+
+ // 鍒濆鍖栧垪琛ㄦ帶浠�
+ CListCtrl* pListCtrl = (CListCtrl*)GetDlgItem(IDC_LIST_PRODUCTION_LOG);
+ DWORD dwStyle = pListCtrl->GetExtendedStyle();
+ dwStyle |= LVS_EX_FULLROWSELECT | LVS_EX_GRIDLINES;
+ pListCtrl->SetExtendedStyle(dwStyle);
+
+ HIMAGELIST imageList = ImageList_Create(24, 24, ILC_COLOR24, 1, 1);
+ ListView_SetImageList(pListCtrl->GetSafeHwnd(), imageList, LVSIL_SMALL);
+
+ pListCtrl->InsertColumn(0, _T(""), LVCFMT_RIGHT, width[0]);
+ pListCtrl->InsertColumn(1, _T("姝ラID"), LVCFMT_LEFT, width[1]);
+ pListCtrl->InsertColumn(2, _T("浜у搧ID"), LVCFMT_LEFT, width[2]);
+ pListCtrl->InsertColumn(3, _T("鎵规鍙�"), LVCFMT_LEFT, width[3]);
+ pListCtrl->InsertColumn(4, _T("璁惧ID"), LVCFMT_LEFT, width[4]);
+ pListCtrl->InsertColumn(5, _T("鎿嶄綔鍛�"), LVCFMT_LEFT, width[5]);
+ pListCtrl->InsertColumn(6, _T("寮�濮嬫椂闂�"), LVCFMT_LEFT, width[6]);
+ pListCtrl->InsertColumn(7, _T("缁撴潫鏃堕棿"), LVCFMT_LEFT, width[7]);
+ pListCtrl->InsertColumn(8, _T("浜ч噺"), LVCFMT_LEFT, width[8]);
+ pListCtrl->InsertColumn(9, _T("鑹搧鏁�"), LVCFMT_LEFT, width[9]);
+ pListCtrl->InsertColumn(10, _T("涓嶈壇鍝佹暟"), LVCFMT_LEFT, width[10]);
+ pListCtrl->InsertColumn(11, _T("鐘舵��"), LVCFMT_LEFT, width[11]);
+
+ // 鍒濆鍖栧垎椤垫暟鎹�
+ int totalRecords = ProductionLogManager::getInstance().getTotalStepCount(
+ m_strProductId, m_strBatchNo, m_strDeviceId, m_strOperatorName,
+ m_strStatus, m_szTimeStart, m_szTimeEnd);
+ m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
+ m_nCurPage = 1;
+
+ Resize();
+ UpdatePageData();
+
+ return TRUE; // return TRUE unless you set the focus to a control
+ // 寮傚父: OCX 灞炴�ч〉搴旇繑鍥� FALSE
+}
+
+HBRUSH CProductionLogDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
+{
+ HBRUSH hbr = CDialogEx::OnCtlColor(pDC, pWnd, nCtlColor);
+
+ if (nCtlColor == CTLCOLOR_STATIC) {
+ pDC->SetBkColor(m_crBkgnd);
+ }
+
+ if (m_hbrBkgnd == nullptr) {
+ m_hbrBkgnd = CreateSolidBrush(m_crBkgnd);
+ }
+
+ return m_hbrBkgnd;
+}
+
+void CProductionLogDlg::OnDestroy()
+{
+ CDialogEx::OnDestroy();
+
+ // 淇濆瓨鍒楀
+ CString strIniFile, strItem, strTemp;
+ strIniFile.Format(_T("%s\\configuration.ini"), (LPCTSTR)theApp.m_strAppDir);
+ CHeaderCtrl* pHeader = m_listCtrl.GetHeaderCtrl();
+ for (int i = 0; i < pHeader->GetItemCount(); ++i) {
+ RECT rect;
+ pHeader->GetItemRect(i, &rect);
+ strItem.Format(_T("Col_%d_Width"), i);
+ strTemp.Format(_T("%d"), rect.right - rect.left);
+ WritePrivateProfileString("ProductionListCtrl", strItem, strTemp, strIniFile);
+ }
+
+ if (m_hbrBkgnd != nullptr) {
+ ::DeleteObject(m_hbrBkgnd);
+ }
+
+ if (m_pObserver != NULL) {
+ m_pObserver->unsubscribe();
+ m_pObserver = NULL;
+ }
+}
+
+void CProductionLogDlg::OnClose()
+{
+ ShowWindow(SW_HIDE);
+ //GetParent()->PostMessage(ID_MSG_ALARMDLG_HIDE, 0, 0);
+ CDialogEx::OnClose();
+}
+
+void CProductionLogDlg::OnSize(UINT nType, int cx, int cy)
+{
+ CDialogEx::OnSize(nType, cx, cy);
+ if (GetDlgItem(IDC_LIST_PRODUCTION_LOG) == nullptr) return;
+ Resize();
+}
+
+void CProductionLogDlg::OnCbnSelchangeComboDatetime()
+{
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
+ int nIndex = pComboBox->GetCurSel();
+ int nCount = pComboBox->GetCount();
+ m_dateTimeStart.EnableWindow(nIndex == nCount - 1);
+ m_dateTimeEnd.EnableWindow(nIndex == nCount - 1);
+}
+
+void CProductionLogDlg::OnBnClickedButtonSearch()
+{
+ // 鑾峰彇鍏抽敭瀛�
+ CString cstrKeyword;
+ GetDlgItemText(IDC_EDIT_KEYWORD, cstrKeyword);
+ m_strKeyword = CT2A(cstrKeyword);
+
+ // 鑾峰彇鏃ユ湡
+ CComboBox* pComboBox = (CComboBox*)GetDlgItem(IDC_COMBO_DATETIME);
+ m_nDateTimeFlag = pComboBox->GetCurSel();
+ if (m_nDateTimeFlag == 0) {
+ memset(m_szTimeStart, 0, sizeof(m_szTimeStart));
+ memset(m_szTimeEnd, 0, sizeof(m_szTimeEnd));
+ m_szTimeStart[0] = '\0';
+ m_szTimeEnd[0] = '\0';
+ }
+ else {
+ CTime time = CTime::GetCurrentTime();
+ if (m_nDateTimeFlag == 1) {
+ // 浠婂ぉ
+ sprintf_s(m_szTimeStart, 64, "%d-%02d-%02d 00:00:00", time.GetYear(), time.GetMonth(), time.GetDay());
+ sprintf_s(m_szTimeEnd, 64, "%d-%02d-%02d 23:59:59", time.GetYear(), time.GetMonth(), time.GetDay());
+ }
+ else if (m_nDateTimeFlag == 2) {
+ // 7澶╁唴
+ CTime time2 = time - CTimeSpan(7, 0, 0, 0);
+ sprintf_s(m_szTimeStart, 64, "%d-%02d-%02d 00:00:00", time2.GetYear(), time2.GetMonth(), time2.GetDay());
+ sprintf_s(m_szTimeEnd, 64, "%d-%02d-%02d 23:59:59", time.GetYear(), time.GetMonth(), time.GetDay());
+ }
+ else if (m_nDateTimeFlag == 3) {
+ // 鏈湀
+ sprintf_s(m_szTimeStart, 64, "%d-%02d-01 00:00:00", time.GetYear(), time.GetMonth());
+ sprintf_s(m_szTimeEnd, 64, "%d-%02d-%02d 23:59:59", time.GetYear(), time.GetMonth(), time.GetDay());
+ }
+ else if (m_nDateTimeFlag == 4) {
+ // 浠婂勾
+ sprintf_s(m_szTimeStart, 64, "%d-01-01 00:00:00", time.GetYear());
+ sprintf_s(m_szTimeEnd, 64, "%d-12-31 23:59:59", time.GetYear());
+ }
+ else if (m_nDateTimeFlag == 5) {
+ // 鑷畾涔�
+ SYSTEMTIME t1, t2;
+ m_dateTimeStart.GetTime(&t1);
+ m_dateTimeEnd.GetTime(&t2);
+
+ sprintf_s(m_szTimeStart, 64, "%d-%02d-%02d %02d:%02d:%02d",
+ t1.wYear, t1.wMonth, t1.wDay, t1.wHour, t1.wMinute, t1.wSecond);
+ sprintf_s(m_szTimeEnd, 64, "%d-%02d-%02d %02d:%02d:%02d",
+ t2.wYear, t2.wMonth, t2.wDay, t2.wHour, t2.wMinute, t2.wSecond);
+ }
+ }
+
+ // 璁＄畻鎬婚〉鏁�
+ int totalRecords = ProductionLogManager::getInstance().getTotalStepCount(
+ m_strProductId, m_strBatchNo, m_strDeviceId, m_strOperatorName,
+ m_strStatus, m_szTimeStart, m_szTimeEnd);
+ m_nTotalPages = (totalRecords + PAGE_SIZE - 1) / PAGE_SIZE;
+ m_nCurPage = 1;
+
+ UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
+}
+
+void CProductionLogDlg::OnBnClickedButtonExport()
+{
+ CFileDialog fileDialog(FALSE, "csv", "", OFN_HIDEREADONLY, "CSV Files (*.csv)|*.csv||");
+ if (fileDialog.DoModal() != IDOK) {
+ return;
+ }
+
+ CStdioFile file;
+ if (!file.Open(fileDialog.GetPathName(), CFile::modeCreate | CFile::modeWrite | CFile::typeText)) {
+ CString err;
+ err.Format(_T("鏃犳硶鍒涘缓鏂囦欢: %s"), fileDialog.GetPathName());
+ AfxMessageBox(err);
+ return;
+ }
+
+ const int MAX_COLS = 32;
+ char szItem[256] = { 0 };
+ HDITEM hdItem[MAX_COLS];
+
+ for (int i = 0; i < MAX_COLS; i++) {
+ hdItem[i].pszText = szItem;
+ hdItem[i].cchTextMax = 256;
+ hdItem[i].mask = HDI_TEXT | HDI_WIDTH;
+ }
+
+ // 鑾峰彇鍒楁暟
+ CHeaderCtrl* pHeader = m_listCtrl.GetHeaderCtrl();
+ int nSubItemCount = min(pHeader->GetItemCount(), MAX_COLS);
+
+ // 琛ㄥご
+ CString strHeader;
+ for (int i = 0; i < nSubItemCount; i++) {
+ pHeader->GetItem(i, &hdItem[i]);
+ if (hdItem[i].cxy > 0) {
+ if (!strHeader.IsEmpty()) strHeader += ",";
+ strHeader += CString(hdItem[i].pszText);
+ }
+ }
+ strHeader += "\n";
+ file.WriteString(strHeader);
+
+ // 琛ㄦ牸鍐呭
+ int nItemCount = m_listCtrl.GetItemCount();
+ for (int i = 0; i < nItemCount; i++) {
+ CStringArray arrRow;
+ for (int j = 0; j < nSubItemCount; j++) {
+ if (hdItem[j].cxy > 0) {
+ CString strText = m_listCtrl.GetItemText(i, j);
+ strText.Replace(_T("* "), _T(""));
+ // 濡傛灉瀛楁涓惈閫楀彿锛屽寘瑁瑰弻寮曞彿
+ if (strText.Find(',') != -1) {
+ strText = _T("\"") + strText + _T("\"");
+ }
+ arrRow.Add(strText);
+ }
+ }
+
+ CString strRow;
+ for (int k = 0; k < arrRow.GetCount(); ++k) {
+ if (k > 0) strRow += ",";
+ strRow += arrRow[k];
+ }
+ strRow += "\n";
+ file.WriteString(strRow);
+ }
+
+ file.Close();
+}
+
+void CProductionLogDlg::OnBnClickedButtonPrevPage()
+{
+ // 鐐瑰嚮涓婁竴椤�
+ m_nCurPage--;
+ UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
+}
+
+void CProductionLogDlg::OnBnClickedButtonNextPage()
+{
+ // 鐐瑰嚮涓嬩竴椤�
+ m_nCurPage++;
+ UpdatePageData(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
+}
+*/
+>>>>>>> clh
--
Gitblit v1.9.3