diff --git a/config/configmanager.cpp b/config/configmanager.cpp index 892307f..acd27a0 100644 --- a/config/configmanager.cpp +++ b/config/configmanager.cpp @@ -146,6 +146,10 @@ bool ConfigManager::load(const QString &filePath) settings.value("modbus/trayNumber", addresses.trayNumber).toInt(); addresses.slotNumber = settings.value("modbus/slotNumber", addresses.slotNumber).toInt(); + addresses.slotRowNumber = + settings.value("modbus/slotRowNumber", addresses.slotRowNumber).toInt(); + addresses.slotColumNumber = + settings.value("modbus/slotColumNumber", addresses.slotColumNumber).toInt(); m_productionConfig.loadStep = settings.value("production/loadStep", m_productionConfig.loadStep).toInt(); diff --git a/modbus/modbusaddress.cpp b/modbus/modbusaddress.cpp index db19c8b..0f07f3c 100644 --- a/modbus/modbusaddress.cpp +++ b/modbus/modbusaddress.cpp @@ -8,7 +8,7 @@ namespace { bool isValidAddress(int address) { - return address >= 0; + return address >= 0 && address <= 65535; } } @@ -52,7 +52,9 @@ bool ModbusAddressMap::isValid(QString *error) const << qMakePair(QString("checkResult"), checkResult) << qMakePair(QString("errorCode"), errorCode) << qMakePair(QString("trayNumber"), trayNumber) - << qMakePair(QString("slotNumber"), slotNumber); + << qMakePair(QString("slotNumber"), slotNumber) + << qMakePair(QString("slotRowNumber"), slotRowNumber) + << qMakePair(QString("slotColumNumber"), slotColumNumber); const QList > addressGroups[] = { coilAddresses, holdingRegisterAddresses diff --git a/modbus/modbusaddress.h b/modbus/modbusaddress.h index 44b0edc..8bb54e2 100644 --- a/modbus/modbusaddress.h +++ b/modbus/modbusaddress.h @@ -46,8 +46,10 @@ struct ModbusAddressMap int rackPlaceFeedback = 808; int inspectionMode = 814; - int trayNumber = 802; + int trayNumber = 801; int slotNumber = 800; + int slotRowNumber = 802; + int slotColumNumber = 803; bool isValid(QString *error = nullptr) const; }; diff --git a/pages/dashboardpage.cpp b/pages/dashboardpage.cpp index 1427a62..ca0da3e 100644 --- a/pages/dashboardpage.cpp +++ b/pages/dashboardpage.cpp @@ -197,7 +197,7 @@ DashboardPage::DashboardPage(QWidget *parent) ui->buttonLayout->insertWidget(ui->buttonLayout->indexOf(ui->recoveryButton), markNgButton); stopButton->setObjectName("stopButton"); - stopButton->setVisible(false); + stopButton->setVisible(true); ui->buttonLayout->insertWidget(6, stopButton); deviceStatusLabel->setStyleSheet("color: #546e7a;"); ui->taskLayout->insertWidget(0, deviceStatusLabel); @@ -425,6 +425,7 @@ void DashboardPage::startProduction() if (recoveryBusy || visionRecoveryRequired) return; if (productionState == ProductionService::Paused) { if (!currentOrderResumable) return; + if (!confirmControlOperation("继续订单", "安全检查通过后,从保存的动作边界继续此暂停订单。")) return; ui->startButton->setEnabled(false); QMetaObject::invokeMethod(productionWorker, "requestResume", Qt::QueuedConnection); @@ -442,6 +443,7 @@ void DashboardPage::startProduction() return; } + if (!confirmControlOperation("启动订单", "设备检查通过后,启动此订单并执行下述首件工件。")) return; ui->startButton->setEnabled(false); if (!QMetaObject::invokeMethod( productionWorker, "requestStart", Qt::QueuedConnection, @@ -454,26 +456,123 @@ void DashboardPage::startProduction() void DashboardPage::pauseProduction() { + if (!ui->pauseButton->isEnabled() + || !confirmControlOperation("暂停订单", "机器人当前独立动作完成及握手结束后暂停;未提交的视觉请求作废。")) return; QMetaObject::invokeMethod(productionWorker, "requestPause", Qt::QueuedConnection); } void DashboardPage::stopProduction() { - productionWorker->requestStopImmediate(); + if (!stopButton->isEnabled() + || !confirmControlOperation("终止订单", "将当前订单标记为已完成,保留实际加工数量及记录,剩余工件不再执行。此操作不是机器人急停。")) return; if (recoveryDialog) recoveryDialog->reject(); - QMetaObject::invokeMethod(productionWorker, "requestStop", - Qt::QueuedConnection); + QMetaObject::invokeMethod(productionWorker, "requestStopOrder", + Qt::QueuedConnection, Q_ARG(int, currentOrderId)); } void DashboardPage::clearAlarm() { + if (!ui->clearAlarmButton->isEnabled() + || !confirmControlOperation("清除报警", "向 PLC 写清报警命令;成功后清除 ssp 活动报警记录,不恢复生产。")) return; QMetaObject::invokeMethod(productionWorker, "requestClearAlarm", Qt::QueuedConnection); emit logRequested("报警日志", "控制面板", "清除报警", "已请求 PLC 清除报警", "待处理"); } +QString DashboardPage::controlOperationContext(QString *identity) const +{ + QString error; + Order order; + ProductionRunSnapshot run; + if (currentOrderId > 0 + && !OrderService::instance().findOrder(currentOrderId, &order, &error)) return QString(); + if (!ProductionRepository().findActiveRun(&run, &error)) return QString(); + if (run.id > 0 && run.orderId != currentOrderId) return QString(); + + Workpiece piece; + if (run.currentWorkpieceId > 0) { + if (!WorkpieceService::instance().findWorkpiece(run.currentWorkpieceId, &piece, &error) + || piece.orderId != currentOrderId) return QString(); + } else if (order.id > 0) { + const QList pieces = WorkpieceService::instance().listByOrder(order.id, &error); + if (!error.isEmpty()) return QString(); + for (const Workpiece &candidate : pieces) { + if (candidate.state == "PENDING") { piece = candidate; break; } + } + } + int trayNo = 0; + if (piece.trayId > 0) { + const QList trays = TrayService::instance().listTrays(&error); + if (!error.isEmpty()) return QString(); + for (int i = 0; i < trays.size(); ++i) { + if (trays.at(i).id == piece.trayId) { trayNo = i + 1; break; } + } + } + QString step = piece.processStep; + if (run.currentWorkpieceId <= 0 && piece.id > 0) step = "WAITING_DEVICE_READY"; + const QString position = piece.id > 0 + ? QString("工件:%1\n料盘:%2,格位:%3(第 %4 行,第 %5 列)\n工序:%6") + .arg(piece.barcode).arg(trayNo).arg(piece.trayPos) + .arg((piece.trayPos - 1) / 7 + 1).arg((piece.trayPos - 1) % 7 + 1) + .arg(displayProcessStep(step)) + : QString("工件:暂无当前或待加工工件"); + QString text = order.id > 0 + ? QString("订单:%1\n订单状态:%2(%3暂停订单)\n%4") + .arg(order.no, displayOrderStatus(order.status), + order.status == "PAUSED" ? "是" : "不是", position) + : QString("当前没有未完成订单"); + if (run.id > 0) { + text += QString("\n生产状态:%1\n动作记录:%2 / %3\n记录的下一工序:%4") + .arg(displayState(run.productionState), displayRecoveryAction(run.action.type), + displayActionPhase(run.action.phase), displayProcessStep(run.action.nextStep)); + } else if (piece.id > 0) { + text += "\n开始步骤:等待设备就绪 → 移动到拍照位置"; + } + // Exclude elapsed time: only changes affecting the confirmed operation invalidate it. + const QJsonObject snapshot{ + {"order", order.id}, {"status", order.status}, {"run", run.id}, + {"state", int(productionState)}, {"run_state", run.productionState}, + {"piece", piece.id}, {"tray", trayNo}, {"slot", piece.trayPos}, {"step", step}, + {"token", run.action.token}, {"attempt", run.action.attempt}, + {"version", run.action.version}, {"phase", run.action.phase}, + {"next", run.action.nextStep}, {"busy", recoveryBusy}, + {"vision_recovery", visionRecoveryRequired}}; + if (identity) *identity = QString::fromUtf8(QJsonDocument(snapshot).toJson(QJsonDocument::Compact)); + return text; +} + +bool DashboardPage::confirmControlOperation(const QString &title, const QString &effect) +{ + if (controlConfirmationOpen) return false; + QString identity; + const QString context = controlOperationContext(&identity); + if (context.isEmpty()) { + QMessageBox::warning(this, title, "无法读取一致的订单和动作记录,请刷新状态后再操作。"); + return false; + } + controlConfirmationOpen = true; + QMessageBox question(QMessageBox::Question, title, + context + "\n\n" + effect + "\n\n是否执行本步操作?", + QMessageBox::Yes | QMessageBox::No, this); + question.setObjectName("controlConfirmation"); + question.setTextFormat(Qt::PlainText); + question.button(QMessageBox::Yes)->setText("执行"); + question.button(QMessageBox::No)->setText("取消"); + question.setDefaultButton(QMessageBox::No); + question.setEscapeButton(QMessageBox::No); + const int answer = question.exec(); + controlConfirmationOpen = false; + if (answer != QMessageBox::Yes) return false; + QString currentIdentity; + if (controlOperationContext(¤tIdentity).isEmpty() || currentIdentity != identity) { + QMessageBox::information(this, title, "订单、工件或动作状态已经变化,本次操作未执行,请重新确认。"); + return false; + } + return true; +} + void DashboardPage::onProductionStateChanged(ProductionService::State state, const QString &name) { @@ -569,6 +668,7 @@ void DashboardPage::onRecoveryCompleted(const QString &mode) void DashboardPage::recoverProduction() { if (recoveryBusy || !ui->recoveryButton->isEnabled()) return; + if (!confirmControlOperation("恢复/重试", "先读取设备及动作记录,检查能否安全恢复;状态不明确时再由人工选择。本次确认不保证立即继续生产。")) return; onRecoveryBusyChanged(true); ui->actionLabel->setText("正在检查设备状态和动作记录..."); if (!QMetaObject::invokeMethod(productionWorker, "requestRecover", @@ -736,13 +836,15 @@ void DashboardPage::updateRecoveryButtons() ui->recoveryButton->setVisible(true); ui->recoveryButton->setEnabled(recoveryRequired && !terminating && !recoveryBusy); ui->recoveryButton->setText(recoveryBusy ? "恢复检查中..." : "恢复/重试"); - ui->pauseButton->setEnabled(!recoveryBusy && !terminating); + ui->pauseButton->setEnabled(running && !recoveryRequired + && state != ProductionService::Paused + && !recoveryBusy && !terminating); ui->clearAlarmButton->setEnabled(!recoveryBusy && !terminating); markNgButton->setVisible(recoveryRequired && productionWorkpiece.id > 0 && !visionRecoveryRequired); markNgButton->setEnabled(!recoveryBusy && !terminating); - stopButton->setVisible(running); - stopButton->setEnabled(!terminating); + stopButton->setVisible(true); + stopButton->setEnabled(currentOrderId > 0 && !terminating); stopButton->setText(terminating ? "终止中..." : "终止"); } @@ -967,7 +1069,12 @@ void DashboardPage::loadCurrentOrder() { QString error; Order order; - if (!OrderService::instance().findUnfinishedOrder(&order, &error)) { + ProductionRunSnapshot run; + const bool loaded = ProductionRepository().findActiveRun(&run, &error) + && (run.id > 0 + ? OrderService::instance().findOrder(run.orderId, &order, &error) + : OrderService::instance().findUnfinishedOrder(&order, &error)); + if (!loaded) { currentOrderId = 0; currentOrderStartable = false; currentOrderResumable = false; diff --git a/pages/dashboardpage.h b/pages/dashboardpage.h index 9c61461..5ae90c4 100644 --- a/pages/dashboardpage.h +++ b/pages/dashboardpage.h @@ -73,6 +73,8 @@ private: void updateRackSummary(); void updateRackSize(); void updateRecoveryButtons(); + QString controlOperationContext(QString *identity) const; + bool confirmControlOperation(const QString &title, const QString &effect); void refreshProcessRecords(); void updateCurrentProcessDuration(int elapsedMs); static QString formatDuration(int elapsedMs); @@ -109,6 +111,7 @@ private: int productionSlotNo; bool visionRecoveryRequired = false; bool recoveryBusy = false; + bool controlConfirmationOpen = false; QPointer recoveryDialog; }; diff --git a/services/deviceservice.cpp b/services/deviceservice.cpp index 708e452..b1490c7 100644 --- a/services/deviceservice.cpp +++ b/services/deviceservice.cpp @@ -551,7 +551,7 @@ void DeviceService::beginProductionAction( } return; } - if (trayNo <= 0 || slotNo < 1 || slotNo > 49) { + if (trayNo <= 0 || trayNo > 65535 || slotNo < 1 || slotNo > 49) { if (callback) { callback(VisionWriteOutcome::NotSent, "PLC tray or slot position is invalid"); } @@ -628,7 +628,27 @@ void DeviceService::beginProductionAction( m_modbus->writeHoldingRegister( addresses.slotNumber, static_cast(slotNo), - writeCommand); + [this, addresses, slotNo, writeCommand]( + bool slotSuccess, const QString &slotError) { + if (!slotSuccess) { + writeCommand(false, slotError); + return; + } + m_modbus->writeHoldingRegister( + addresses.slotRowNumber, + static_cast((slotNo - 1) / 7 + 1), + [this, addresses, slotNo, writeCommand]( + bool rowSuccess, const QString &rowError) { + if (!rowSuccess) { + writeCommand(false, rowError); + return; + } + m_modbus->writeHoldingRegister( + addresses.slotColumNumber, + static_cast((slotNo - 1) % 7 + 1), + writeCommand); + }); + }); }); return; } @@ -920,12 +940,28 @@ void DeviceService::moveToPhotoPosition(int trayNo, int slotNo, return; } m_modbus->writeVisionHoldingRegister(addresses.slotNumber, quint16(slotNo), - [this, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) { + [this, addresses, slotNo, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) { if (outcome != VisionWriteOutcome::Confirmed) { if (callback) callback(outcome, error); return; } - writeVisionSignal(PhotoMove, true, callback, beforeSend); + m_modbus->writeVisionHoldingRegister(addresses.slotRowNumber, + quint16((slotNo - 1) / 7 + 1), + [this, addresses, slotNo, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) { + if (outcome != VisionWriteOutcome::Confirmed) { + if (callback) callback(outcome, error); + return; + } + m_modbus->writeVisionHoldingRegister(addresses.slotColumNumber, + quint16((slotNo - 1) % 7 + 1), + [this, callback, beforeSend](VisionWriteOutcome outcome, const QString &error) { + if (outcome != VisionWriteOutcome::Confirmed) { + if (callback) callback(outcome, error); + return; + } + writeVisionSignal(PhotoMove, true, callback, beforeSend); + }, beforeSend); + }, beforeSend); }, beforeSend); }, beforeSend); } diff --git a/services/orderservice.cpp b/services/orderservice.cpp index b120219..9fa3f87 100644 --- a/services/orderservice.cpp +++ b/services/orderservice.cpp @@ -428,6 +428,12 @@ bool OrderService::cancelOrder(int id, QString *error) "CANCELED", "取消订单", error); } +bool OrderService::terminateOrder(int id, QString *error) +{ + return transition(id, QStringList() << "NOT_START" << "RUNNING" << "PAUSED", + "FINISHED", "终止订单(剩余工件不再执行)", error); +} + bool OrderService::deleteOrder(int id, QString *error) { DatabaseManager &database = DatabaseManager::instance(); @@ -501,7 +507,7 @@ bool OrderService::transition(int id, const QStringList &allowedStates, const QDateTime beginTime = targetState == "RUNNING" && !order.beginTime.isValid() ? QDateTime::currentDateTime() : order.beginTime; - const QDateTime endTime = targetState == "CANCELED" + const QDateTime endTime = (targetState == "CANCELED" || targetState == "FINISHED") ? QDateTime::currentDateTime() : order.endTime; if (!repository.updateOrderLifecycle(id, targetState, beginTime, endTime, &transactionError) diff --git a/services/orderservice.h b/services/orderservice.h index 024263a..d89ef9d 100644 --- a/services/orderservice.h +++ b/services/orderservice.h @@ -19,6 +19,7 @@ public: bool pauseOrder(int id, QString *error = nullptr); bool resumeOrder(int id, QString *error = nullptr); bool completeOrder(int id, QString *error = nullptr); + bool terminateOrder(int id, QString *error = nullptr); bool cancelOrder(int id, QString *error = nullptr); bool deleteOrder(int id, QString *error = nullptr); diff --git a/services/productionservice.cpp b/services/productionservice.cpp index 5478ffe..20984dc 100644 --- a/services/productionservice.cpp +++ b/services/productionservice.cpp @@ -786,7 +786,34 @@ bool ProductionService::resume(QString *error) return true; } -bool ProductionService::stop(QString *error) +bool ProductionService::stopOrder(int orderId, QString *error) +{ + if (orderId <= 0) { + if (error) *error = "没有可终止的订单"; + return false; + } + if (m_state != Idle && m_state != Completed) { + if (orderId != m_orderId) { + if (error) *error = "当前生产订单已改变,请重新确认终止"; + return false; + } + requestStopImmediate(); + return stop(error, true); + } + ProductionRunSnapshot run; + Order order; + if (!ProductionRepository().findActiveRun(&run, error) + || !OrderService::instance().findOrder(orderId, &order, error)) return false; + if (run.id > 0 || order.status != "NOT_START") { + if (error) *error = "订单存在待恢复的生产记录或状态已改变,请先核对再终止"; + return false; + } + if (!OrderService::instance().terminateOrder(orderId, error)) return false; + emit stateChanged(m_state, stateName()); + return true; +} + +bool ProductionService::stop(QString *error, bool finishOrder) { m_forceNormalPick = false; ++m_actionGeneration; @@ -827,7 +854,7 @@ bool ProductionService::stop(QString *error) }; m_deviceService->terminate( - [this, failTermination](bool cleaned, const QString &cleanupError) { + [this, failTermination, finishOrder](bool cleaned, const QString &cleanupError) { if (!cleaned) { failTermination(cleanupError); return; @@ -840,14 +867,20 @@ bool ProductionService::stop(QString *error) failTermination(orderError); return; } - if (order.status == "RUNNING" + if (finishOrder && order.status != "FINISHED" + && !OrderService::instance().terminateOrder(m_orderId, &orderError)) { + failTermination(orderError); + return; + } + if (!finishOrder && order.status == "RUNNING" && !OrderService::instance().pauseOrder( m_orderId, &orderError)) { failTermination(orderError); return; } - if ((order.status == "RUNNING" || order.status == "PAUSED") + if (!finishOrder && (order.status == "NOT_START" + || order.status == "RUNNING" || order.status == "PAUSED") && !OrderService::instance().cancelOrder( m_orderId, &orderError)) { failTermination(orderError); diff --git a/services/productionservice.h b/services/productionservice.h index 212d3cf..bc77374 100644 --- a/services/productionservice.h +++ b/services/productionservice.h @@ -62,7 +62,8 @@ public: bool start(int orderId, QString *error = nullptr); bool pause(QString *error = nullptr); bool resume(QString *error = nullptr); - bool stop(QString *error = nullptr); + bool stop(QString *error = nullptr, bool finishOrder = false); + bool stopOrder(int orderId, QString *error = nullptr); bool clearAlarm(QString *error = nullptr); bool recover(QString *error = nullptr); bool submitRecoveryDecision(const QJsonObject &decision, QString *error = nullptr); diff --git a/services/productionworker.cpp b/services/productionworker.cpp index 10fec3e..ef4cc8b 100644 --- a/services/productionworker.cpp +++ b/services/productionworker.cpp @@ -109,6 +109,13 @@ void ProductionWorker::requestStop() reportFailure(m_service->stop(&error), error); } +void ProductionWorker::requestStopOrder(int orderId) +{ + ensureService(); + QString error; + reportFailure(m_service->stopOrder(orderId, &error), error); +} + void ProductionWorker::requestClearAlarm() { ensureService(); diff --git a/services/productionworker.h b/services/productionworker.h index 26721db..d21a0b5 100644 --- a/services/productionworker.h +++ b/services/productionworker.h @@ -19,6 +19,7 @@ public slots: void requestPause(); void requestResume(); void requestStop(); + void requestStopOrder(int orderId); void requestClearAlarm(); void requestRecover(); void requestRecoveryDecision(const QJsonObject &decision); diff --git a/ssp.pro.user b/ssp.pro.user index e90fab3..4fb54df 100644 --- a/ssp.pro.user +++ b/ssp.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId