feat: 重构视觉取料流程及生产故障恢复

- 删除订单启动、暂停、复位相关 PLC 握手及无效反馈配置
- 清除报警改为仅写 clearAlarmCommand,不等待反馈
- 将拍照位移动、视觉处理和 RackPick 拆分为三个独立动作
- 增加 M850/M851 拍照位动作及 R60/M852 视觉结果流程
- 暂停改为等待当前机器人动作完成,视觉结果不确定时转人工确认
- 删除复位按钮,合并为恢复/重试按钮
- 普通 PAUSED 订单通过启动按钮继续
- 恢复前检查 PLC、安全状态、订单及动作命令反馈
- 支持在途动作接管、已完成动作收尾、安全重试和人工确认
- 故障状态保持订单 RUNNING,并持久化实际恢复阶段
- 恢复成功后仅清除本次软件故障对应的报警
- 更新小轴 PLC 地址、Modbus 配置和视觉集成文档
This commit is contained in:
lidg
2026-10-29 17:20:14 +08:00
parent 31454722a0
commit 407af2892d
17 changed files with 839 additions and 929 deletions
-21
View File
@@ -4,7 +4,6 @@ ProductionWorker::ProductionWorker(QObject *parent)
: QObject(parent)
, m_service(nullptr)
, m_stopRequested(false)
, m_pauseRequested(false)
{
}
@@ -16,7 +15,6 @@ void ProductionWorker::ensureService()
m_service = new ProductionService(this);
m_service->setExternalStopFlag(&m_stopRequested);
m_service->setExternalPauseFlag(&m_pauseRequested);
connect(m_service, &ProductionService::visionMeasureRequested, this, &ProductionWorker::visionMeasureRequested);
connect(m_service, &ProductionService::visionCancelRequested, this, &ProductionWorker::visionCancelRequested);
connect(m_service, &ProductionService::visionCycleChanged, this, &ProductionWorker::visionCycleChanged);
@@ -54,11 +52,6 @@ void ProductionWorker::requestStopImmediate()
m_stopRequested.store(true);
}
void ProductionWorker::requestPauseImmediate()
{
m_pauseRequested.store(true);
}
void ProductionWorker::updateVisionAvailability(bool ready, bool busy, const QString &session)
{
ensureService();
@@ -112,13 +105,6 @@ void ProductionWorker::requestStop()
reportFailure(m_service->stop(&error), error);
}
void ProductionWorker::requestReset()
{
ensureService();
QString error;
reportFailure(m_service->reset(&error), error);
}
void ProductionWorker::requestClearAlarm()
{
ensureService();
@@ -133,13 +119,6 @@ void ProductionWorker::requestRecover()
reportFailure(m_service->recover(&error), error);
}
void ProductionWorker::requestRetry()
{
ensureService();
QString error;
reportFailure(m_service->retry(&error), error);
}
void ProductionWorker::requestMarkNg()
{
ensureService();