From 39e5424c8ce474c09ef9939f28e07232dedf3113 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期四, 03 四月 2025 15:13:15 +0800
Subject: [PATCH] 1. 添加生产履历的报表的界面，并且绑定生产履历的报表管理器
---
SourceCode/Bond/Servo/Servo.vcxproj | 2
SourceCode/Bond/Servo/ProductionLogManager.h | 113 ++++++
SourceCode/Bond/Servo/Servo.vcxproj.filters | 2
SourceCode/Bond/Servo/ProductionLogDlg.cpp | 462 +++++++++++++++++++++++++
SourceCode/Bond/Servo/resource.h | 0
SourceCode/Bond/Servo/AlarmDlg.cpp | 16
SourceCode/Bond/Servo/Servo.cpp | 1
SourceCode/Bond/Servo/Servo.rc | 0
SourceCode/Bond/Servo/ProductionLogDlg.h | 72 ++++
SourceCode/Bond/Servo/ProductionLogManager.cpp | 407 ++++++++++++++++++++++
10 files changed, 1,061 insertions(+), 14 deletions(-)
diff --git a/SourceCode/Bond/Servo/AlarmDlg.cpp b/SourceCode/Bond/Servo/AlarmDlg.cpp
index 4a483e8..9db69a5 100644
--- a/SourceCode/Bond/Servo/AlarmDlg.cpp
+++ b/SourceCode/Bond/Servo/AlarmDlg.cpp
@@ -115,7 +115,6 @@
GetDlgItem(IDC_BUTTON_NEXT_PAGE)->EnableWindow(m_nCurPage < m_nTotalPages);
}
-static char* pszAlarmLevel[] = {"Warning", "Error"};
void CAlarmDlg::FillDataToListCtrl(CListCtrl* pListCtrl, const std::vector<AlarmData>& vecData)
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
@@ -127,17 +126,7 @@
// 閬嶅巻鏁版嵁骞舵彃鍏ュ埌CListCtrl涓�
for (const auto& alarm : vecData) {
- int nItem = pListCtrl->InsertItem(pListCtrl->GetItemCount(), _T("")); // 鎻掑叆鏂拌
- CString str;
- // 璁剧疆鍒楀唴瀹�
- str.Format(_T("%d"), alarm.nId);
- pListCtrl->SetItemText(nItem, 1, str); // 鎶ヨID
- pListCtrl->SetItemText(nItem, 2, pszAlarmLevel[alarm.nSeverityLevel % 2]); // 绛夌骇
- pListCtrl->SetItemText(nItem, 3, alarm.strDeviceName.c_str()); // 璁惧鍚嶇О
- pListCtrl->SetItemText(nItem, 4, alarm.strUnitName.c_str()); // 鍗曞厓鍚嶇О
- pListCtrl->SetItemText(nItem, 5, alarm.strStartTime.c_str()); // 寮�濮嬫椂闂�
- pListCtrl->SetItemText(nItem, 6, alarm.strEndTime.c_str()); // 缁撴潫鏃堕棿
- pListCtrl->SetItemText(nItem, 7, alarm.strDescription.c_str()); // 鎻忚堪
+ InsertAlarmData(pListCtrl, alarm);
}
// 鑾峰彇鍒楁暟
@@ -145,6 +134,7 @@
pListCtrl->SetColumnWidth(nColCount - 1, LVSCW_AUTOSIZE_USEHEADER);
}
+static char* pszAlarmLevel[] = { "Warning", "Error" };
void CAlarmDlg::InsertAlarmData(CListCtrl* pListCtrl, const AlarmData& alarmData)
{
if (pListCtrl == nullptr || pListCtrl->m_hWnd == nullptr) {
@@ -162,7 +152,7 @@
CString str;
str.Format(_T("%d"), alarmData.nId);
pListCtrl->SetItemText(nNewItem, 1, str); // 鎶ヨID
- pListCtrl->SetItemText(nNewItem, 2, pszAlarmLevel[alarmData.nSeverityLevel % 2]); // 绛夌骇
+ pListCtrl->SetItemText(nNewItem, 2, pszAlarmLevel[alarmData.nSeverityLevel % 2]); // 绛夌骇
pListCtrl->SetItemText(nNewItem, 3, alarmData.strDeviceName.c_str()); // 璁惧鍚嶇О
pListCtrl->SetItemText(nNewItem, 4, alarmData.strUnitName.c_str()); // 鍗曞厓鍚嶇О
pListCtrl->SetItemText(nNewItem, 5, alarmData.strStartTime.c_str()); // 寮�濮嬫椂闂�
diff --git a/SourceCode/Bond/Servo/ProductionLogDlg.cpp b/SourceCode/Bond/Servo/ProductionLogDlg.cpp
new file mode 100644
index 0000000..5dbadc8
--- /dev/null
+++ b/SourceCode/Bond/Servo/ProductionLogDlg.cpp
@@ -0,0 +1,462 @@
+锘�// ProductionLogDlg.cpp: 瀹炵幇鏂囦欢
+//
+
+#include "stdafx.h"
+#include "Servo.h"
+#include "afxdialogex.h"
+#include "ProductionLogDlg.h"
+#include "Common.h"
+#include <iomanip>
+
+#define PAGE_SIZE 100
+#define PAGE_BACKGROUND_COLOR RGB(252, 252, 255)
+
+// CProductionLogDlg 瀵硅瘽妗�
+
+IMPLEMENT_DYNAMIC(CProductionLogDlg, CDialogEx)
+
+CProductionLogDlg::CProductionLogDlg(CWnd* pParent /*=nullptr*/)
+ : CDialogEx(IDD_DIALOG_PRODUCTION_LOG, pParent)
+{
+ m_crBkgnd = PAGE_BACKGROUND_COLOR;
+ m_hbrBkgnd = nullptr;
+ m_pObserver = nullptr;
+
+ m_strKeyword = "";
+ m_strProductId = "";
+ m_strBatchNo = "";
+ m_strDeviceId = "";
+ m_strOperatorName = "";
+ m_strStatus = "";
+
+ m_nCurPage = 0;
+ m_nTotalPages = 0;
+ 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';
+}
+
+CProductionLogDlg::~CProductionLogDlg()
+{
+}
+
+void CProductionLogDlg::InitRxWindow()
+{
+ /* code */
+ // 璁㈤槄鏁版嵁
+ IRxWindows* pRxWindows = RX_GetRxWindows();
+ pRxWindows->enableLog(5);
+ if (m_pObserver == NULL) {
+ m_pObserver = pRxWindows->allocObserver([&](IAny* pAny) -> void {
+ // onNext
+ pAny->addRef();
+ int code = pAny->getCode();
+
+ //if (RX_CODE_ALARM_SET == code) {
+ //}
+
+ pAny->release();
+ }, [&]() -> void {
+ // onComplete
+ }, [&](IThrowable* pThrowable) -> void {
+ // onErrorm
+ pThrowable->printf();
+ });
+
+ theApp.m_model.getObservable()->observeOn(pRxWindows->mainThread())->subscribe(m_pObserver);
+ }
+}
+
+void CProductionLogDlg::Resize()
+{
+ CRect rcClient;
+ GetClientRect(&rcClient);
+
+ m_listCtrl.MoveWindow(12, 58, rcClient.Width() - 24, rcClient.Height() - 64);
+}
+
+void CProductionLogDlg::LoadAlarms()
+{
+ // 鍒锋柊鍘嗗彶鎶ヨ鏁版嵁
+ m_nCurPage = 1;
+ UpdatePageData();
+}
+
+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)
+{
+ int nRow = pListCtrl->GetItemCount();
+ CString str;
+
+ str.Format(_T("%d"), step.nStepId); pListCtrl->InsertItem(nRow, str);
+ pListCtrl->SetItemText(nRow, 1, step.strProductId.c_str());
+ pListCtrl->SetItemText(nRow, 2, step.strBatchNo.c_str());
+ str.Format(_T("%d"), step.nDeviceId); pListCtrl->SetItemText(nRow, 3, str);
+ pListCtrl->SetItemText(nRow, 4, step.strOperator.c_str());
+ pListCtrl->SetItemText(nRow, 5, step.strStartTime.c_str());
+ pListCtrl->SetItemText(nRow, 6, step.strEndTime.c_str());
+ str.Format(_T("%d"), step.nYield); pListCtrl->SetItemText(nRow, 7, str);
+ str.Format(_T("%d"), step.nGoodCount); pListCtrl->SetItemText(nRow, 8, str);
+ str.Format(_T("%d"), step.nBadCount); pListCtrl->SetItemText(nRow, 9, str);
+ pListCtrl->SetItemText(nRow, 10, 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[11] = { 60, 100, 100, 70, 100, 140, 140, 60, 60, 60, 80 };
+ for (int i = 0; i < 11; ++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("姝ラID"), LVCFMT_LEFT, width[0]);
+ pListCtrl->InsertColumn(1, _T("浜у搧ID"), LVCFMT_LEFT, width[1]);
+ pListCtrl->InsertColumn(2, _T("鎵规鍙�"), LVCFMT_LEFT, width[2]);
+ pListCtrl->InsertColumn(3, _T("璁惧ID"), LVCFMT_LEFT, width[3]);
+ pListCtrl->InsertColumn(4, _T("鎿嶄綔鍛�"), 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]);
+
+ // 鍒濆鍖栧垎椤垫暟鎹�
+ 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(); // 璋冪敤鍒嗛〉鏇存柊鍑芥暟
+}
diff --git a/SourceCode/Bond/Servo/ProductionLogDlg.h b/SourceCode/Bond/Servo/ProductionLogDlg.h
new file mode 100644
index 0000000..44f8d03
--- /dev/null
+++ b/SourceCode/Bond/Servo/ProductionLogDlg.h
@@ -0,0 +1,72 @@
+锘�#pragma once
+#include "afxdialogex.h"
+#include "ListCtrlEx.h"
+#include "ProductionLogManager.h"
+
+
+// CProductionLogDlg 瀵硅瘽妗�
+
+class CProductionLogDlg : public CDialogEx
+{
+ DECLARE_DYNAMIC(CProductionLogDlg)
+
+public:
+ CProductionLogDlg(CWnd* pParent = nullptr); // 鏍囧噯鏋勯�犲嚱鏁�
+ virtual ~CProductionLogDlg();
+
+private:
+ void InitRxWindow();
+ void Resize();
+ void LoadAlarms();
+ 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()
+};
diff --git a/SourceCode/Bond/Servo/ProductionLogManager.cpp b/SourceCode/Bond/Servo/ProductionLogManager.cpp
new file mode 100644
index 0000000..85ed86b
--- /dev/null
+++ b/SourceCode/Bond/Servo/ProductionLogManager.cpp
@@ -0,0 +1,407 @@
+#include "stdafx.h"
+#include "ProductionLogManager.h"
+#include <sstream>
+#include <fstream>
+#include <iostream>
+#include <stdexcept>
+#include <iomanip>
+
+const std::string PRODUCTION_DB_FILE = R"(ProductionLog.db)";
+std::mutex ProductionLogManager::m_mutex;
+
+ProductionLogManager& ProductionLogManager::getInstance() {
+ static ProductionLogManager instance;
+ return instance;
+}
+
+ProductionLogManager::ProductionLogManager() {
+ m_pDB = new BL::SQLiteDatabase();
+}
+
+ProductionLogManager::~ProductionLogManager() {
+ if (m_pDB) {
+ delete m_pDB;
+ m_pDB = nullptr;
+ }
+}
+
+bool ProductionLogManager::initProductionTable() {
+ char path[MAX_PATH];
+ GetModuleFileName(NULL, path, MAX_PATH);
+ std::string exePath(path);
+ std::string dbFileDir = exePath.substr(0, exePath.find_last_of("\\/")) + "\\DB";
+ if (!CreateDirectory(dbFileDir.c_str(), NULL) && GetLastError() != ERROR_ALREADY_EXISTS) {
+ throw std::runtime_error("Failed to create DB directory.");
+ }
+
+ std::string dbFilePath = dbFileDir + "\\" + PRODUCTION_DB_FILE;
+ if (!m_pDB->connect(dbFilePath, true)) {
+ throw std::runtime_error("Failed to connect to production database.");
+ }
+
+ const std::string createTableQuery = R"(
+ CREATE TABLE IF NOT EXISTS production_log (
+ step_id INTEGER PRIMARY KEY AUTOINCREMENT,
+ product_id TEXT NOT NULL,
+ batch_no TEXT NOT NULL,
+ device_id INTEGER NOT NULL,
+ prev_device_id INTEGER,
+ next_device_id INTEGER,
+ operator_name TEXT,
+ start_time DATETIME,
+ end_time DATETIME,
+ yield INTEGER,
+ good_count INTEGER,
+ bad_count INTEGER,
+ status TEXT,
+ note TEXT
+ )
+ )";
+ return m_pDB->executeQuery(createTableQuery);
+}
+
+void ProductionLogManager::termProductionTable() {
+ if (m_pDB) {
+ m_pDB->disconnect();
+ }
+}
+
+bool ProductionLogManager::destroyProductionTable() {
+ if (!m_pDB) return false;
+ const std::string query = "DROP TABLE IF EXISTS production_log";
+ return m_pDB->executeQuery(query);
+}
+
+void ProductionLogManager::insertMockData() {
+ // TODO: 实现模拟数据插入逻辑（使用 std::ostringstream）
+ ProductionStep step;
+ step.strProductId = "P888";
+ step.strBatchNo = "B999";
+ step.nDeviceId = 3;
+ step.nPrevDeviceId = 2;
+ step.nNextDeviceId = 4;
+ step.strOperator = "MockUser";
+ step.strStartTime = "2025-04-02 10:00:00";
+ step.strEndTime = "2025-04-02 10:20:00";
+ step.nYield = 100;
+ step.nGoodCount = 98;
+ step.nBadCount = 2;
+ step.strStatus = "测试";
+ step.strNote = "这是模拟履历";
+ int id = 0;
+ addProductionStep(id, step);
+}
+
+bool ProductionLogManager::addProductionStep(int stepId, const ProductionStep& stepData) {
+ std::ostringstream query;
+ query << "INSERT INTO production_log (product_id, batch_no, device_id, prev_device_id, next_device_id, operator_name, start_time, end_time, yield, good_count, bad_count, status, note) "
+ << "VALUES ('" << stepData.strProductId << "', '" << stepData.strBatchNo << "', " << stepData.nDeviceId << ", "
+ << stepData.nPrevDeviceId << ", " << stepData.nNextDeviceId << ", '" << stepData.strOperator << "', '"
+ << stepData.strStartTime << "', '" << stepData.strEndTime << "', " << stepData.nYield << ", "
+ << stepData.nGoodCount << ", " << stepData.nBadCount << ", '" << stepData.strStatus << "', '"
+ << stepData.strNote << "') RETURNING step_id;";
+
+ std::lock_guard<std::mutex> lock(m_mutex);
+ auto results = m_pDB->fetchResults(query.str());
+ if (!results.empty() && !results[0].empty()) {
+ try {
+ stepId = std::stoi(results[0][0]);
+ m_mapStepCache[stepId] = stepData;
+ return true;
+ }
+ catch (...) {
+ return false;
+ }
+ }
+ return false;
+}
+
+std::vector<ProductionStep> ProductionLogManager::getAllSteps() {
+ const std::string query = R"(
+ SELECT step_id, product_id, batch_no, device_id, prev_device_id, next_device_id,
+ operator_name, start_time, end_time, yield, good_count, bad_count, status, note
+ FROM production_log
+ )";
+
+ auto results = m_pDB->fetchResults(query);
+ std::vector<ProductionStep> steps;
+ for (const auto& row : results) {
+ ProductionStep step;
+ step.nStepId = std::stoi(row[0]);
+ step.strProductId = row[1];
+ step.strBatchNo = row[2];
+ step.nDeviceId = std::stoi(row[3]);
+ step.nPrevDeviceId = std::stoi(row[4]);
+ step.nNextDeviceId = std::stoi(row[5]);
+ step.strOperator = row[6];
+ step.strStartTime = row[7];
+ step.strEndTime = row[8];
+ step.nYield = std::stoi(row[9]);
+ step.nGoodCount = std::stoi(row[10]);
+ step.nBadCount = std::stoi(row[11]);
+ step.strStatus = row[12];
+ step.strNote = row[13];
+ steps.push_back(step);
+ }
+ return steps;
+}
+
+std::vector<ProductionStep> ProductionLogManager::getStepsByProductId(const std::string& productId) {
+ std::ostringstream query;
+ query << "SELECT * FROM production_log WHERE product_id = '" << productId << "'";
+ auto results = m_pDB->fetchResults(query.str());
+ std::vector<ProductionStep> steps;
+ for (const auto& row : results) {
+ ProductionStep step;
+ step.nStepId = std::stoi(row[0]);
+ step.strProductId = row[1];
+ step.strBatchNo = row[2];
+ step.nDeviceId = std::stoi(row[3]);
+ step.nPrevDeviceId = std::stoi(row[4]);
+ step.nNextDeviceId = std::stoi(row[5]);
+ step.strOperator = row[6];
+ step.strStartTime = row[7];
+ step.strEndTime = row[8];
+ step.nYield = std::stoi(row[9]);
+ step.nGoodCount = std::stoi(row[10]);
+ step.nBadCount = std::stoi(row[11]);
+ step.strStatus = row[12];
+ step.strNote = row[13];
+ steps.push_back(step);
+ }
+ return steps;
+}
+
+std::vector<ProductionStep> ProductionLogManager::getStepsByBatchNo(const std::string& batchNo) {
+ std::ostringstream query;
+ query << "SELECT * FROM production_log WHERE batch_no = '" << batchNo << "'";
+ auto results = m_pDB->fetchResults(query.str());
+ std::vector<ProductionStep> steps;
+ for (const auto& row : results) {
+ ProductionStep step;
+ step.nStepId = std::stoi(row[0]);
+ step.strProductId = row[1];
+ step.strBatchNo = row[2];
+ step.nDeviceId = std::stoi(row[3]);
+ step.nPrevDeviceId = std::stoi(row[4]);
+ step.nNextDeviceId = std::stoi(row[5]);
+ step.strOperator = row[6];
+ step.strStartTime = row[7];
+ step.strEndTime = row[8];
+ step.nYield = std::stoi(row[9]);
+ step.nGoodCount = std::stoi(row[10]);
+ step.nBadCount = std::stoi(row[11]);
+ step.strStatus = row[12];
+ step.strNote = row[13];
+ steps.push_back(step);
+ }
+ return steps;
+}
+
+std::vector<ProductionStep> ProductionLogManager::getStepsByDeviceId(int nDeviceId) {
+ std::ostringstream query;
+ query << "SELECT * FROM production_log WHERE device_id = " << nDeviceId;
+ auto results = m_pDB->fetchResults(query.str());
+ std::vector<ProductionStep> steps;
+ for (const auto& row : results) {
+ ProductionStep step;
+ step.nStepId = std::stoi(row[0]);
+ step.strProductId = row[1];
+ step.strBatchNo = row[2];
+ step.nDeviceId = std::stoi(row[3]);
+ step.nPrevDeviceId = std::stoi(row[4]);
+ step.nNextDeviceId = std::stoi(row[5]);
+ step.strOperator = row[6];
+ step.strStartTime = row[7];
+ step.strEndTime = row[8];
+ step.nYield = std::stoi(row[9]);
+ step.nGoodCount = std::stoi(row[10]);
+ step.nBadCount = std::stoi(row[11]);
+ step.strStatus = row[12];
+ step.strNote = row[13];
+ steps.push_back(step);
+ }
+ return steps;
+}
+
+std::vector<ProductionStep> ProductionLogManager::getStepsByTimeRange(const std::string& startTime, const std::string& endTime) {
+ std::ostringstream query;
+ query << "SELECT * FROM production_log WHERE start_time >= '" << startTime << "' AND end_time <= '" << endTime << "'";
+ auto results = m_pDB->fetchResults(query.str());
+ std::vector<ProductionStep> steps;
+ for (const auto& row : results) {
+ ProductionStep step;
+ step.nStepId = std::stoi(row[0]);
+ step.strProductId = row[1];
+ step.strBatchNo = row[2];
+ step.nDeviceId = std::stoi(row[3]);
+ step.nPrevDeviceId = std::stoi(row[4]);
+ step.nNextDeviceId = std::stoi(row[5]);
+ step.strOperator = row[6];
+ step.strStartTime = row[7];
+ step.strEndTime = row[8];
+ step.nYield = std::stoi(row[9]);
+ step.nGoodCount = std::stoi(row[10]);
+ step.nBadCount = std::stoi(row[11]);
+ step.strStatus = row[12];
+ step.strNote = row[13];
+ steps.push_back(step);
+ }
+ return steps;
+}
+
+std::vector<ProductionStep> ProductionLogManager::getFilteredSteps(
+ const std::string& productId,
+ const std::string& batchNo,
+ const std::string& deviceId,
+ const std::string& operatorName,
+ const std::string& status,
+ const std::string& startTime,
+ const std::string& endTime,
+ int pageNumber,
+ int pageSize) {
+
+ std::ostringstream query;
+ query << "SELECT * FROM production_log WHERE 1=1";
+
+ if (!productId.empty()) {
+ query << " AND product_id LIKE '%" << productId << "%'";
+ }
+ if (!batchNo.empty()) {
+ query << " AND batch_no LIKE '%" << batchNo << "%'";
+ }
+ if (!deviceId.empty()) {
+ query << " AND device_id = " << deviceId;
+ }
+ if (!operatorName.empty()) {
+ query << " AND operator_name LIKE '%" << operatorName << "%'";
+ }
+ if (!status.empty()) {
+ query << " AND status LIKE '%" << status << "%'";
+ }
+ if (!startTime.empty()) {
+ query << " AND start_time >= '" << startTime << "'";
+ }
+ if (!endTime.empty()) {
+ query << " AND end_time <= '" << endTime << "'";
+ }
+
+ int offset = (pageNumber - 1) * pageSize;
+ query << " ORDER BY start_time DESC LIMIT " << pageSize << " OFFSET " << offset;
+
+ auto results = m_pDB->fetchResults(query.str());
+ std::vector<ProductionStep> steps;
+ for (const auto& row : results) {
+ ProductionStep step;
+ step.nStepId = std::stoi(row[0]);
+ step.strProductId = row[1];
+ step.strBatchNo = row[2];
+ step.nDeviceId = std::stoi(row[3]);
+ step.nPrevDeviceId = std::stoi(row[4]);
+ step.nNextDeviceId = std::stoi(row[5]);
+ step.strOperator = row[6];
+ step.strStartTime = row[7];
+ step.strEndTime = row[8];
+ step.nYield = std::stoi(row[9]);
+ step.nGoodCount = std::stoi(row[10]);
+ step.nBadCount = std::stoi(row[11]);
+ step.strStatus = row[12];
+ step.strNote = row[13];
+ steps.push_back(step);
+ }
+ return steps;
+}
+
+int ProductionLogManager::getTotalStepCount(
+ const std::string& productId,
+ const std::string& batchNo,
+ const std::string& deviceId,
+ const std::string& operatorName,
+ const std::string& status,
+ const std::string& startTime,
+ const std::string& endTime) {
+
+ std::ostringstream query;
+ query << "SELECT COUNT(*) FROM production_log WHERE 1=1";
+
+ if (!productId.empty()) {
+ query << " AND product_id LIKE '%" << productId << "%'";
+ }
+ if (!batchNo.empty()) {
+ query << " AND batch_no LIKE '%" << batchNo << "%'";
+ }
+ if (!deviceId.empty()) {
+ query << " AND device_id = " << deviceId;
+ }
+ if (!operatorName.empty()) {
+ query << " AND operator_name LIKE '%" << operatorName << "%'";
+ }
+ if (!status.empty()) {
+ query << " AND status LIKE '%" << status << "%'";
+ }
+ if (!startTime.empty()) {
+ query << " AND start_time >= '" << startTime << "'";
+ }
+ if (!endTime.empty()) {
+ query << " AND end_time <= '" << endTime << "'";
+ }
+
+ auto results = m_pDB->fetchResults(query.str());
+ if (!results.empty() && !results[0].empty()) {
+ return std::stoi(results[0][0]);
+ }
+ return 0;
+}
+
+bool ProductionLogManager::updateStepEndTime(int nStepId, const std::string& newEndTime) {
+ std::ostringstream query;
+ query << "UPDATE production_log SET end_time = '" << newEndTime << "' WHERE step_id = " << nStepId;
+ return m_pDB->executeQuery(query.str());
+}
+
+bool ProductionLogManager::saveProductionFile(const std::string& filename) {
+ std::ofstream file(filename);
+ if (!file.is_open()) return false;
+ file << "StepID,ProductID,BatchNo,DeviceID,PrevDeviceID,NextDeviceID,Operator,StartTime,EndTime,Yield,Good,Bad,Status,Note\n";
+ for (auto it = m_mapStepCache.begin(); it != m_mapStepCache.end(); ++it) {
+ const int id = it->first;
+ const ProductionStep& step = it->second;
+
+ file << id << "," << step.strProductId << "," << step.strBatchNo << ","
+ << step.nDeviceId << "," << step.nPrevDeviceId << "," << step.nNextDeviceId << ","
+ << step.strOperator << "," << step.strStartTime << "," << step.strEndTime << ","
+ << step.nYield << "," << step.nGoodCount << "," << step.nBadCount << ","
+ << step.strStatus << "," << step.strNote << "\n";
+ }
+ file.close();
+ return true;
+}
+
+bool ProductionLogManager::readProductionFile(const std::string& filename) {
+ std::ifstream file(filename);
+ if (!file.is_open()) return false;
+ std::string line;
+ bool first = true;
+ while (std::getline(file, line)) {
+ if (first) { first = false; continue; }
+ std::stringstream ss(line);
+ std::string cell;
+ ProductionStep step;
+ std::getline(ss, cell, ','); step.nStepId = std::stoi(cell);
+ std::getline(ss, step.strProductId, ',');
+ std::getline(ss, step.strBatchNo, ',');
+ std::getline(ss, cell, ','); step.nDeviceId = std::stoi(cell);
+ std::getline(ss, cell, ','); step.nPrevDeviceId = std::stoi(cell);
+ std::getline(ss, cell, ','); step.nNextDeviceId = std::stoi(cell);
+ std::getline(ss, step.strOperator, ',');
+ std::getline(ss, step.strStartTime, ',');
+ std::getline(ss, step.strEndTime, ',');
+ std::getline(ss, cell, ','); step.nYield = std::stoi(cell);
+ std::getline(ss, cell, ','); step.nGoodCount = std::stoi(cell);
+ std::getline(ss, cell, ','); step.nBadCount = std::stoi(cell);
+ std::getline(ss, step.strStatus, ',');
+ std::getline(ss, step.strNote);
+ m_mapStepCache[step.nStepId] = step;
+ }
+ return true;
+}
diff --git a/SourceCode/Bond/Servo/ProductionLogManager.h b/SourceCode/Bond/Servo/ProductionLogManager.h
new file mode 100644
index 0000000..7d137c2
--- /dev/null
+++ b/SourceCode/Bond/Servo/ProductionLogManager.h
@@ -0,0 +1,113 @@
+#ifndef PRODUCTION_LOG_MANAGER_H
+#define PRODUCTION_LOG_MANAGER_H
+
+#include <string>
+#include <vector>
+#include <mutex>
+#include <unordered_map>
+#include "Database.h"
+
+// 单条生产履历记录
+struct ProductionStep {
+ int nStepId; // 步骤ID（主键）
+ std::string strProductId; // 产品ID
+ std::string strBatchNo; // 批次号
+ int nDeviceId; // 当前设备ID
+ std::string strDeviceName; // 当前设备名称
+ int nPrevDeviceId; // 上一个设备ID
+ std::string strPrevDeviceName; // 上一个设备名称
+ int nNextDeviceId; // 下一个设备ID
+ std::string strNextDeviceName; // 下一个设备名称
+ std::string strOperator; // 操作员
+ std::string strStartTime; // 工序开始时间
+ std::string strEndTime; // 工序结束时间
+ int nYield; // 总产量
+ int nGoodCount; // 良品数
+ int nBadCount; // 不良品数
+ std::string strStatus; // 状态（完成、暂停、异常等）
+ std::string strNote; // 备注信息
+};
+
+using ProductionStepMap = std::unordered_map<int, ProductionStep>;
+
+class ProductionLogManager {
+public:
+ // 获取单例实例
+ static ProductionLogManager& getInstance();
+
+ // 初始化生产履历表
+ bool initProductionTable();
+
+ // 关闭数据库连接
+ void termProductionTable();
+
+ // 删除生产履历表
+ bool destroyProductionTable();
+
+ // 插入模拟数据
+ void insertMockData();
+
+ // 添加生产履历记录
+ bool addProductionStep(int stepId, const ProductionStep& stepData);
+
+ // 查询所有生产履历
+ std::vector<ProductionStep> getAllSteps();
+
+ // 根据产品ID查询
+ std::vector<ProductionStep> getStepsByProductId(const std::string& productId);
+
+ // 根据批次号查询
+ std::vector<ProductionStep> getStepsByBatchNo(const std::string& batchNo);
+
+ // 根据设备ID查询
+ std::vector<ProductionStep> getStepsByDeviceId(int nDeviceId);
+
+ // 根据时间范围查询
+ std::vector<ProductionStep> getStepsByTimeRange(const std::string& startTime, const std::string& endTime);
+
+ // 分页查询 + 多条件过滤
+ std::vector<ProductionStep> getFilteredSteps(
+ const std::string& productId,
+ const std::string& batchNo,
+ const std::string& deviceId,
+ const std::string& operatorName,
+ const std::string& status,
+ const std::string& startTime,
+ const std::string& endTime,
+ int pageNumber,
+ int pageSize);
+
+ // 获取满足条件的总数
+ int getTotalStepCount(
+ const std::string& productId,
+ const std::string& batchNo,
+ const std::string& deviceId,
+ const std::string& operatorName,
+ const std::string& status,
+ const std::string& startTime,
+ const std::string& endTime);
+
+ // 更新某一履历的结束时间
+ bool updateStepEndTime(int nStepId, const std::string& newEndTime);
+
+ // 保存到CSV文件
+ bool saveProductionFile(const std::string& filename);
+
+ // 从CSV文件导入
+ bool readProductionFile(const std::string& filename);
+
+private:
+ ProductionLogManager();
+ ~ProductionLogManager();
+
+ // 禁用拷贝构造和赋值
+ ProductionLogManager(const ProductionLogManager&) = delete;
+ ProductionLogManager& operator=(const ProductionLogManager&) = delete;
+
+private:
+ BL::Database* m_pDB;
+ ProductionStepMap m_mapStepCache;
+ static std::mutex m_mutex;
+};
+
+#endif // PRODUCTION_LOG_MANAGER_H
\ No newline at end of file
diff --git a/SourceCode/Bond/Servo/Servo.cpp b/SourceCode/Bond/Servo/Servo.cpp
index f947821..22a08a3 100644
--- a/SourceCode/Bond/Servo/Servo.cpp
+++ b/SourceCode/Bond/Servo/Servo.cpp
@@ -142,7 +142,6 @@
AfxMessageBox(errorMsg, MB_ICONERROR);
return FALSE;
}
- ProductionLogManager::getInstance().insertMockData();
// 初始化SECS运行设置管理库
diff --git a/SourceCode/Bond/Servo/Servo.rc b/SourceCode/Bond/Servo/Servo.rc
index b533912..56533a9 100644
--- a/SourceCode/Bond/Servo/Servo.rc
+++ b/SourceCode/Bond/Servo/Servo.rc
Binary files differ
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj b/SourceCode/Bond/Servo/Servo.vcxproj
index 0522556..c011bc2 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj
+++ b/SourceCode/Bond/Servo/Servo.vcxproj
@@ -258,6 +258,7 @@
<ClInclude Include="LogEdit.h" />
<ClInclude Include="MapPosWnd.h" />
<ClInclude Include="Model.h" />
+ <ClInclude Include="ProductionLogDlg.h" />
<ClInclude Include="ProductionLogManager.h" />
<ClInclude Include="Resource.h" />
<ClInclude Include="SECSRuntimeManager.h" />
@@ -334,6 +335,7 @@
<ClCompile Include="LogEdit.cpp" />
<ClCompile Include="MapPosWnd.cpp" />
<ClCompile Include="Model.cpp" />
+ <ClCompile Include="ProductionLogDlg.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
<ClCompile Include="SECSRuntimeManager.cpp" />
<ClCompile Include="SecsTestDlg.cpp" />
diff --git a/SourceCode/Bond/Servo/Servo.vcxproj.filters b/SourceCode/Bond/Servo/Servo.vcxproj.filters
index d9b4643..9bd2400 100644
--- a/SourceCode/Bond/Servo/Servo.vcxproj.filters
+++ b/SourceCode/Bond/Servo/Servo.vcxproj.filters
@@ -83,6 +83,7 @@
<ClCompile Include="CEqReadIntStep.cpp" />
<ClCompile Include="CEqCassetteTransferStateStep.cpp" />
<ClCompile Include="ProductionLogManager.cpp" />
+ <ClCompile Include="ProductionLogDlg.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AlarmManager.h" />
@@ -164,6 +165,7 @@
<ClInclude Include="CEqReadIntStep.h" />
<ClInclude Include="CEqCassetteTransferStateStep.h" />
<ClInclude Include="ProductionLogManager.h" />
+ <ClInclude Include="ProductionLogDlg.h" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Servo.rc" />
diff --git a/SourceCode/Bond/Servo/resource.h b/SourceCode/Bond/Servo/resource.h
index a676416..c47a946 100644
--- a/SourceCode/Bond/Servo/resource.h
+++ b/SourceCode/Bond/Servo/resource.h
Binary files differ
--
Gitblit v1.9.3