feat: 重构视觉取料流程及生产故障恢复
- 删除订单启动、暂停、复位相关 PLC 握手及无效反馈配置 - 清除报警改为仅写 clearAlarmCommand,不等待反馈 - 将拍照位移动、视觉处理和 RackPick 拆分为三个独立动作 - 增加 M850/M851 拍照位动作及 R60/M852 视觉结果流程 - 暂停改为等待当前机器人动作完成,视觉结果不确定时转人工确认 - 删除复位按钮,合并为恢复/重试按钮 - 普通 PAUSED 订单通过启动按钮继续 - 恢复前检查 PLC、安全状态、订单及动作命令反馈 - 支持在途动作接管、已完成动作收尾、安全重试和人工确认 - 故障状态保持订单 RUNNING,并持久化实际恢复阶段 - 恢复成功后仅清除本次软件故障对应的报警 - 更新小轴 PLC 地址、Modbus 配置和视觉集成文档
This commit is contained in:
+31
-37
@@ -35,6 +35,8 @@ QString displayState(const QString &state)
|
||||
if (state == "IDLE") return "待机";
|
||||
if (state == "PREPARING") return "准备中";
|
||||
if (state == "WAITING_DEVICE_READY") return "等待设备就绪";
|
||||
if (state == "PHOTO_MOVING") return "移动到拍照位置";
|
||||
if (state == "VISION_PROCESSING") return "相机视觉处理";
|
||||
if (state == "RACK_PICKING") return "料架取料";
|
||||
if (state == "FRONT_LOADING") return "正面上料";
|
||||
if (state == "LOADING") return "上料";
|
||||
@@ -117,8 +119,6 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
, 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))
|
||||
@@ -133,6 +133,7 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
, productionState(ProductionService::Idle)
|
||||
, currentOrderId(0)
|
||||
, currentOrderStartable(false)
|
||||
, currentOrderResumable(false)
|
||||
, productionTrayNo(0)
|
||||
, productionSlotNo(0)
|
||||
{
|
||||
@@ -153,15 +154,10 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
|
||||
ui->startButton->setObjectName("primaryButton");
|
||||
ui->nextButton->setVisible(false);
|
||||
recoverButton->setObjectName("recoveryButton");
|
||||
recoverButton->setVisible(false);
|
||||
ui->buttonLayout->insertWidget(3, recoverButton);
|
||||
retryButton->setObjectName("recoveryRetryButton");
|
||||
retryButton->setVisible(false);
|
||||
ui->buttonLayout->insertWidget(4, retryButton);
|
||||
ui->recoveryButton->setVisible(false);
|
||||
markNgButton->setObjectName("recoveryNgButton");
|
||||
markNgButton->setVisible(false);
|
||||
ui->buttonLayout->insertWidget(5, markNgButton);
|
||||
ui->buttonLayout->insertWidget(4, markNgButton);
|
||||
stopButton->setObjectName("stopButton");
|
||||
stopButton->setVisible(false);
|
||||
ui->buttonLayout->insertWidget(6, stopButton);
|
||||
@@ -247,14 +243,10 @@ DashboardPage::DashboardPage(QWidget *parent)
|
||||
this, &DashboardPage::pauseProduction);
|
||||
connect(stopButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::stopProduction);
|
||||
connect(ui->resetButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::resetProduction);
|
||||
connect(ui->recoveryButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::recoverProduction);
|
||||
connect(ui->clearAlarmButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::clearAlarm);
|
||||
connect(recoverButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::recoverProduction);
|
||||
connect(retryButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::retryRecovery);
|
||||
connect(markNgButton, &QPushButton::clicked,
|
||||
this, &DashboardPage::markWorkpieceNg);
|
||||
connect(productionWorker, &ProductionWorker::stateChanged,
|
||||
@@ -384,6 +376,13 @@ void DashboardPage::updateRackSize()
|
||||
|
||||
void DashboardPage::startProduction()
|
||||
{
|
||||
if (productionState == ProductionService::Paused) {
|
||||
if (!currentOrderResumable) return;
|
||||
ui->startButton->setEnabled(false);
|
||||
QMetaObject::invokeMethod(productionWorker, "requestResume",
|
||||
Qt::QueuedConnection);
|
||||
return;
|
||||
}
|
||||
if (productionState != ProductionService::Idle
|
||||
&& productionState != ProductionService::Completed) {
|
||||
return;
|
||||
@@ -408,7 +407,6 @@ void DashboardPage::startProduction()
|
||||
|
||||
void DashboardPage::pauseProduction()
|
||||
{
|
||||
productionWorker->requestPauseImmediate();
|
||||
QMetaObject::invokeMethod(productionWorker, "requestPause",
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
@@ -420,12 +418,6 @@ void DashboardPage::stopProduction()
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
void DashboardPage::resetProduction()
|
||||
{
|
||||
QMetaObject::invokeMethod(productionWorker, "requestReset",
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
void DashboardPage::clearAlarm()
|
||||
{
|
||||
QMetaObject::invokeMethod(productionWorker, "requestClearAlarm",
|
||||
@@ -531,7 +523,7 @@ void DashboardPage::recoverProduction()
|
||||
this, "继续生产",
|
||||
visionRecoveryRequired
|
||||
? "请先核对机器人当前位置及本次取料是否已执行或撤销,并确认 M850 移动请求和 M851 到位反馈已复位。恢复不会清除 M852,也不会重发旧坐标。是否已完成现场核对?"
|
||||
: "请确认设备和 PLC 当前步骤安全后再继续生产。",
|
||||
: "当前动作是否执行无法自动确认。请核对机器人位置、工件状态及对应命令/反馈信号,确认现场状态安全后再继续。",
|
||||
QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
|
||||
!= QMessageBox::Yes) {
|
||||
return;
|
||||
@@ -541,12 +533,6 @@ void DashboardPage::recoverProduction()
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
void DashboardPage::retryRecovery()
|
||||
{
|
||||
QMetaObject::invokeMethod(productionWorker, "requestRetry",
|
||||
Qt::QueuedConnection);
|
||||
}
|
||||
|
||||
void DashboardPage::markWorkpieceNg()
|
||||
{
|
||||
if (QMessageBox::question(
|
||||
@@ -565,23 +551,27 @@ void DashboardPage::updateRecoveryButtons()
|
||||
{
|
||||
const ProductionService::State state = productionState;
|
||||
const bool recoveryRequired = state == ProductionService::TimeoutPaused
|
||||
|| state == ProductionService::ManualConfirm || visionRecoveryRequired;
|
||||
|| state == ProductionService::ManualConfirm
|
||||
|| state == ProductionService::Error || visionRecoveryRequired;
|
||||
const bool running = state != ProductionService::Idle
|
||||
&& state != ProductionService::Completed;
|
||||
const bool terminating = state == ProductionService::Terminating;
|
||||
const bool canStart = (state == ProductionService::Idle
|
||||
|| state == ProductionService::Completed)
|
||||
&& currentOrderStartable && !visionRecoveryRequired;
|
||||
const bool canStart = (((state == ProductionService::Idle
|
||||
|| state == ProductionService::Completed)
|
||||
&& currentOrderStartable)
|
||||
|| (state == ProductionService::Paused
|
||||
&& currentOrderResumable))
|
||||
&& !visionRecoveryRequired;
|
||||
ui->startButton->setEnabled(canStart);
|
||||
recoverButton->setVisible(recoveryRequired);
|
||||
retryButton->setVisible(recoveryRequired && !visionRecoveryRequired);
|
||||
ui->startButton->setText(state == ProductionService::Paused
|
||||
? "继续" : "启动");
|
||||
ui->recoveryButton->setVisible(recoveryRequired);
|
||||
ui->recoveryButton->setEnabled(!terminating);
|
||||
markNgButton->setVisible(recoveryRequired
|
||||
&& productionWorkpiece.id > 0 && !visionRecoveryRequired);
|
||||
stopButton->setVisible(running);
|
||||
stopButton->setEnabled(!terminating);
|
||||
stopButton->setText(terminating ? "终止中..." : "终止");
|
||||
recoverButton->setText(visionRecoveryRequired ? "核对视觉恢复" : state == ProductionService::ManualConfirm
|
||||
? "继续" : "恢复");
|
||||
}
|
||||
|
||||
QString DashboardPage::formatDuration(int elapsedMs)
|
||||
@@ -808,6 +798,7 @@ void DashboardPage::loadCurrentOrder()
|
||||
if (!OrderService::instance().findUnfinishedOrder(&order, &error)) {
|
||||
currentOrderId = 0;
|
||||
currentOrderStartable = false;
|
||||
currentOrderResumable = false;
|
||||
ui->orderLabel->setText("当前订单:读取失败");
|
||||
updateProductionStats();
|
||||
updateRackSummary();
|
||||
@@ -818,6 +809,7 @@ void DashboardPage::loadCurrentOrder()
|
||||
|
||||
currentOrderId = order.id;
|
||||
currentOrderStartable = false;
|
||||
currentOrderResumable = false;
|
||||
if (order.id <= 0) {
|
||||
ui->orderLabel->setText("当前订单:暂无未完成订单");
|
||||
emit currentOrderChanged("-");
|
||||
@@ -833,6 +825,8 @@ void DashboardPage::loadCurrentOrder()
|
||||
if (workpieceError.isEmpty()) {
|
||||
currentOrderStartable = order.status == "NOT_START"
|
||||
&& !workpieces.isEmpty();
|
||||
currentOrderResumable = order.status == "PAUSED"
|
||||
&& !workpieces.isEmpty();
|
||||
}
|
||||
|
||||
ui->orderLabel->setText(QString("当前订单:%1(%2)")
|
||||
|
||||
Reference in New Issue
Block a user