From 76368d075a475569f83fdb2d9977e46320185f1a Mon Sep 17 00:00:00 2001 From: lidg Date: Mon, 24 Aug 2026 17:28:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=8A=B6=E6=80=81=E7=82=B9?= =?UTF-8?q?=E4=BD=8D=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.ini | 8 + config/configmanager.cpp | 20 +- modbus/modbusaddress.cpp | 39 ++-- modbus/modbusaddress.h | 11 ++ pages/dashboardpage.cpp | 345 +++++++++++++++++++++++++-------- pages/dashboardpage.h | 11 ++ pages/dashboardpage.ui | 22 +-- pages/devicepage.cpp | 88 ++++++--- pages/devicepage.h | 2 + pages/orderpage.cpp | 94 ++++++--- pages/orderpage.h | 1 + pages/orderpage.ui | 10 +- services/deviceservice.cpp | 96 ++++++++- services/deviceservice.h | 9 + services/productionservice.cpp | 13 +- ssp.pro.user | 2 +- widget.cpp | 40 +++- widget.h | 3 + 18 files changed, 640 insertions(+), 174 deletions(-) diff --git a/config.ini b/config.ini index 1ba68dd..f503c80 100644 --- a/config.ini +++ b/config.ini @@ -29,6 +29,14 @@ plcReady=100 robotReady=101 safetyDoorClosed=102 emergencyStop=103 +inspectionMachineReady=500 +visionReady=501 +robotControlCabinetReady=502 +mainControlCabinetReady=503 +safetyDoor1Closed=504 +safetyDoor2Closed=505 +safetyDoor3Closed=506 +activeAlarm=507 currentStep=200 checkResult=201 errorCode=202 diff --git a/config/configmanager.cpp b/config/configmanager.cpp index a58bc9b..fedd543 100644 --- a/config/configmanager.cpp +++ b/config/configmanager.cpp @@ -14,8 +14,8 @@ ConfigManager &ConfigManager::instance() ConfigManager::ConfigManager() : m_databaseConfig(DbConfig::defaultConfig()), m_modbusConfig(ModbusConfig::defaultConfig()), - m_simulationMode(true), - m_productionEnabled(false) + m_simulationMode(false), + m_productionEnabled(true) { } @@ -55,6 +55,22 @@ bool ConfigManager::load(const QString &filePath) addresses.robotReady = settings.value("modbus/robotReady", addresses.robotReady).toInt(); addresses.safetyDoorClosed = settings.value("modbus/safetyDoorClosed", addresses.safetyDoorClosed).toInt(); addresses.emergencyStop = settings.value("modbus/emergencyStop", addresses.emergencyStop).toInt(); + addresses.inspectionMachineReady = + settings.value("modbus/inspectionMachineReady", addresses.inspectionMachineReady).toInt(); + addresses.visionReady = + settings.value("modbus/visionReady", addresses.visionReady).toInt(); + addresses.robotControlCabinetReady = + settings.value("modbus/robotControlCabinetReady", addresses.robotControlCabinetReady).toInt(); + addresses.mainControlCabinetReady = + settings.value("modbus/mainControlCabinetReady", addresses.mainControlCabinetReady).toInt(); + addresses.safetyDoor1Closed = + settings.value("modbus/safetyDoor1Closed", addresses.safetyDoor1Closed).toInt(); + addresses.safetyDoor2Closed = + settings.value("modbus/safetyDoor2Closed", addresses.safetyDoor2Closed).toInt(); + addresses.safetyDoor3Closed = + settings.value("modbus/safetyDoor3Closed", addresses.safetyDoor3Closed).toInt(); + addresses.activeAlarm = + settings.value("modbus/activeAlarm", addresses.activeAlarm).toInt(); addresses.currentStep = settings.value("modbus/currentStep", addresses.currentStep).toInt(); addresses.checkResult = settings.value("modbus/checkResult", addresses.checkResult).toInt(); addresses.errorCode = settings.value("modbus/errorCode", addresses.errorCode).toInt(); diff --git a/modbus/modbusaddress.cpp b/modbus/modbusaddress.cpp index 0c5058e..8c4e9cf 100644 --- a/modbus/modbusaddress.cpp +++ b/modbus/modbusaddress.cpp @@ -15,7 +15,7 @@ bool isValidAddress(int address) bool ModbusAddressMap::isValid(QString *error) const { - const QList > addresses = QList >() + const QList > coilAddresses = QList >() << qMakePair(QString("startCommand"), startCommand) << qMakePair(QString("pauseCommand"), pauseCommand) << qMakePair(QString("resetCommand"), resetCommand) @@ -28,9 +28,15 @@ bool ModbusAddressMap::isValid(QString *error) const << qMakePair(QString("robotReady"), robotReady) << qMakePair(QString("safetyDoorClosed"), safetyDoorClosed) << qMakePair(QString("emergencyStop"), emergencyStop) - << qMakePair(QString("currentStep"), currentStep) - << qMakePair(QString("checkResult"), checkResult) - << qMakePair(QString("errorCode"), errorCode) + << qMakePair(QString("inspectionMachineReady"), inspectionMachineReady) + << qMakePair(QString("visionReady"), visionReady) + << qMakePair(QString("robotControlCabinetReady"), robotControlCabinetReady) + << qMakePair(QString("mainControlCabinetReady"), mainControlCabinetReady) + << qMakePair(QString("safetyDoor1Closed"), safetyDoor1Closed) + << qMakePair(QString("safetyDoor2Closed"), safetyDoor2Closed) + << qMakePair(QString("safetyDoor3Closed"), safetyDoor3Closed) + << qMakePair(QString("activeAlarm"), activeAlarm) + << qMakePair(QString("inspectionMode"), inspectionMode) << qMakePair(QString("rackPickCommand"), rackPickCommand) << qMakePair(QString("frontLoadCommand"), frontLoadCommand) << qMakePair(QString("inspectionCommand"), inspectionCommand) @@ -46,27 +52,38 @@ bool ModbusAddressMap::isValid(QString *error) const << qMakePair(QString("flipFeedback"), flipFeedback) << qMakePair(QString("backLoadFeedback"), backLoadFeedback) << qMakePair(QString("backUnloadFeedback"), backUnloadFeedback) - << qMakePair(QString("rackPlaceFeedback"), rackPlaceFeedback) - << qMakePair(QString("inspectionMode"), inspectionMode) + << qMakePair(QString("rackPlaceFeedback"), rackPlaceFeedback); + + const QList > holdingRegisterAddresses = QList >() + << qMakePair(QString("currentStep"), currentStep) + << qMakePair(QString("checkResult"), checkResult) + << qMakePair(QString("errorCode"), errorCode) << qMakePair(QString("trayNumber"), trayNumber) << qMakePair(QString("slotNumber"), slotNumber); - QSet usedAddresses; - for (const QPair &item : addresses) { + const QList > addressGroups[] = { + coilAddresses, holdingRegisterAddresses + }; + const QString addressTypes[] = {"coil", "holding register"}; + for (int groupIndex = 0; groupIndex < 2; ++groupIndex) { + QSet usedAddresses; + for (const QPair &item : addressGroups[groupIndex]) { if (!isValidAddress(item.second)) { if (error) { - *error = QString("Modbus address is invalid: %1").arg(item.first); + *error = QString("Modbus %1 address is invalid: %2") + .arg(addressTypes[groupIndex], item.first); } return false; } if (usedAddresses.contains(item.second)) { if (error) { - *error = QString("Modbus address is duplicated: %1") - .arg(item.first); + *error = QString("Modbus %1 address is duplicated: %2") + .arg(addressTypes[groupIndex], item.first); } return false; } usedAddresses.insert(item.second); + } } return true; diff --git a/modbus/modbusaddress.h b/modbus/modbusaddress.h index d814d69..1b00108 100644 --- a/modbus/modbusaddress.h +++ b/modbus/modbusaddress.h @@ -20,6 +20,17 @@ struct ModbusAddressMap int safetyDoorClosed = 102; int emergencyStop = 103; + // Additional device status coils. Replace these placeholders with the + // approved PLC point table before commissioning. + int inspectionMachineReady = 500; + int visionReady = 501; + int robotControlCabinetReady = 502; + int mainControlCabinetReady = 503; + int safetyDoor1Closed = 504; + int safetyDoor2Closed = 505; + int safetyDoor3Closed = 506; + int activeAlarm = 507; + int currentStep = 200; int checkResult = 201; int errorCode = 202; diff --git a/pages/dashboardpage.cpp b/pages/dashboardpage.cpp index 28b4830..b19b5da 100644 --- a/pages/dashboardpage.cpp +++ b/pages/dashboardpage.cpp @@ -2,6 +2,7 @@ #include "ui_dashboardpage.h" #include "../services/orderservice.h" +#include "../services/trayservice.h" #include "../services/workpieceservice.h" #include "../repositories/productionrepository.h" #include "uihelpers.h" @@ -26,17 +27,89 @@ #include #include +namespace { + +QString displayState(const QString &state) +{ + if (state == "IDLE") return "待机"; + if (state == "PREPARING") return "准备中"; + if (state == "WAITING_DEVICE_READY") return "等待设备就绪"; + if (state == "RACK_PICKING") return "料架取料"; + if (state == "FRONT_LOADING") return "正面上料"; + if (state == "LOADING") return "上料"; + if (state == "FRONT_CHECKING") return "正面检测"; + if (state == "FRONT_UNLOADING") return "正面下料"; + if (state == "FLIPPING") return "翻面"; + if (state == "BACK_LOADING") return "反面上料"; + if (state == "BACK_CHECKING") return "反面检测"; + if (state == "BACK_UNLOADING") return "反面下料"; + if (state == "RACK_PLACING") return "料架放料"; + if (state == "JUDGING") return "结果判定"; + if (state == "UNLOADING") return "下料"; + if (state == "PAUSED") return "已暂停"; + if (state == "ERROR") return "故障"; + if (state == "COMPLETED") return "已完成"; + if (state == "TIMEOUT_WARNING") return "工序耗时提示"; + if (state == "TIMEOUT_PAUSED") return "等待人工恢复"; + if (state == "RECOVERY_CHECKING") return "恢复检查"; + if (state == "MANUAL_CONFIRM") return "等待人工确认"; + if (state == "RETRYING") return "重试中"; + if (state == "TERMINATING") return "终止中"; + return state.isEmpty() ? "未采集" : state; +} + +QString displayProcessStep(const QString &step) +{ + return displayState(step); +} + +QString displayProcessStatus(const QString &status) +{ + if (status == "RUNNING") return "执行中"; + if (status == "COMPLETED") return "已完成"; + if (status == "FAILED") return "失败"; + if (status == "PAUSED") return "已暂停"; + if (status == "CANCELED") return "已取消"; + return status.isEmpty() ? "未采集" : status; +} + +void updateStatusCell(QLabel *cell, const QString &text, const QString &color) +{ + if (!cell) { + return; + } + cell->setText(text); + cell->setStyleSheet(QString("QLabel { background: %1; border: 1px solid #ffffff; " + "border-radius: 3px; color: white; font-size: 11px; }") + .arg(color)); +} + +QString boolStatus(bool valid, bool value, const QString &yes, const QString &no) +{ + return !valid ? "未采集" : value ? yes : no; +} + +} + DashboardPage::DashboardPage(QWidget *parent) : QWidget(parent) , ui(new Ui::DashboardPage) , orderCombo(new QComboBox(this)) , rackBox(nullptr) - , deviceStatusLabel(new QLabel("PLC: - | Robot: - | Safety: -", this)) - , recoverButton(new QPushButton("Recover", this)) - , retryButton(new QPushButton("Retry", this)) - , markNgButton(new QPushButton("Mark NG", this)) - , stopButton(new QPushButton("Terminate", this)) - , processBox(new QGroupBox("Process timing", this)) + , deviceStatusLabel(new QLabel("PLC:未采集 | 机器人:未采集 | 安全回路:未采集", this)) + , inspectionMachineCell(nullptr) + , robotCell(nullptr) + , robotControlCabinetCell(nullptr) + , mainControlCabinetCell(nullptr) + , safetyDoor1Cell(nullptr) + , safetyDoor2Cell(nullptr) + , safetyDoor3Cell(nullptr) + , alarmCell(nullptr) + , recoverButton(new QPushButton("恢复", this)) + , retryButton(new QPushButton("重试", this)) + , markNgButton(new QPushButton("标记 NG", this)) + , stopButton(new QPushButton("终止", this)) + , processBox(new QGroupBox("工序耗时", this)) , currentProcessLabel(new QLabel("-", processBox)) , processElapsedLabel(new QLabel("00:00:00.000", processBox)) , processTotalElapsedLabel(new QLabel("00:00:00.000", processBox)) @@ -85,15 +158,15 @@ DashboardPage::DashboardPage(QWidget *parent) ui->taskLayout->insertWidget(1, deviceStatusLabel); QFormLayout *processSummaryLayout = new QFormLayout; - processSummaryLayout->addRow("Current process:", currentProcessLabel); - processSummaryLayout->addRow("Elapsed:", processElapsedLabel); - processSummaryLayout->addRow("Total:", processTotalElapsedLabel); + processSummaryLayout->addRow("当前工序:", currentProcessLabel); + processSummaryLayout->addRow("当前耗时:", processElapsedLabel); + processSummaryLayout->addRow("累计耗时:", processTotalElapsedLabel); QVBoxLayout *processLayout = new QVBoxLayout(processBox); processLayout->addLayout(processSummaryLayout); processTable->setColumnCount(4); processTable->setHorizontalHeaderLabels( - QStringList() << "Process" << "Status" << "Attempt" << "Duration"); + QStringList() << "工序" << "状态" << "次数" << "耗时"); processTable->horizontalHeader()->setStretchLastSection(true); processTable->horizontalHeader()->setSectionResizeMode( 0, QHeaderView::Stretch); @@ -124,16 +197,24 @@ DashboardPage::DashboardPage(QWidget *parent) ui->deviceLayout->setRowStretch(3, 1); ui->deviceLayout->setRowStretch(4, 1); ui->deviceLayout->setRowStretch(5, 1); - ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("检测机\n待机", "#607d8b"), 0, 0, 2, 2); + inspectionMachineCell = UiHelpers::makeStatusCell("检测机\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(inspectionMachineCell, 0, 0, 2, 2); ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("总控电脑", "#43a047"), 0, 3); - ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("安全门1\n关闭", "#2e7d32"), 0, 4); - QLabel *robotCell = UiHelpers::makeStatusCell("机器人\n空闲", "#f9a825"); + safetyDoor1Cell = UiHelpers::makeStatusCell("安全门 1\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(safetyDoor1Cell, 0, 4); + robotCell = UiHelpers::makeStatusCell("机器人\n未采集", "#607d8b"); robotCell->setFixedSize(82, 58); ui->deviceLayout->addWidget(robotCell, 2, 3, 2, 2, Qt::AlignCenter); - ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("机器人\n控制柜", "#546e7a"), 3, 0); - ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("总控柜", "#546e7a"), 4, 0); - ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("安全门2\n关闭", "#2e7d32"), 2, 5); - ui->deviceLayout->addWidget(UiHelpers::makeStatusCell("安全门3\n关闭", "#2e7d32"), 5, 0); + robotControlCabinetCell = UiHelpers::makeStatusCell("机器人控制柜\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(robotControlCabinetCell, 3, 0); + mainControlCabinetCell = UiHelpers::makeStatusCell("总控柜\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(mainControlCabinetCell, 4, 0); + safetyDoor2Cell = UiHelpers::makeStatusCell("安全门 2\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(safetyDoor2Cell, 2, 5); + safetyDoor3Cell = UiHelpers::makeStatusCell("安全门 3\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(safetyDoor3Cell, 5, 0); + alarmCell = UiHelpers::makeStatusCell("PLC 报警\n未采集", "#607d8b"); + ui->deviceLayout->addWidget(alarmCell, 5, 5); rackBox = new QGroupBox("料架 2x3"); rackBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); @@ -141,8 +222,8 @@ DashboardPage::DashboardPage(QWidget *parent) rackLayout->setContentsMargins(8, 18, 8, 8); rackLayout->setSpacing(4); for (int i = 0; i < 6; ++i) { - QLabel *trayCell = UiHelpers::makeSquareStatusCell(QString("托盘%1\n%2/49").arg(i + 1).arg(49 - i * 4), - i == 0 ? "#00897b" : "#78909c"); + QLabel *trayCell = UiHelpers::makeSquareStatusCell( + QString("托盘 %1\n未采集").arg(i + 1), "#607d8b"); rackTrayCells.append(trayCell); rackLayout->addWidget(trayCell, i / 3, i % 3, Qt::AlignCenter); } @@ -203,6 +284,7 @@ DashboardPage::DashboardPage(QWidget *parent) this, &DashboardPage::refreshProcessRecords); processRefreshTimer->start(); refreshProcessRecords(); + updateRackSummary(); } DashboardPage::~DashboardPage() @@ -263,24 +345,29 @@ void DashboardPage::updateRackSize() void DashboardPage::startProduction() { + if (productionState != ProductionService::Idle + && productionState != ProductionService::Completed) { + return; + } + int selectedOrderId = orderCombo->currentData().toInt(); if (selectedOrderId <= 0) { loadOrderOptions(); selectedOrderId = orderCombo->currentData().toInt(); } if (selectedOrderId <= 0) { - QMessageBox::information(this, "Start production", - "No prepared order is available"); + QMessageBox::information(this, "启动生产", + "没有可生产的订单,请先生成工件。"); return; } - if (productionState == ProductionService::Paused) { - QMetaObject::invokeMethod(productionWorker, "requestResume", - Qt::QueuedConnection); - } else { - QMetaObject::invokeMethod( + ui->startButton->setEnabled(false); + if (!QMetaObject::invokeMethod( productionWorker, "requestStart", Qt::QueuedConnection, - Q_ARG(int, selectedOrderId)); + Q_ARG(int, selectedOrderId))) { + updateRecoveryButtons(); + QMessageBox::warning(this, "启动生产", + "提交生产启动请求失败。"); } } @@ -307,8 +394,8 @@ void DashboardPage::clearAlarm() { QMetaObject::invokeMethod(productionWorker, "requestClearAlarm", Qt::QueuedConnection); - emit logRequested("Alarm log", "Dashboard", "Clear alarm", - "PLC alarm clear command requested", "Pending"); + emit logRequested("报警日志", "控制面板", "清除报警", + "已请求 PLC 清除报警", "待处理"); } void DashboardPage::onOrderChanged(int) @@ -320,10 +407,11 @@ void DashboardPage::onProductionStateChanged(ProductionService::State state, const QString &name) { productionState = state; - ui->actionLabel->setText("Production state: " + name); + const QString stateText = displayState(name); + ui->actionLabel->setText("生产状态:" + stateText); updateRecoveryButtons(); - emit systemStateChanged(name); - emit currentStepChanged(name); + emit systemStateChanged(stateText); + emit currentStepChanged(stateText); refreshProcessRecords(); updateProductionStats(); } @@ -332,12 +420,14 @@ void DashboardPage::onCurrentWorkpieceChanged(int workpieceId, const QString &barcode) { if (workpieceId <= 0) { - ui->workpieceLabel->setText("Current workpiece: -"); - ui->trayLabel->setText("Current tray: -"); + ui->workpieceLabel->setText("当前工件:-"); + ui->trayLabel->setText("当前托盘:-"); currentProcessElapsedMs = 0; + emit currentWorkpieceChanged("-"); } else { ui->workpieceLabel->setText( - QString("Current workpiece: %1").arg(barcode)); + QString("当前工件:%1").arg(barcode)); + emit currentWorkpieceChanged(barcode); } refreshProcessRecords(); updateRecoveryButtons(); @@ -357,31 +447,33 @@ void DashboardPage::onCurrentPositionChanged(int trayNo, int slotNo) productionTrayNo = trayNo; productionSlotNo = slotNo; ui->trayLabel->setText(trayNo > 0 - ? QString("Current tray: %1 / slot: %2").arg(trayNo).arg(slotNo) - : "Current tray: -"); + ? QString("当前托盘:%1,位置:%2").arg(trayNo).arg(slotNo) + : "当前托盘:-"); } void DashboardPage::onProductionError(const QString &error) { - ui->actionLabel->setText("Production error: " + error); - emit systemStateChanged("ERROR"); - emit logRequested("Alarm log", "Production", "Production error", - error, "Failed"); + ui->actionLabel->setText("生产故障:" + error); + updateRecoveryButtons(); + emit systemStateChanged("故障"); + emit logRequested("报警日志", "生产流程", "生产故障", + error, "失败"); } void DashboardPage::onProductionFinished(int orderId) { - emit logRequested("Production log", "Production", "Order completed", - QString("Order %1 completed").arg(orderId), "Success"); + emit logRequested("生产日志", "生产流程", "订单完成", + QString("订单 %1 已完成").arg(orderId), "成功"); loadOrderOptions(); updateProductionStats(); + updateRackSummary(); } void DashboardPage::onProcessElapsedChanged(const QString &processStep, int elapsedMs) { currentProcessElapsedMs = elapsedMs; - currentProcessLabel->setText(processStep); + currentProcessLabel->setText(displayProcessStep(processStep)); processElapsedLabel->setText(formatDuration(elapsedMs)); updateCurrentProcessDuration(elapsedMs); } @@ -389,23 +481,23 @@ void DashboardPage::onProcessElapsedChanged(const QString &processStep, void DashboardPage::onTimeoutRecoveryRequired(const QString &state, const QString &message) { - ui->actionLabel->setText("Manual recovery required: " + message); - emit logRequested("Operation log", "Production", "Manual recovery", - state + ": " + message, "Pending"); + ui->actionLabel->setText("需要人工恢复:" + message); + emit logRequested("操作日志", "生产流程", "人工恢复", + displayState(state) + ":" + message, "待处理"); } void DashboardPage::onRecoveryCompleted(const QString &mode) { - emit logRequested("Production log", "Production", "Recovery completed", - mode, "Success"); + emit logRequested("生产日志", "生产流程", "恢复完成", + displayState(mode), "成功"); } void DashboardPage::recoverProduction() { if (productionState == ProductionService::ManualConfirm && QMessageBox::question( - this, "Continue production", - "Continue only after confirming the equipment and current PLC step are safe?", + this, "继续生产", + "请确认设备和 PLC 当前步骤安全后再继续生产。", QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) != QMessageBox::Yes) { return; @@ -424,8 +516,8 @@ void DashboardPage::retryRecovery() void DashboardPage::markWorkpieceNg() { if (QMessageBox::question( - this, "Mark workpiece NG", - "Mark the current workpiece as NG and continue with the next workpiece?", + this, "标记工件 NG", + "确认将当前工件标记为 NG,并继续处理下一个工件吗?", QMessageBox::Yes | QMessageBox::No, QMessageBox::No) != QMessageBox::Yes) { return; @@ -443,15 +535,18 @@ void DashboardPage::updateRecoveryButtons() const bool running = state != ProductionService::Idle && state != ProductionService::Completed; const bool terminating = state == ProductionService::Terminating; + const bool canStart = state == ProductionService::Idle + || state == ProductionService::Completed; + ui->startButton->setEnabled(canStart); recoverButton->setVisible(recoveryRequired); retryButton->setVisible(recoveryRequired); markNgButton->setVisible(recoveryRequired && productionWorkpiece.id > 0); stopButton->setVisible(running); stopButton->setEnabled(!terminating); - stopButton->setText(terminating ? "Terminating..." : "Terminate"); + stopButton->setText(terminating ? "终止中..." : "终止"); recoverButton->setText(state == ProductionService::ManualConfirm - ? "Continue" : "Recover"); + ? "继续" : "恢复"); } QString DashboardPage::formatDuration(int elapsedMs) @@ -509,10 +604,14 @@ void DashboardPage::refreshProcessRecords() totalElapsedMs += durationMs; } - processTable->setItem(row, 0, - new QTableWidgetItem(record.processStep)); - processTable->setItem(row, 1, - new QTableWidgetItem(record.processState)); + QTableWidgetItem *stepItem = new QTableWidgetItem( + displayProcessStep(record.processStep)); + stepItem->setData(Qt::UserRole, record.processStep); + processTable->setItem(row, 0, stepItem); + QTableWidgetItem *statusItem = new QTableWidgetItem( + displayProcessStatus(record.processState)); + statusItem->setData(Qt::UserRole, record.processState); + processTable->setItem(row, 1, statusItem); processTable->setItem(row, 2, new QTableWidgetItem( QString::number(record.attemptNo))); @@ -523,7 +622,7 @@ void DashboardPage::refreshProcessRecords() } if (!currentStep.isEmpty()) { - currentProcessLabel->setText(currentStep); + currentProcessLabel->setText(displayProcessStep(currentStep)); } processTotalElapsedLabel->setText(formatDuration(totalElapsedMs)); } @@ -537,11 +636,13 @@ void DashboardPage::updateCurrentProcessDuration(int elapsedMs) for (int row = 0; row < processTable->rowCount(); ++row) { QTableWidgetItem *stepItem = processTable->item(row, 0); - if (!stepItem || stepItem->text() != workpiece.processStep) { + if (!stepItem || stepItem->data(Qt::UserRole).toString() + != workpiece.processStep) { continue; } QTableWidgetItem *statusItem = processTable->item(row, 1); - if (!statusItem || statusItem->text() != "RUNNING") { + if (!statusItem || statusItem->data(Qt::UserRole).toString() + != "RUNNING") { continue; } processTable->setItem(row, 3, @@ -553,12 +654,101 @@ void DashboardPage::updateCurrentProcessDuration(int elapsedMs) void DashboardPage::onDeviceStatusChanged(const DeviceStatus &status) { emit deviceStatusChanged(status); + const QString plcText = boolStatus(status.statusValid, + status.plcReady, "就绪", "未就绪"); + const QString robotText = boolStatus(status.statusValid, + status.robotReady, "就绪", "未就绪"); + const QString safetyText = !status.statusValid ? "未采集" + : status.safetyDoorClosed ? "正常" : "异常"; deviceStatusLabel->setText( - QString("PLC: %1 | Robot: %2 | Safety door: %3 | E-stop: %4") - .arg(status.plcConnected ? "ONLINE" : "OFFLINE") - .arg(status.robotReady ? "READY" : "NOT_READY") - .arg(status.safetyDoorClosed ? "CLOSED" : "OPEN") - .arg(status.emergencyStop ? "ACTIVE" : "CLEAR")); + QString("PLC:%1 | 机器人:%2 | 安全回路:%3 | 急停:%4") + .arg(!status.statusValid ? "未采集" + : status.plcConnected ? "在线" : "离线") + .arg(robotText) + .arg(safetyText) + .arg(boolStatus(status.statusValid, status.emergencyStop, + "已触发", "正常"))); + + updateStatusCell(inspectionMachineCell, + QString("检测机\n%1").arg(boolStatus( + status.statusValid, status.inspectionMachineReady, + "就绪", "未就绪")), + !status.statusValid ? "#607d8b" + : status.inspectionMachineReady ? "#2e7d32" : "#d32f2f"); + updateStatusCell(robotCell, + QString("机器人\n%1").arg(robotText), + !status.statusValid ? "#607d8b" + : status.robotReady ? "#2e7d32" : "#d32f2f"); + updateStatusCell(robotControlCabinetCell, + QString("机器人控制柜\n%1").arg(boolStatus( + status.statusValid, status.robotControlCabinetReady, + "正常", "未就绪")), + !status.statusValid ? "#607d8b" + : status.robotControlCabinetReady ? "#2e7d32" : "#d32f2f"); + updateStatusCell(mainControlCabinetCell, + QString("总控柜\n%1").arg(boolStatus( + status.statusValid, status.mainControlCabinetReady, + "正常", "未就绪")), + !status.statusValid ? "#607d8b" + : status.mainControlCabinetReady ? "#2e7d32" : "#d32f2f"); + updateStatusCell(safetyDoor1Cell, + QString("安全门 1\n%1").arg(boolStatus( + status.statusValid, status.safetyDoor1Closed, + "关闭", "打开")), + !status.statusValid ? "#607d8b" + : status.safetyDoor1Closed ? "#2e7d32" : "#d32f2f"); + updateStatusCell(safetyDoor2Cell, + QString("安全门 2\n%1").arg(boolStatus( + status.statusValid, status.safetyDoor2Closed, + "关闭", "打开")), + !status.statusValid ? "#607d8b" + : status.safetyDoor2Closed ? "#2e7d32" : "#d32f2f"); + updateStatusCell(safetyDoor3Cell, + QString("安全门 3\n%1").arg(boolStatus( + status.statusValid, status.safetyDoor3Closed, + "关闭", "打开")), + !status.statusValid ? "#607d8b" + : status.safetyDoor3Closed ? "#2e7d32" : "#d32f2f"); + updateStatusCell(alarmCell, + QString("PLC 报警\n%1").arg(boolStatus( + status.statusValid, status.activeAlarm, + "有报警", "无报警")), + !status.statusValid ? "#607d8b" + : status.activeAlarm ? "#d32f2f" : "#2e7d32"); + updateRackSummary(); +} + +void DashboardPage::updateRackSummary() +{ + QString error; + const QList trays = TrayService::instance().listTrays(&error); + for (int index = 0; index < rackTrayCells.size(); ++index) { + QLabel *cell = rackTrayCells.at(index); + if (!error.isEmpty() || index >= trays.size()) { + updateStatusCell(cell, + QString("托盘 %1\n未采集").arg(index + 1), + "#607d8b"); + continue; + } + + const Tray &tray = trays.at(index); + const QString status = tray.present ? tray.status : "离位"; + const QString statusText = status == "OK" ? "已完成" + : status == "NG" ? "有 NG" + : status == "PROCESSING" ? "加工中" + : status == "PENDING" ? "待检测" + : tray.present ? "在位" : "离位"; + const QString color = !tray.present ? "#90a4ae" + : status == "NG" ? "#d32f2f" + : status == "PROCESSING" ? "#1e88e5" + : status == "OK" ? "#2e7d32" : "#78909c"; + updateStatusCell(cell, + QString("托盘 %1\n%2:%3/49") + .arg(index + 1) + .arg(statusText) + .arg(tray.loadedCount), + color); + } } void DashboardPage::loadOrderOptions() @@ -567,9 +757,9 @@ void DashboardPage::loadOrderOptions() const QList orders = OrderService::instance().listOrders(&error); if (!error.isEmpty()) { orderCombo->clear(); - orderCombo->addItem("No order data", 0); - emit logRequested("Operation log", "Dashboard", "Load orders", - error, "Failed"); + orderCombo->addItem("无订单数据", 0); + emit logRequested("操作日志", "控制面板", "加载订单", + error, "失败"); return; } @@ -591,7 +781,7 @@ void DashboardPage::loadOrderOptions() } if (orderCombo->count() == 0) { - orderCombo->addItem("No prepared order", 0); + orderCombo->addItem("暂无可生产订单", 0); } else { const int previousIndex = orderCombo->findData(previousOrderId); orderCombo->setCurrentIndex(previousIndex >= 0 ? previousIndex : 0); @@ -603,9 +793,10 @@ void DashboardPage::updateOrderSummary() { const int selectedOrderId = orderCombo->currentData().toInt(); if (selectedOrderId <= 0) { - ui->orderLabel->setText("Current order: -"); - ui->trayLabel->setText("Current tray: -"); - ui->workpieceLabel->setText("Current workpiece: -"); + ui->orderLabel->setText("当前订单:-"); + ui->trayLabel->setText("当前托盘:-"); + ui->workpieceLabel->setText("当前工件:-"); + emit currentOrderChanged("-"); updateProductionStats(); return; } @@ -613,10 +804,12 @@ void DashboardPage::updateOrderSummary() Order order; QString error; if (!OrderService::instance().findOrder(selectedOrderId, &order, &error)) { - ui->orderLabel->setText("Current order: -"); + ui->orderLabel->setText("当前订单:-"); + emit currentOrderChanged("-"); return; } - ui->orderLabel->setText("Current order: " + order.no); + ui->orderLabel->setText("当前订单:" + order.no); + emit currentOrderChanged(order.no); updateProductionStats(); } diff --git a/pages/dashboardpage.h b/pages/dashboardpage.h index d01fbc2..72a6467 100644 --- a/pages/dashboardpage.h +++ b/pages/dashboardpage.h @@ -30,6 +30,8 @@ public: signals: void systemStateChanged(const QString &state); void currentStepChanged(const QString &step); + void currentOrderChanged(const QString &orderNo); + void currentWorkpieceChanged(const QString &workpiece); void deviceStatusChanged(const DeviceStatus &status); void deviceCommunicationError(const QString &error); void logRequested(const QString &type, const QString &module, const QString &action, @@ -64,6 +66,7 @@ private: void loadOrderOptions(); void updateOrderSummary(); void updateProductionStats(); + void updateRackSummary(); void updateRackSize(); void updateRecoveryButtons(); void refreshProcessRecords(); @@ -75,6 +78,14 @@ private: QGroupBox *rackBox; QVector rackTrayCells; QLabel *deviceStatusLabel; + QLabel *inspectionMachineCell; + QLabel *robotCell; + QLabel *robotControlCabinetCell; + QLabel *mainControlCabinetCell; + QLabel *safetyDoor1Cell; + QLabel *safetyDoor2Cell; + QLabel *safetyDoor3Cell; + QLabel *alarmCell; QPushButton *recoverButton; QPushButton *retryButton; QPushButton *markNgButton; diff --git a/pages/dashboardpage.ui b/pages/dashboardpage.ui index c6028ee..f46392d 100644 --- a/pages/dashboardpage.ui +++ b/pages/dashboardpage.ui @@ -35,7 +35,7 @@ 计划数量 - 294Qt::AlignCenter + 0Qt::AlignCenter @@ -46,7 +46,7 @@ 待检测 - 286Qt::AlignCenter + 0Qt::AlignCenter @@ -57,7 +57,7 @@ 正面检测 - 5Qt::AlignCenter + 0Qt::AlignCenter @@ -68,7 +68,7 @@ 反面检测 - 3Qt::AlignCenter + 0Qt::AlignCenter @@ -79,7 +79,7 @@ OK - 2Qt::AlignCenter + 0Qt::AlignCenter @@ -90,7 +90,7 @@ NG - 1Qt::AlignCenter + 0Qt::AlignCenter @@ -108,16 +108,16 @@ 当前任务 - 订单编号:ORD-20260808-001 - 当前托盘:托盘 1 - 当前工件:第 1 行第 1 列 - 动作说明:等待人工启动单元检测程序 + 当前订单:- + 当前托盘:- + 当前工件:- + 生产状态:待机 启动 暂停 复位 - 模拟下一步 + 下一步 清除报警 diff --git a/pages/devicepage.cpp b/pages/devicepage.cpp index 5859a82..923c4cf 100644 --- a/pages/devicepage.cpp +++ b/pages/devicepage.cpp @@ -5,15 +5,20 @@ #include #include #include +#include #include #include DevicePage::DevicePage(QWidget *parent) : QWidget(parent) , ui(new Ui::DevicePage) + , communicationErrorLabel(new QLabel(this)) { ui->setupUi(this); + communicationErrorLabel->setText("通信状态:未采集"); + communicationErrorLabel->setStyleSheet("color: #607d8b; padding: 4px 0;"); + ui->mainLayout->insertWidget(0, communicationErrorLabel); setupTable(); } @@ -31,7 +36,7 @@ void DevicePage::setupTable() const QStringList names = QStringList() << "PLC" << "上下料机器人" << "检测机" << "视觉引导系统" << "总控柜" << "机器人控制柜" << "安全门 1" << "安全门 2" - << "安全门 3" << "急停"; + << "安全门 3" << "急停" << "PLC 活动报警"; table->setRowCount(names.size()); for (int row = 0; row < names.size(); ++row) { table->setItem(row, 0, new QTableWidgetItem(names.at(row))); @@ -53,41 +58,76 @@ void DevicePage::setRow(int row, const QStringList &values) void DevicePage::updateStatus(const DeviceStatus &status) { - const QString connection = status.plcConnected ? "在线" : "离线"; - const QString plcState = status.plcReady ? "就绪" : "未就绪"; - const QString robotState = status.robotReady ? "就绪" : "未就绪"; - const QString safetyState = status.safetyDoorClosed ? "关闭" : "打开"; - const QString emergencyState = status.emergencyStop ? "已触发" : "未触发"; + communicationErrorLabel->setText(status.statusValid + ? "通信状态:PLC 在线" + : "通信状态:PLC 状态未采集"); + communicationErrorLabel->setStyleSheet(status.statusValid + ? "color: #2e7d32; padding: 4px 0;" + : "color: #d32f2f; padding: 4px 0;"); + + const QString connection = !status.statusValid + ? "未采集" : status.plcConnected ? "在线" : "离线"; + const QString plcState = !status.statusValid + ? "未知" : status.plcReady ? "就绪" : "未就绪"; + const QString robotState = !status.statusValid + ? "未知" : status.robotReady ? "就绪" : "未就绪"; + const QString inspectionState = !status.statusValid + ? "未知" : status.inspectionMachineReady ? "就绪" : "未就绪"; + const QString visionState = !status.statusValid + ? "未知" : status.visionReady ? "就绪" : "未就绪"; + const QString robotCabinetState = !status.statusValid + ? "未知" : status.robotControlCabinetReady ? "正常" : "未就绪"; + const QString mainCabinetState = !status.statusValid + ? "未知" : status.mainControlCabinetReady ? "正常" : "未就绪"; + const QString safetyDoor1State = !status.statusValid + ? "未知" : status.safetyDoor1Closed ? "关闭" : "打开"; + const QString safetyDoor2State = !status.statusValid + ? "未知" : status.safetyDoor2Closed ? "关闭" : "打开"; + const QString safetyDoor3State = !status.statusValid + ? "未知" : status.safetyDoor3Closed ? "关闭" : "打开"; + const QString emergencyState = !status.statusValid + ? "未知" : status.emergencyStop ? "已触发" : "未触发"; + const QString alarmState = !status.statusValid + ? "未知" : status.activeAlarm ? "有报警" : "无报警"; const QString now = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); setRow(0, QStringList() << "PLC" << connection << plcState - << QString("当前工序 %1").arg(status.currentStep) << now); + << QString("PLC 步骤 %1").arg(status.currentStep) << now); setRow(1, QStringList() << "上下料机器人" << connection << robotState - << (status.robotReady ? "等待取料" : "等待就绪") << now); + << (!status.statusValid ? "未知" + : status.robotReady ? "等待动作" : "等待就绪") << now); setRow(2, QStringList() << "检测机" << connection - << (status.plcConnected ? "待机" : "离线") - << QString("检测结果 %1").arg(status.checkResult) << now); + << inspectionState + << (!status.statusValid ? "未知" : "等待检测") << now); setRow(3, QStringList() << "视觉引导系统" << connection - << (status.plcConnected ? "待机" : "离线") - << "等待拍照" << now); - setRow(4, QStringList() << "总控柜" << connection - << (status.plcConnected ? "正常" : "离线") - << "供电状态由 PLC 提供" << now); + << visionState + << (!status.statusValid ? "未知" : "等待拍照") << now); + setRow(4, QStringList() << "总控柜" << connection << mainCabinetState + << (!status.statusValid ? "未知" : "PLC 状态正常") << now); setRow(5, QStringList() << "机器人控制柜" << connection - << (status.robotReady ? "正常" : "未就绪") - << "等待机器人状态" << now); - setRow(6, QStringList() << "安全门 1" << connection << safetyState - << (status.safetyDoorClosed ? "互锁正常" : "请关闭安全门") << now); - setRow(7, QStringList() << "安全门 2" << connection << safetyState - << (status.safetyDoorClosed ? "互锁正常" : "请关闭安全门") << now); - setRow(8, QStringList() << "安全门 3" << connection << safetyState - << (status.safetyDoorClosed ? "互锁正常" : "请关闭安全门") << now); + << robotCabinetState + << (!status.statusValid ? "未知" : "等待机器人状态") << now); + setRow(6, QStringList() << "安全门 1" << connection << safetyDoor1State + << (!status.statusValid ? "未知" + : status.safetyDoor1Closed ? "互锁正常" : "请关闭安全门") << now); + setRow(7, QStringList() << "安全门 2" << connection << safetyDoor2State + << (!status.statusValid ? "未知" + : status.safetyDoor2Closed ? "互锁正常" : "请关闭安全门") << now); + setRow(8, QStringList() << "安全门 3" << connection << safetyDoor3State + << (!status.statusValid ? "未知" + : status.safetyDoor3Closed ? "互锁正常" : "请关闭安全门") << now); setRow(9, QStringList() << "急停" << connection << emergencyState - << (status.emergencyStop ? "安全回路断开" : "安全回路正常") << now); + << (!status.statusValid ? "未知" + : status.emergencyStop ? "安全回路断开" : "安全回路正常") << now); + setRow(10, QStringList() << "PLC 活动报警" << connection << alarmState + << (!status.statusValid ? "未知" + : status.activeAlarm ? "请处理 PLC 报警" : "无活动报警") << now); } void DevicePage::handleCommunicationError(const QString &error) { + communicationErrorLabel->setText("通信异常:" + error); + communicationErrorLabel->setStyleSheet("color: #d32f2f; padding: 4px 0;"); qWarning() << "Device communication error:" << error; } diff --git a/pages/devicepage.h b/pages/devicepage.h index 227457d..d055494 100644 --- a/pages/devicepage.h +++ b/pages/devicepage.h @@ -6,6 +6,7 @@ #include "../services/deviceservice.h" namespace Ui { class DevicePage; } +class QLabel; class DevicePage : public QWidget { @@ -24,6 +25,7 @@ private: void setRow(int row, const QStringList &values); Ui::DevicePage *ui; + QLabel *communicationErrorLabel; }; #endif // DEVICEPAGE_H diff --git a/pages/orderpage.cpp b/pages/orderpage.cpp index 855a417..4bca4d7 100644 --- a/pages/orderpage.cpp +++ b/pages/orderpage.cpp @@ -16,6 +16,28 @@ #include #include +namespace { + +QString displayOrderStatus(const QString &status) +{ + if (status == "NOT_START") return "未开始"; + if (status == "RUNNING") return "加工中"; + if (status == "PAUSED") return "已暂停"; + if (status == "COMPLETED") return "已完成"; + if (status == "ERROR") return "故障"; + if (status == "STOPPING") return "终止中"; + return status.isEmpty() ? "未采集" : status; +} + +QString displayInspectionMode(const QString &mode) +{ + if (mode == "BEFORE_PLATING") return "镀金前检测"; + if (mode == "AFTER_PLATING") return "镀金后检测"; + return mode.isEmpty() ? "未设置" : mode; +} + +} + OrderPage::OrderPage(QWidget *parent) : QWidget(parent) , ui(new Ui::OrderPage) @@ -31,23 +53,22 @@ OrderPage::OrderPage(QWidget *parent) table->setColumnCount(14); table->setHorizontalHeaderLabels(QStringList() << "订单编号" << "生产号" << "图纸号" << "批次号" << "计划" - << "OK" << "NG" << "状态" << "开始时间" << "结束时间" << "备注"); - table->setHorizontalHeaderItem(8, new QTableWidgetItem("Mode")); - table->setHorizontalHeaderItem(9, new QTableWidgetItem("Start tray")); - table->setHorizontalHeaderItem(10, new QTableWidgetItem("Start slot")); - table->setHorizontalHeaderItem(11, new QTableWidgetItem("Begin")); - table->setHorizontalHeaderItem(12, new QTableWidgetItem("End")); - table->setHorizontalHeaderItem(13, new QTableWidgetItem("Remark")); + << "OK" << "NG" << "状态" << "检测模式" << "起始托盘" + << "起始位置" << "开始时间" << "结束时间" << "备注"); table->horizontalHeader()->setStretchLastSection(true); table->verticalHeader()->setVisible(false); table->setEditTriggers(QAbstractItemView::NoEditTriggers); table->setAlternatingRowColors(true); + table->setSelectionBehavior(QAbstractItemView::SelectRows); + table->setSelectionMode(QAbstractItemView::SingleSelection); connect(ui->newButton, &QPushButton::clicked, this, &OrderPage::createOrder); connect(ui->refreshButton, &QPushButton::clicked, this, &OrderPage::loadOrders); connect(generateButton, &QPushButton::clicked, this, &OrderPage::generateSelectedWorkpieces); connect(ui->deleteButton, &QPushButton::clicked, this, &OrderPage::deleteSelectedOrder); + connect(table, &QTableWidget::itemSelectionChanged, + this, &OrderPage::updateSelectedOrderDetail); loadOrders(); } @@ -94,8 +115,8 @@ void OrderPage::fillOrderTable(const QList &orders) << QString::number(order.planNum) << QString::number(order.qualified) << QString::number(order.unqualified) - << order.status - << order.inspectionMode + << displayOrderStatus(order.status) + << displayInspectionMode(order.inspectionMode) << QString::number(order.startTrayNo) << QString::number(order.startSlotNo) << beginTime @@ -108,20 +129,41 @@ void OrderPage::fillOrderTable(const QList &orders) } if (orders.isEmpty()) { + updateSelectedOrderDetail(); + return; + } + + table->setCurrentCell(0, 0); + updateSelectedOrderDetail(); +} + +void OrderPage::updateSelectedOrderDetail() +{ + const int row = ui->orderTable->currentRow(); + if (row < 0 || row >= orderIds.size()) { ui->currentOrderLabel->setText("当前订单:-"); ui->progressLabel->setText("当前进度:0 / 0"); - ui->currentStepLabel->setText("当前工序:-"); + ui->currentStepLabel->setText("当前状态:-"); ui->memoLabel->setText("说明:暂无订单"); return; } - const Order &first = orders.first(); - ui->currentOrderLabel->setText("当前订单:" + first.no); + Order order; + QString error; + if (!OrderService::instance().findOrder(orderIds.at(row), &order, &error)) { + ui->currentOrderLabel->setText("当前订单:-"); + ui->progressLabel->setText("当前进度:0 / 0"); + ui->currentStepLabel->setText("当前状态:未采集"); + ui->memoLabel->setText("说明:订单读取失败"); + return; + } + + ui->currentOrderLabel->setText("当前订单:" + order.no); ui->progressLabel->setText(QString("当前进度:%1 / %2") - .arg(first.qualified + first.unqualified) - .arg(first.planNum)); - ui->currentStepLabel->setText("当前工序:" + first.status); - ui->memoLabel->setText("说明:" + first.remark); + .arg(order.qualified + order.unqualified) + .arg(order.planNum)); + ui->currentStepLabel->setText("当前状态:" + displayOrderStatus(order.status)); + ui->memoLabel->setText("说明:" + (order.remark.isEmpty() ? "无" : order.remark)); } void OrderPage::createOrder() @@ -139,11 +181,11 @@ void OrderPage::createOrder() QSpinBox *planNumSpin = new QSpinBox(&dialog); QTextEdit *remarkEdit = new QTextEdit(&dialog); - modeCombo->addItem("BEFORE_PLATING", "BEFORE_PLATING"); - modeCombo->addItem("AFTER_PLATING", "AFTER_PLATING"); - startTraySpin->setRange(1, 999); + modeCombo->addItem("镀金前检测", "BEFORE_PLATING"); + modeCombo->addItem("镀金后检测", "AFTER_PLATING"); + startTraySpin->setRange(1, 6); startSlotSpin->setRange(1, 49); - planNumSpin->setRange(1, 999999); + planNumSpin->setRange(1, 294); planNumSpin->setValue(49); remarkEdit->setFixedHeight(70); @@ -155,9 +197,9 @@ void OrderPage::createOrder() formLayout->addRow("计划数量:", planNumSpin); formLayout->addRow("备注:", remarkEdit); - formLayout->addRow("Inspection mode:", modeCombo); - formLayout->addRow("Start tray:", startTraySpin); - formLayout->addRow("Start slot:", startSlotSpin); + formLayout->addRow("检测模式:", modeCombo); + formLayout->addRow("起始托盘:", startTraySpin); + formLayout->addRow("起始位置:", startSlotSpin); QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, &dialog); @@ -220,13 +262,13 @@ void OrderPage::generateSelectedWorkpieces() QString error; if (!OrderService::instance().generateWorkpiecesAndAssign(orderIds.at(row), &error)) { QMessageBox::warning(this, "生成工件失败", error); - emit logRequested("鎿嶄綔鏃ュ織", "璁㈠崟绠$悊", "生成工件", error, "澶辫触"); + emit logRequested("操作日志", "订单管理", "生成工件", error, "失败"); return; } loadOrders(); - emit logRequested("鎿嶄綔鏃ュ織", "璁㈠崟绠$悊", "生成工件", - "生成并分配订单 " + orderNo + " 的工件", "鎴愬姛"); + emit logRequested("操作日志", "订单管理", "生成工件", + "生成并分配订单 " + orderNo + " 的工件", "成功"); } void OrderPage::deleteSelectedOrder() diff --git a/pages/orderpage.h b/pages/orderpage.h index d4b4e53..d1aa9c5 100644 --- a/pages/orderpage.h +++ b/pages/orderpage.h @@ -23,6 +23,7 @@ signals: private: void loadOrders(); void fillOrderTable(const QList &orders); + void updateSelectedOrderDetail(); void createOrder(); void generateSelectedWorkpieces(); void deleteSelectedOrder(); diff --git a/pages/orderpage.ui b/pages/orderpage.ui index 62beaae..d6768db 100644 --- a/pages/orderpage.ui +++ b/pages/orderpage.ui @@ -10,7 +10,7 @@ 订单编号: - ORD-20260808-001 + 输入订单编号 状态: 全部 新建订单 @@ -24,10 +24,10 @@ 订单详情 - 当前订单:ORD-20260808-001 - 当前进度:3 / 294 - 当前工序:正面检测 - 说明:第一版仅展示页面,不保存数据 + 当前订单:- + 当前进度:0 / 0 + 当前工序:- + 说明:请选择订单 diff --git a/services/deviceservice.cpp b/services/deviceservice.cpp index 682c72c..0b74ddc 100644 --- a/services/deviceservice.cpp +++ b/services/deviceservice.cpp @@ -138,19 +138,28 @@ void DeviceService::requestStatus(const StatusCallback &callback) } void DeviceService::finishStatusRequest(bool success, - const DeviceStatus &status, - const QString &error) + const DeviceStatus &status, + const QString &error) { + DeviceStatus finalStatus = status; + finalStatus.statusValid = success; + if (success) { + finalStatus.safetyDoorClosed = finalStatus.safetyDoorClosed + && finalStatus.safetyDoor1Closed + && finalStatus.safetyDoor2Closed + && finalStatus.safetyDoor3Closed; + } + m_statusRequestPending = false; const QList callbacks = m_statusCallbacks; m_statusCallbacks.clear(); - emit statusChanged(status); + emit statusChanged(finalStatus); if (!success && !error.isEmpty()) { emit communicationError(error); } for (const StatusCallback &callback : callbacks) { if (callback) { - callback(success, status, error); + callback(success, finalStatus, error); } } } @@ -159,7 +168,7 @@ void DeviceService::readStatusStep(int index, const DeviceStatus &status) { const bool useErrorCode = ConfigManager::instance().productionConfig().usePlcErrorCode; - if (index >= (useErrorCode ? 7 : 6)) { + if (index >= (useErrorCode ? 15 : 14)) { finishStatusRequest(true, status, QString()); return; } @@ -185,9 +194,17 @@ void DeviceService::readStatusStep(int index, const DeviceStatus &status) case 1: nextStatus.robotReady = value != 0; break; case 2: nextStatus.safetyDoorClosed = value != 0; break; case 3: nextStatus.emergencyStop = value != 0; break; - case 4: nextStatus.currentStep = value; break; - case 5: nextStatus.checkResult = value; break; - case 6: nextStatus.errorCode = value; break; + case 4: nextStatus.inspectionMachineReady = value != 0; break; + case 5: nextStatus.visionReady = value != 0; break; + case 6: nextStatus.robotControlCabinetReady = value != 0; break; + case 7: nextStatus.mainControlCabinetReady = value != 0; break; + case 8: nextStatus.safetyDoor1Closed = value != 0; break; + case 9: nextStatus.safetyDoor2Closed = value != 0; break; + case 10: nextStatus.safetyDoor3Closed = value != 0; break; + case 11: nextStatus.activeAlarm = value != 0; break; + case 12: nextStatus.currentStep = value; break; + case 13: nextStatus.checkResult = value; break; + case 14: nextStatus.errorCode = value; break; default: break; } readStatusStep(index + 1, nextStatus); @@ -220,14 +237,64 @@ void DeviceService::readStatusStep(int index, const DeviceStatus &status) }); break; case 4: - m_modbus->readHoldingRegister(addresses.currentStep, next); + m_modbus->readCoil(addresses.inspectionMachineReady, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); break; case 5: - m_modbus->readHoldingRegister(addresses.checkResult, next); + m_modbus->readCoil(addresses.visionReady, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); break; case 6: + m_modbus->readCoil(addresses.robotControlCabinetReady, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); + break; + case 7: + m_modbus->readCoil(addresses.mainControlCabinetReady, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); + break; + case 8: + m_modbus->readCoil(addresses.safetyDoor1Closed, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); + break; + case 9: + m_modbus->readCoil(addresses.safetyDoor2Closed, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); + break; + case 10: + m_modbus->readCoil(addresses.safetyDoor3Closed, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); + break; + case 11: + m_modbus->readCoil(addresses.activeAlarm, + [next](bool ok, bool value, const QString &error) { + next(ok, value ? 1 : 0, error); + }); + break; + case 12: + m_modbus->readHoldingRegister(addresses.currentStep, next); + break; + case 13: + m_modbus->readHoldingRegister(addresses.checkResult, next); + break; + case 14: if (useErrorCode) { m_modbus->readHoldingRegister(addresses.errorCode, next); + } else { + finishStatusRequest(true, status, QString()); } break; } @@ -250,11 +317,20 @@ void DeviceService::pollStatus() DeviceStatus DeviceService::simulatedStatus() const { DeviceStatus status; + status.statusValid = true; status.plcConnected = true; status.plcReady = true; status.robotReady = true; status.safetyDoorClosed = true; status.emergencyStop = false; + status.inspectionMachineReady = true; + status.visionReady = true; + status.robotControlCabinetReady = true; + status.mainControlCabinetReady = true; + status.safetyDoor1Closed = true; + status.safetyDoor2Closed = true; + status.safetyDoor3Closed = true; + status.activeAlarm = false; status.currentStep = 0; status.checkResult = 0; return status; diff --git a/services/deviceservice.h b/services/deviceservice.h index a2961e3..7c414f4 100644 --- a/services/deviceservice.h +++ b/services/deviceservice.h @@ -10,11 +10,20 @@ struct DeviceStatus { + bool statusValid = false; bool plcConnected = false; bool plcReady = false; bool robotReady = false; bool safetyDoorClosed = false; bool emergencyStop = false; + bool inspectionMachineReady = false; + bool visionReady = false; + bool robotControlCabinetReady = false; + bool mainControlCabinetReady = false; + bool safetyDoor1Closed = false; + bool safetyDoor2Closed = false; + bool safetyDoor3Closed = false; + bool activeAlarm = false; quint16 currentStep = 0; quint16 checkResult = 0; quint16 errorCode = 0; diff --git a/services/productionservice.cpp b/services/productionservice.cpp index 63fa567..356d386 100644 --- a/services/productionservice.cpp +++ b/services/productionservice.cpp @@ -1874,16 +1874,27 @@ bool ProductionService::stopRequested() const void ProductionService::onDeviceStatusChanged(const DeviceStatus &status) { const bool changed = !m_deviceStatusValid + || status.statusValid != m_deviceStatus.statusValid || status.plcConnected != m_deviceStatus.plcConnected || status.plcReady != m_deviceStatus.plcReady || status.robotReady != m_deviceStatus.robotReady || status.safetyDoorClosed != m_deviceStatus.safetyDoorClosed || status.emergencyStop != m_deviceStatus.emergencyStop + || status.inspectionMachineReady != m_deviceStatus.inspectionMachineReady + || status.visionReady != m_deviceStatus.visionReady + || status.robotControlCabinetReady + != m_deviceStatus.robotControlCabinetReady + || status.mainControlCabinetReady + != m_deviceStatus.mainControlCabinetReady + || status.safetyDoor1Closed != m_deviceStatus.safetyDoor1Closed + || status.safetyDoor2Closed != m_deviceStatus.safetyDoor2Closed + || status.safetyDoor3Closed != m_deviceStatus.safetyDoor3Closed + || status.activeAlarm != m_deviceStatus.activeAlarm || status.currentStep != m_deviceStatus.currentStep || status.checkResult != m_deviceStatus.checkResult || status.errorCode != m_deviceStatus.errorCode; m_deviceStatus = status; - m_deviceStatusValid = true; + m_deviceStatusValid = status.statusValid; emit deviceStatusChanged(status); if (changed) { persistDeviceStatus(status); diff --git a/ssp.pro.user b/ssp.pro.user index cb5648e..7365e90 100644 --- a/ssp.pro.user +++ b/ssp.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/widget.cpp b/widget.cpp index 8ab9433..b485eeb 100644 --- a/widget.cpp +++ b/widget.cpp @@ -28,6 +28,9 @@ Widget::Widget(QWidget *parent) , currentOrderLabel(nullptr) , currentWorkpieceLabel(nullptr) , currentStepLabel(nullptr) + , plcStatusLabel(nullptr) + , robotStatusLabel(nullptr) + , safetyStatusLabel(nullptr) { ui->setupUi(this); setWindowTitle("小轴多参数上下料单元管控系统"); @@ -41,7 +44,7 @@ Widget::Widget(QWidget *parent) setupTopBar(rootLayout); setupMainArea(rootLayout); - appendLog("生产日志", "系统", "启动", "页面原型已启动,当前为模拟模式", "成功"); + appendLog("生产日志", "系统", "启动", "生产控制系统已启动", "成功"); } Widget::~Widget() @@ -80,18 +83,21 @@ void Widget::setupTopBar(QVBoxLayout *rootLayout) topLayout->addWidget(new QLabel("小轴单元")); systemStateLabel = UiHelpers::makeBadge("系统:待机", "#607d8b"); - currentOrderLabel = UiHelpers::makeBadge("订单:ORD-20260808-001", "#455a64"); - currentWorkpieceLabel = UiHelpers::makeBadge("工件:WP-0001", "#455a64"); - currentStepLabel = UiHelpers::makeBadge("工序:待取料", "#00897b"); + currentOrderLabel = UiHelpers::makeBadge("订单:-", "#455a64"); + currentWorkpieceLabel = UiHelpers::makeBadge("工件:-", "#455a64"); + currentStepLabel = UiHelpers::makeBadge("工序:未采集", "#607d8b"); topLayout->addWidget(systemStateLabel); topLayout->addWidget(currentOrderLabel); topLayout->addWidget(currentWorkpieceLabel); topLayout->addWidget(currentStepLabel); topLayout->addStretch(); - topLayout->addWidget(UiHelpers::makeBadge("PLC:模拟", "#795548")); - topLayout->addWidget(UiHelpers::makeBadge("机器人:模拟", "#795548")); - topLayout->addWidget(UiHelpers::makeBadge("安全门:关闭", "#2e7d32")); + plcStatusLabel = UiHelpers::makeBadge("PLC:未采集", "#607d8b"); + robotStatusLabel = UiHelpers::makeBadge("机器人:未采集", "#607d8b"); + safetyStatusLabel = UiHelpers::makeBadge("安全回路:未采集", "#607d8b"); + topLayout->addWidget(plcStatusLabel); + topLayout->addWidget(robotStatusLabel); + topLayout->addWidget(safetyStatusLabel); rootLayout->addWidget(topBar); } @@ -131,8 +137,28 @@ void Widget::setupMainArea(QVBoxLayout *rootLayout) connect(dashboardPage, &DashboardPage::currentStepChanged, this, [this](const QString &step) { currentStepLabel->setText("工序:" + step); }); + connect(dashboardPage, &DashboardPage::currentOrderChanged, + this, [this](const QString &orderNo) { + currentOrderLabel->setText("订单:" + orderNo); + }); + connect(dashboardPage, &DashboardPage::currentWorkpieceChanged, + this, [this](const QString &workpiece) { + currentWorkpieceLabel->setText("工件:" + workpiece); + }); connect(dashboardPage, &DashboardPage::deviceStatusChanged, devicePage, &DevicePage::updateStatus); + connect(dashboardPage, &DashboardPage::deviceStatusChanged, + this, [this](const DeviceStatus &status) { + const QString plc = !status.statusValid ? "未采集" + : status.plcConnected ? "在线" : "离线"; + const QString robot = !status.statusValid ? "未采集" + : status.robotReady ? "就绪" : "未就绪"; + const QString safety = !status.statusValid ? "未采集" + : status.safetyDoorClosed && !status.emergencyStop ? "正常" : "异常"; + plcStatusLabel->setText("PLC:" + plc); + robotStatusLabel->setText("机器人:" + robot); + safetyStatusLabel->setText("安全回路:" + safety); + }); connect(dashboardPage, &DashboardPage::deviceCommunicationError, devicePage, &DevicePage::handleCommunicationError); connect(dashboardPage, &DashboardPage::logRequested, this, &Widget::appendLog); diff --git a/widget.h b/widget.h index 0a8737c..6bd6e8e 100644 --- a/widget.h +++ b/widget.h @@ -38,6 +38,9 @@ private: QLabel *currentOrderLabel; QLabel *currentWorkpieceLabel; QLabel *currentStepLabel; + QLabel *plcStatusLabel; + QLabel *robotStatusLabel; + QLabel *safetyStatusLabel; }; #endif // WIDGET_H