feat(production): 持久化动作检查点并完善恢复重试流程
- production_runs 新增动作阶段、尝试次数、版本及人工确认字段 - 提供兼容 PostgreSQL 9.5 的幂等升级脚本和数据库结构检查 - 工序推进、动作完成检查点和审计记录使用同一事务 - 机器人命令单次发送,完成反馈先持久化再清握手 - 已完成动作恢复仅补握手或数据库记录,避免重复执行 - 恢复/重试按钮固定显示在清除报警前,加入明确人工处理选项 - 记录人工决定、操作人及现场核对信息,拒绝过期确认 - 区分普通暂停继续、故障恢复与终止后的视觉锁解除 - 补齐视觉目标跨重启校验、异步失败及迟到回调防护 - 检测结果关联动作和尝试次数,重试清除旧结果缓存
This commit is contained in:
+189
-17
@@ -8,14 +8,20 @@
|
||||
#include "uihelpers.h"
|
||||
#include "../services/visionservice.h"
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonArray>
|
||||
|
||||
#include <QAbstractItemView>
|
||||
#include <QDateTime>
|
||||
#include <QCheckBox>
|
||||
#include <QComboBox>
|
||||
#include <QDialog>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QFormLayout>
|
||||
#include <QGridLayout>
|
||||
#include <QGroupBox>
|
||||
#include <QHeaderView>
|
||||
#include <QLabel>
|
||||
#include <QLineEdit>
|
||||
#include <QMessageBox>
|
||||
#include <QSet>
|
||||
#include <QtGlobal>
|
||||
@@ -66,6 +72,36 @@ QString displayProcessStep(const QString &step)
|
||||
return displayState(step);
|
||||
}
|
||||
|
||||
QString displayRecoveryAction(const QString &action)
|
||||
{
|
||||
if (action == "PHOTO_MOVE") return "移动到拍照位置";
|
||||
if (action == "VISION") return "相机视觉处理";
|
||||
if (action == "RACK_PICK") return "料架取料";
|
||||
if (action == "FRONT_LOAD") return "正面上料";
|
||||
if (action == "INSPECT") return "检测";
|
||||
if (action == "FRONT_UNLOAD") return "正面下料";
|
||||
if (action == "FLIP") return "翻面";
|
||||
if (action == "BACK_LOAD") return "反面上料";
|
||||
if (action == "BACK_UNLOAD") return "反面下料";
|
||||
if (action == "RACK_PLACE") return "料架放料";
|
||||
return action.isEmpty() ? "未知" : action;
|
||||
}
|
||||
|
||||
QString displayActionPhase(const QString &phase)
|
||||
{
|
||||
if (phase == "NOT_SENT") return "命令尚未发送";
|
||||
if (phase == "SENDING") return "命令发送结果待核对";
|
||||
if (phase == "COMMAND_CONFIRMED") return "命令写入已确认";
|
||||
if (phase == "FEEDBACK_RECEIVED") return "已收到完成反馈";
|
||||
if (phase == "SIGNALS_CLEARED") return "完成握手已清零";
|
||||
if (phase == "STEP_COMMITTED") return "下一工序已保存";
|
||||
if (phase == "RESULT_WRITING") return "坐标写入结果待核对";
|
||||
if (phase == "RESULT_CONFIRMED") return "坐标写入已确认";
|
||||
if (phase == "MODE_WRITING") return "取料模式写入结果待核对";
|
||||
if (phase == "MODE_CONFIRMED") return "取料模式写入已确认";
|
||||
return phase.isEmpty() ? "未知" : phase;
|
||||
}
|
||||
|
||||
QString displayProcessStatus(const QString &status)
|
||||
{
|
||||
if (status == "RUNNING") return "执行中";
|
||||
@@ -138,6 +174,7 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
, productionSlotNo(0)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
qRegisterMetaType<QJsonObject>("QJsonObject");
|
||||
|
||||
productionWorker->moveToThread(productionThread);
|
||||
connect(productionThread, &QThread::finished,
|
||||
@@ -154,10 +191,11 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
|
||||
ui->startButton->setObjectName("primaryButton");
|
||||
ui->nextButton->setVisible(false);
|
||||
ui->recoveryButton->setVisible(false);
|
||||
ui->recoveryButton->setEnabled(false);
|
||||
markNgButton->setObjectName("recoveryNgButton");
|
||||
markNgButton->setVisible(false);
|
||||
ui->buttonLayout->insertWidget(4, markNgButton);
|
||||
ui->buttonLayout->insertWidget(ui->buttonLayout->indexOf(ui->recoveryButton),
|
||||
markNgButton);
|
||||
stopButton->setObjectName("stopButton");
|
||||
stopButton->setVisible(false);
|
||||
ui->buttonLayout->insertWidget(6, stopButton);
|
||||
@@ -267,6 +305,13 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
this, &DashboardPage::onTimeoutRecoveryRequired);
|
||||
connect(productionWorker, &ProductionWorker::recoveryCompleted,
|
||||
this, &DashboardPage::onRecoveryCompleted);
|
||||
connect(productionWorker, &ProductionWorker::recoveryDecisionRequired,
|
||||
this, &DashboardPage::onRecoveryDecisionRequired);
|
||||
connect(productionWorker, &ProductionWorker::recoveryBusyChanged,
|
||||
this, &DashboardPage::onRecoveryBusyChanged);
|
||||
connect(this, &DashboardPage::recoveryDecisionSubmitted,
|
||||
productionWorker, &ProductionWorker::requestRecoveryDecision,
|
||||
Qt::QueuedConnection);
|
||||
connect(productionWorker, &ProductionWorker::deviceStatusChanged,
|
||||
this, &DashboardPage::onDeviceStatusChanged);
|
||||
connect(productionWorker, &ProductionWorker::deviceCommunicationError,
|
||||
@@ -291,6 +336,8 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
|
||||
DashboardPage::~DashboardPage()
|
||||
{
|
||||
recoveryBusy = false;
|
||||
if (recoveryDialog) recoveryDialog->reject();
|
||||
if (productionThread->isRunning()) {
|
||||
productionWorker->requestStopImmediate();
|
||||
QMetaObject::invokeMethod(productionWorker, "requestShutdown",
|
||||
@@ -302,7 +349,6 @@ DashboardPage::~DashboardPage()
|
||||
|
||||
void DashboardPage::attachVisionService(VisionService *service)
|
||||
{
|
||||
qRegisterMetaType<QJsonObject>("QJsonObject");
|
||||
connect(productionWorker, &ProductionWorker::visionMeasureRequested,
|
||||
service, &VisionService::measure, Qt::QueuedConnection);
|
||||
connect(productionWorker, &ProductionWorker::visionCancelRequested,
|
||||
@@ -376,6 +422,7 @@ void DashboardPage::updateRackSize()
|
||||
|
||||
void DashboardPage::startProduction()
|
||||
{
|
||||
if (recoveryBusy || visionRecoveryRequired) return;
|
||||
if (productionState == ProductionService::Paused) {
|
||||
if (!currentOrderResumable) return;
|
||||
ui->startButton->setEnabled(false);
|
||||
@@ -414,6 +461,7 @@ void DashboardPage::pauseProduction()
|
||||
void DashboardPage::stopProduction()
|
||||
{
|
||||
productionWorker->requestStopImmediate();
|
||||
if (recoveryDialog) recoveryDialog->reject();
|
||||
QMetaObject::invokeMethod(productionWorker, "requestStop",
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
@@ -430,6 +478,8 @@ void DashboardPage::onProductionStateChanged(ProductionService::State state,
|
||||
const QString &name)
|
||||
{
|
||||
productionState = state;
|
||||
if (state == ProductionService::Terminating && recoveryDialog)
|
||||
recoveryDialog->reject();
|
||||
const QString stateText = displayState(name);
|
||||
ui->actionLabel->setText("生产状态:" + stateText);
|
||||
loadCurrentOrder();
|
||||
@@ -518,19 +568,137 @@ void DashboardPage::onRecoveryCompleted(const QString &mode)
|
||||
|
||||
void DashboardPage::recoverProduction()
|
||||
{
|
||||
if ((productionState == ProductionService::ManualConfirm || visionRecoveryRequired)
|
||||
&& QMessageBox::question(
|
||||
this, "继续生产",
|
||||
visionRecoveryRequired
|
||||
? "请先核对机器人当前位置及本次取料是否已执行或撤销,并确认 M850 移动请求和 M851 到位反馈已复位。恢复不会清除 M852,也不会重发旧坐标。是否已完成现场核对?"
|
||||
: "当前动作是否执行无法自动确认。请核对机器人位置、工件状态及对应命令/反馈信号,确认现场状态安全后再继续。",
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
|
||||
!= QMessageBox::Yes) {
|
||||
return;
|
||||
if (recoveryBusy || !ui->recoveryButton->isEnabled()) return;
|
||||
onRecoveryBusyChanged(true);
|
||||
ui->actionLabel->setText("正在检查设备状态和动作记录...");
|
||||
if (!QMetaObject::invokeMethod(productionWorker, "requestRecover",
|
||||
Qt::QueuedConnection)) {
|
||||
onRecoveryBusyChanged(false);
|
||||
onProductionError("提交恢复检查请求失败");
|
||||
}
|
||||
}
|
||||
|
||||
QMetaObject::invokeMethod(productionWorker, "requestRecover",
|
||||
Qt::QueuedConnection);
|
||||
void DashboardPage::onRecoveryBusyChanged(bool busy)
|
||||
{
|
||||
recoveryBusy = busy;
|
||||
if (!busy && recoveryDialog) recoveryDialog->reject();
|
||||
updateRecoveryButtons();
|
||||
}
|
||||
|
||||
void DashboardPage::onRecoveryDecisionRequired(const QJsonObject &context)
|
||||
{
|
||||
if (!recoveryBusy || recoveryDialog) return;
|
||||
|
||||
QDialog *dialog = new QDialog(this);
|
||||
recoveryDialog = dialog;
|
||||
dialog->setObjectName("recoveryDecisionDialog");
|
||||
dialog->setWindowTitle("恢复/重试 · 人工核对");
|
||||
dialog->setAttribute(Qt::WA_DeleteOnClose);
|
||||
dialog->setWindowModality(Qt::WindowModal);
|
||||
dialog->setMinimumWidth(520);
|
||||
QVBoxLayout *layout = new QVBoxLayout(dialog);
|
||||
const auto signalText = [](const QJsonValue &value) {
|
||||
return value.isBool() ? (value.toBool() ? QString("1") : QString("0"))
|
||||
: QString("未知");
|
||||
};
|
||||
QLabel *details = new QLabel(
|
||||
QString("订单:%1 工件:%2\n工序:%3\n动作:%4 检查点:%5\n"
|
||||
"命令:%6 反馈:%7\n原因:%8")
|
||||
.arg(context.value("order_id").toInt())
|
||||
.arg(context.value("workpiece_id").toInt())
|
||||
.arg(displayProcessStep(context.value("process_step").toString()))
|
||||
.arg(displayRecoveryAction(context.value("action_type").toString()))
|
||||
.arg(displayActionPhase(context.value("action_phase").toString()))
|
||||
.arg(signalText(context.value("command")))
|
||||
.arg(signalText(context.value("feedback")))
|
||||
.arg(context.value("reason").toString()), dialog);
|
||||
details->setTextFormat(Qt::PlainText);
|
||||
details->setWordWrap(true);
|
||||
details->setTextInteractionFlags(Qt::TextSelectableByMouse);
|
||||
layout->addWidget(details);
|
||||
|
||||
QFormLayout *form = new QFormLayout;
|
||||
QComboBox *choice = new QComboBox(dialog);
|
||||
choice->setObjectName("recoveryDecisionChoice");
|
||||
choice->addItem("请选择处理方式", QString());
|
||||
const QJsonArray options = context.value("options").toArray();
|
||||
for (const QJsonValue &option : options) {
|
||||
const QString code = option.toString();
|
||||
QString label;
|
||||
if (code == "ACTION_COMPLETED") label = "确认动作已完成";
|
||||
else if (code == "ACTION_NOT_EXECUTED") label = "确认动作未执行,重新执行";
|
||||
else if (code == "RETRY_VISION") label = "重新视觉识别";
|
||||
else if (code == "NORMAL_PICK") label = "改为普通取料";
|
||||
else if (code == "UNLOCK_VISION") label = "仅解除视觉遗留锁(不恢复订单)";
|
||||
if (!label.isEmpty()) choice->addItem(label, code);
|
||||
}
|
||||
QLineEdit *operatorName = new QLineEdit(dialog);
|
||||
operatorName->setObjectName("recoveryOperatorName");
|
||||
operatorName->setMaxLength(64);
|
||||
operatorName->setPlaceholderText("填写现场核对人的姓名或工号");
|
||||
QLineEdit *note = new QLineEdit(dialog);
|
||||
note->setObjectName("recoveryDecisionNote");
|
||||
note->setMaxLength(512);
|
||||
note->setPlaceholderText("记录机器人位置、工件状态等核对情况");
|
||||
form->addRow("处理方式:", choice);
|
||||
form->addRow("操作人:", operatorName);
|
||||
form->addRow("核对备注:", note);
|
||||
layout->addLayout(form);
|
||||
QCheckBox *confirmed = new QCheckBox("请先选择处理方式,再完成现场核对", dialog);
|
||||
confirmed->setObjectName("recoveryFieldConfirmed");
|
||||
confirmed->setEnabled(false);
|
||||
layout->addWidget(confirmed);
|
||||
QDialogButtonBox *buttons = new QDialogButtonBox(
|
||||
QDialogButtonBox::Ok | QDialogButtonBox::Cancel, dialog);
|
||||
QPushButton *submit = buttons->button(QDialogButtonBox::Ok);
|
||||
submit->setText("提交核对结果");
|
||||
submit->setEnabled(false);
|
||||
submit->setAutoDefault(false);
|
||||
QPushButton *cancel = buttons->button(QDialogButtonBox::Cancel);
|
||||
cancel->setText("暂不处理");
|
||||
cancel->setDefault(true);
|
||||
layout->addWidget(buttons);
|
||||
|
||||
const auto updateSubmit = [choice, operatorName, confirmed, submit]() {
|
||||
submit->setEnabled(!choice->currentData().toString().isEmpty()
|
||||
&& !operatorName->text().trimmed().isEmpty()
|
||||
&& confirmed->isChecked());
|
||||
};
|
||||
connect(choice, QOverload<int>::of(&QComboBox::currentIndexChanged), dialog,
|
||||
[choice, confirmed, updateSubmit](int) {
|
||||
const QString code = choice->currentData().toString();
|
||||
confirmed->setChecked(false);
|
||||
confirmed->setEnabled(!code.isEmpty());
|
||||
if (code == "ACTION_COMPLETED")
|
||||
confirmed->setText("已确认机器人停止、动作已到终点、工件位置正确");
|
||||
else if (code == "ACTION_NOT_EXECUTED")
|
||||
confirmed->setText("已确认机器人停止且在原起点,尚未取放或加工");
|
||||
else if (code == "UNLOCK_VISION")
|
||||
confirmed->setText("已核对机器人停止、取料状态明确,原订单不再继续");
|
||||
else if (!code.isEmpty())
|
||||
confirmed->setText("已确认机器人停止在拍照位,RackPick 尚未开始");
|
||||
else
|
||||
confirmed->setText("请先选择处理方式,再完成现场核对");
|
||||
updateSubmit();
|
||||
});
|
||||
connect(operatorName, &QLineEdit::textChanged, dialog, updateSubmit);
|
||||
connect(confirmed, &QCheckBox::toggled, dialog, updateSubmit);
|
||||
connect(buttons, &QDialogButtonBox::accepted, dialog, &QDialog::accept);
|
||||
connect(buttons, &QDialogButtonBox::rejected, dialog, &QDialog::reject);
|
||||
connect(dialog, &QDialog::finished, this,
|
||||
[this, context, choice, operatorName, note, confirmed](int result) {
|
||||
recoveryDialog = nullptr;
|
||||
if (!recoveryBusy) return;
|
||||
QJsonObject decision = context;
|
||||
decision.insert("decision", result == QDialog::Accepted
|
||||
? choice->currentData().toString() : QString("CANCEL"));
|
||||
decision.insert("operator_name", operatorName->text().trimmed());
|
||||
decision.insert("note", note->text().trimmed());
|
||||
decision.insert("field_confirmed", confirmed->isChecked());
|
||||
emit recoveryDecisionSubmitted(decision);
|
||||
});
|
||||
cancel->setFocus();
|
||||
dialog->open();
|
||||
}
|
||||
|
||||
void DashboardPage::markWorkpieceNg()
|
||||
@@ -561,14 +729,18 @@ void DashboardPage::updateRecoveryButtons()
|
||||
&& currentOrderStartable)
|
||||
|| (state == ProductionService::Paused
|
||||
&& currentOrderResumable))
|
||||
&& !visionRecoveryRequired;
|
||||
&& !visionRecoveryRequired && !recoveryBusy;
|
||||
ui->startButton->setEnabled(canStart);
|
||||
ui->startButton->setText(state == ProductionService::Paused
|
||||
? "继续" : "启动");
|
||||
ui->recoveryButton->setVisible(recoveryRequired);
|
||||
ui->recoveryButton->setEnabled(!terminating);
|
||||
ui->recoveryButton->setVisible(true);
|
||||
ui->recoveryButton->setEnabled(recoveryRequired && !terminating && !recoveryBusy);
|
||||
ui->recoveryButton->setText(recoveryBusy ? "恢复检查中..." : "恢复/重试");
|
||||
ui->pauseButton->setEnabled(!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->setText(terminating ? "终止中..." : "终止");
|
||||
|
||||
Reference in New Issue
Block a user