feat(production): 修改订单流程卡死流程问题

This commit is contained in:
lidg
2026-11-06 15:49:33 +08:00
parent 753f9c3ed2
commit 81313e61b0
24 changed files with 949 additions and 261 deletions
+9 -3
View File
@@ -5,6 +5,7 @@ ProductionWorker::ProductionWorker(QObject *parent)
, m_service(nullptr)
, m_stopRequested(false)
{
qRegisterMetaType<ProductionService::Snapshot>("ProductionService::Snapshot");
}
void ProductionWorker::ensureService()
@@ -14,6 +15,8 @@ void ProductionWorker::ensureService()
}
m_service = new ProductionService(this);
connect(m_service, &ProductionService::snapshotChanged,
this, &ProductionWorker::snapshotChanged);
m_service->setExternalStopFlag(&m_stopRequested);
connect(m_service, &ProductionService::visionMeasureRequested, this, &ProductionWorker::visionMeasureRequested);
connect(m_service, &ProductionService::visionCancelRequested, this, &ProductionWorker::visionCancelRequested);
@@ -109,11 +112,11 @@ void ProductionWorker::requestStop()
reportFailure(m_service->stop(&error), error);
}
void ProductionWorker::requestStopOrder(int orderId)
void ProductionWorker::requestStopOrder(int runId, int orderId)
{
ensureService();
QString error;
reportFailure(m_service->stopOrder(orderId, &error), error);
reportFailure(m_service->stopConfirmedOrder(runId, orderId, &error), error);
}
void ProductionWorker::requestClearAlarm()
@@ -127,7 +130,9 @@ void ProductionWorker::requestRecover()
{
ensureService();
QString error;
reportFailure(m_service->recover(&error), error);
const bool success = m_service->snapshot().initialized
? m_service->recover(&error) : m_service->restoreActiveRun(&error);
reportFailure(success, error);
}
void ProductionWorker::requestRecoveryDecision(const QJsonObject &decision)
@@ -149,6 +154,7 @@ void ProductionWorker::requestRestore()
ensureService();
QString error;
reportFailure(m_service->restoreActiveRun(&error), error);
emit recoveryBusyChanged(false);
}
void ProductionWorker::requestShutdown()