feat(production): 持久化动作检查点并完善恢复重试流程

- production_runs 新增动作阶段、尝试次数、版本及人工确认字段
- 提供兼容 PostgreSQL 9.5 的幂等升级脚本和数据库结构检查
- 工序推进、动作完成检查点和审计记录使用同一事务
- 机器人命令单次发送,完成反馈先持久化再清握手
- 已完成动作恢复仅补握手或数据库记录,避免重复执行
- 恢复/重试按钮固定显示在清除报警前,加入明确人工处理选项
- 记录人工决定、操作人及现场核对信息,拒绝过期确认
- 区分普通暂停继续、故障恢复与终止后的视觉锁解除
- 补齐视觉目标跨重启校验、异步失败及迟到回调防护
- 检测结果关联动作和尝试次数,重试清除旧结果缓存
This commit is contained in:
lidg
2026-10-29 21:12:15 +08:00
parent df804963e5
commit 4046471c1a
15 changed files with 1763 additions and 659 deletions
+111
View File
@@ -177,6 +177,117 @@ on production_runs(order_id);
create index if not exists ix_production_runs_workpiece_id
on production_runs(current_workpiece_id);
-- Independent action recovery checkpoints (PostgreSQL 9.5 compatible).
-- Keep NULL phases for historical rows: NULL does not mean NOT_SENT.
do $$
declare
target_table regclass := 'production_runs'::regclass;
col record;
begin
for col in
select *
from (values
('action_token', 'varchar(64)'),
('action_type', 'varchar(32)'),
('action_phase', 'varchar(32)'),
('action_next_step', 'varchar(64)'),
('action_attempt', 'integer not null default 0'),
('action_lock_version', 'integer not null default 0'),
('action_command_value', 'boolean'),
('action_feedback_value', 'boolean'),
('manual_decision', 'varchar(32)'),
('manual_operator', 'varchar(64)'),
('manual_decided_at', 'timestamp'),
('action_updated_at', 'timestamp')
) as columns_to_add(column_name, column_type)
loop
if not exists (
select 1 from pg_attribute
where attrelid = target_table
and attname = col.column_name
and attnum > 0 and not attisdropped
) then
execute 'alter table ' || target_table::text ||
' add column ' || quote_ident(col.column_name) ||
' ' || col.column_type;
end if;
end loop;
end;
$$ language plpgsql;
comment on column production_runs.action_token
is '当前独立动作唯一标识;NULL表示尚无持久化动作检查点';
comment on column production_runs.action_type
is '当前独立动作类型';
comment on column production_runs.action_phase
is '当前动作持久化阶段;NULL表示未知,不可直接认定为未发送';
comment on column production_runs.action_next_step
is '当前动作完成后待提交的下一工序';
comment on column production_runs.action_attempt
is '当前动作尝试次数';
comment on column production_runs.action_lock_version
is '动作检查点乐观锁版本号';
comment on column production_runs.action_command_value
is '最近一次成功读取的动作命令值;NULL表示未知,恢复前必须重新读取PLC';
comment on column production_runs.action_feedback_value
is '最近一次成功读取的动作反馈值;NULL表示未知,恢复前必须重新读取PLC';
comment on column production_runs.manual_decision
is '当前动作最近一次人工确认决定;完整历史记录在production_state_history';
comment on column production_runs.manual_operator
is '当前动作最近一次人工确认操作人';
comment on column production_runs.manual_decided_at
is '当前动作最近一次人工确认时间';
comment on column production_runs.action_updated_at
is '当前动作检查点更新时间,由应用程序写入';
do $$
declare
target_table regclass := 'production_runs'::regclass;
begin
if not exists (
select 1 from pg_class i
join pg_class t on t.relnamespace = i.relnamespace
where t.oid = target_table
and i.relname = 'ux_production_runs_action_token'
) then
create unique index ux_production_runs_action_token
on production_runs(action_token)
where action_token is not null;
end if;
end;
$$ language plpgsql;
do $$
declare
target_table regclass := 'production_runs'::regclass;
rule record;
begin
for rule in
select *
from (values
('ck_production_runs_action_type',
'action_type is null or action_type in (''PHOTO_MOVE'', ''VISION'', ''RACK_PICK'', ''FRONT_LOAD'', ''INSPECT'', ''FRONT_UNLOAD'', ''FLIP'', ''BACK_LOAD'', ''BACK_UNLOAD'', ''RACK_PLACE'')'),
('ck_production_runs_action_phase',
'action_phase is null or action_phase in (''NOT_SENT'', ''SENDING'', ''COMMAND_CONFIRMED'', ''FEEDBACK_RECEIVED'', ''SIGNALS_CLEARED'', ''STEP_COMMITTED'', ''RESULT_WRITING'', ''RESULT_CONFIRMED'', ''MODE_WRITING'', ''MODE_CONFIRMED'')'),
('ck_production_runs_manual_decision',
'manual_decision is null or manual_decision in (''ACTION_COMPLETED'', ''ACTION_NOT_EXECUTED'', ''RETRY_VISION'', ''NORMAL_PICK'')'),
('ck_production_runs_action_attempt', 'action_attempt >= 0'),
('ck_production_runs_action_lock_version', 'action_lock_version >= 0')
) as constraints_to_add(constraint_name, check_expression)
loop
if not exists (
select 1 from pg_constraint
where conrelid = target_table
and conname = rule.constraint_name
) then
execute 'alter table ' || target_table::text ||
' add constraint ' || quote_ident(rule.constraint_name) ||
' check (' || rule.check_expression || ')';
end if;
end loop;
end;
$$ language plpgsql;
-- Production state history
create table if not exists production_state_history (
id bigserial primary key,
+189 -17
View File
@@ -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 ? "终止中..." : "终止");
+7
View File
@@ -5,6 +5,7 @@
#include <QWidget>
#include <QVector>
#include <QPointer>
class QTableWidget;
class QGroupBox;
@@ -14,6 +15,7 @@ class QPushButton;
class QTimer;
class QThread;
class VisionService;
class QDialog;
namespace Ui { class DashboardPage; }
@@ -37,6 +39,7 @@ signals:
void deviceCommunicationError(const QString &error);
void visionCycleChanged(const QJsonObject &cycle);
void visionProductionActiveChanged(bool active, bool maintenanceAllowed);
void recoveryDecisionSubmitted(const QJsonObject &decision);
void logRequested(const QString &type, const QString &module, const QString &action,
const QString &content, const QString &status);
@@ -57,6 +60,8 @@ private slots:
void onTimeoutRecoveryRequired(const QString &state, const QString &message);
void onRecoveryCompleted(const QString &mode);
void recoverProduction();
void onRecoveryDecisionRequired(const QJsonObject &context);
void onRecoveryBusyChanged(bool busy);
void markWorkpieceNg();
protected:
@@ -103,6 +108,8 @@ private:
int productionTrayNo;
int productionSlotNo;
bool visionRecoveryRequired = false;
bool recoveryBusy = false;
QPointer<QDialog> recoveryDialog;
};
#endif // DASHBOARDPAGE_H
+1 -1
View File
@@ -116,8 +116,8 @@
<layout class="QHBoxLayout" name="buttonLayout">
<item><widget class="QPushButton" name="startButton"><property name="text"><string>启动</string></property></widget></item>
<item><widget class="QPushButton" name="pauseButton"><property name="text"><string>暂停</string></property></widget></item>
<item><widget class="QPushButton" name="recoveryButton"><property name="text"><string>恢复/重试</string></property></widget></item>
<item><widget class="QPushButton" name="nextButton"><property name="text"><string>下一步</string></property></widget></item>
<item><widget class="QPushButton" name="recoveryButton"><property name="text"><string>恢复/重试</string></property></widget></item>
<item><widget class="QPushButton" name="clearAlarmButton"><property name="text"><string>清除报警</string></property></widget></item>
</layout>
</item>
+212 -8
View File
@@ -5,6 +5,8 @@
#include <QSqlError>
#include <QSqlQuery>
#include <QVariant>
#include <QMap>
#include <QRegularExpression>
namespace {
@@ -145,11 +147,7 @@ bool ProductionRepository::findActiveRun(ProductionRunSnapshot *run, QString *er
}
QSqlQuery query(DatabaseManager::instance().database());
query.prepare("select id, order_id, current_workpiece_id, plan_num, "
"start_tray_no, start_slot_no, inspection_mode, run_state, "
"production_state, process_step, timeout_state, "
"recovery_retry_count, last_error "
"from production_runs "
query.prepare("select * from production_runs "
"where run_state in ('RUNNING', 'PAUSED', 'RECOVERY') "
"order by id desc limit 1");
if (!query.exec()) {
@@ -174,13 +172,218 @@ bool ProductionRepository::findActiveRun(ProductionRunSnapshot *run, QString *er
run->timeoutState = query.value("timeout_state").toString();
run->recoveryRetryCount = query.value("recovery_retry_count").toInt();
run->lastError = query.value("last_error").toString();
run->action.token = query.value("action_token").toString();
run->action.type = query.value("action_type").toString();
run->action.phase = query.value("action_phase").toString();
run->action.nextStep = query.value("action_next_step").toString();
run->action.attempt = query.value("action_attempt").toInt();
run->action.version = query.value("action_lock_version").toInt();
run->action.command = query.value("action_command_value");
run->action.feedback = query.value("action_feedback_value");
run->action.manualDecision = query.value("manual_decision").toString();
run->action.manualOperator = query.value("manual_operator").toString();
run->action.manualDecidedAt = query.value("manual_decided_at").toDateTime();
return true;
}
bool ProductionRepository::findRun(int runId, ProductionRunSnapshot *run, QString *error)
{
if (!run || !ensureOpen(error)) return false;
QSqlQuery query(DatabaseManager::instance().database());
query.prepare("select * from production_runs where id = :id");
query.bindValue(":id", runId);
if (!query.exec()) { setError(query, error); return false; }
if (!query.next()) { if (error) *error = "Production run no longer exists"; return false; }
run->id = query.value("id").toInt();
run->orderId = query.value("order_id").toInt();
run->currentWorkpieceId = query.value("current_workpiece_id").toInt();
run->planNum = query.value("plan_num").toInt();
run->startTrayNo = query.value("start_tray_no").toInt();
run->startSlotNo = query.value("start_slot_no").toInt();
run->inspectionMode = query.value("inspection_mode").toString();
run->runState = query.value("run_state").toString();
run->productionState = query.value("production_state").toString();
run->processStep = query.value("process_step").toString();
run->timeoutState = query.value("timeout_state").toString();
run->recoveryRetryCount = query.value("recovery_retry_count").toInt();
run->lastError = query.value("last_error").toString();
run->action.token = query.value("action_token").toString();
run->action.type = query.value("action_type").toString();
run->action.phase = query.value("action_phase").toString();
run->action.nextStep = query.value("action_next_step").toString();
run->action.attempt = query.value("action_attempt").toInt();
run->action.version = query.value("action_lock_version").toInt();
run->action.command = query.value("action_command_value");
run->action.feedback = query.value("action_feedback_value");
run->action.manualDecision = query.value("manual_decision").toString();
run->action.manualOperator = query.value("manual_operator").toString();
run->action.manualDecidedAt = query.value("manual_decided_at").toDateTime();
return true;
}
bool ProductionRepository::checkActionSchema(QString *error)
{
if (!ensureOpen(error)) return false;
QSqlQuery query(DatabaseManager::instance().database());
query.prepare("select action_token, action_type, action_phase, action_next_step, "
"action_attempt, action_lock_version, action_command_value, action_feedback_value, "
"manual_decision, manual_operator, manual_decided_at, action_updated_at "
"from production_runs where 1 = 0");
if (!query.exec()) {
if (error) *error = "请先执行 db/migrations/2026-10-29-production-action-checkpoints.sql:" + query.lastError().text();
return false;
}
if (DatabaseManager::instance().database().driverName() != "QPSQL") return true;
const QMap<QString, QString> expectedTypes = {
{"action_token", "character varying(64)"},
{"action_type", "character varying(32)"},
{"action_phase", "character varying(32)"},
{"action_next_step", "character varying(64)"},
{"action_attempt", "integer"},
{"action_lock_version", "integer"},
{"action_command_value", "boolean"},
{"action_feedback_value", "boolean"},
{"manual_decision", "character varying(32)"},
{"manual_operator", "character varying(64)"},
{"manual_decided_at", "timestamp without time zone"},
{"action_updated_at", "timestamp without time zone"}
};
query.prepare("select a.attname, format_type(a.atttypid,a.atttypmod), a.attnotnull, "
"pg_get_expr(d.adbin,d.adrelid) from pg_attribute a "
"left join pg_attrdef d on d.adrelid=a.attrelid and d.adnum=a.attnum "
"where a.attrelid='production_runs'::regclass and a.attnum>0 and not a.attisdropped");
if (!query.exec()) { setError(query, error); return false; }
int checked = 0;
while (query.next()) {
const QString name = query.value(0).toString();
if (!expectedTypes.contains(name)) continue;
const bool counter = name == "action_attempt" || name == "action_lock_version";
if (query.value(1).toString() != expectedTypes.value(name)
|| query.value(2).toBool() != counter
|| (counter && query.value(3).toString() != "0")) {
if (error) *error = "动作恢复字段类型、空值或默认值不匹配:" + name;
return false;
}
++checked;
}
if (checked != expectedTypes.size()) {
if (error) *error = "动作恢复数据库字段不完整";
return false;
}
const QMap<QString, QString> expectedChecks = {
{"ck_production_runs_action_type", "CHECK (action_type IS NULL OR action_type = ANY ARRAY['PHOTO_MOVE','VISION','RACK_PICK','FRONT_LOAD','INSPECT','FRONT_UNLOAD','FLIP','BACK_LOAD','BACK_UNLOAD','RACK_PLACE'])"},
{"ck_production_runs_action_phase", "CHECK (action_phase IS NULL OR action_phase = ANY ARRAY['NOT_SENT','SENDING','COMMAND_CONFIRMED','FEEDBACK_RECEIVED','SIGNALS_CLEARED','STEP_COMMITTED','RESULT_WRITING','RESULT_CONFIRMED','MODE_WRITING','MODE_CONFIRMED'])"},
{"ck_production_runs_manual_decision", "CHECK (manual_decision IS NULL OR manual_decision = ANY ARRAY['ACTION_COMPLETED','ACTION_NOT_EXECUTED','RETRY_VISION','NORMAL_PICK'])"},
{"ck_production_runs_action_attempt", "CHECK (action_attempt >= 0)"},
{"ck_production_runs_action_lock_version", "CHECK (action_lock_version >= 0)"}
};
auto normalizedCheck = [](QString definition) {
definition.remove(QRegularExpression("::(?:character varying|text)(?:\\[\\])?"));
definition.remove(QRegularExpression("[\\s()\\[\\]]"));
return definition;
};
query.prepare("select conname, pg_get_constraintdef(oid) from pg_constraint "
"where conrelid='production_runs'::regclass and contype='c' and convalidated");
if (!query.exec()) { setError(query, error); return false; }
checked = 0;
while (query.next()) {
const QString name = query.value(0).toString();
if (!expectedChecks.contains(name)) continue;
if (normalizedCheck(query.value(1).toString()) != normalizedCheck(expectedChecks.value(name))) {
if (error) *error = "动作恢复约束定义不匹配:" + name;
return false;
}
++checked;
}
if (checked != expectedChecks.size()) {
if (error) *error = "动作恢复数据库约束不完整,请执行检查点升级 SQL";
return false;
}
query.prepare("select count(*) from pg_index i join pg_attribute a "
"on a.attrelid=i.indrelid and a.attnum=i.indkey[0] "
"where i.indrelid='production_runs'::regclass and i.indisunique and i.indisvalid "
"and i.indnatts=1 and a.attname='action_token' "
"and pg_get_expr(i.indpred,i.indrelid)='(action_token IS NOT NULL)'");
if (!query.exec() || !query.next() || query.value(0).toInt() < 1) {
if (error) *error = "动作恢复唯一索引不完整,请执行检查点升级 SQL";
return false;
}
return true;
}
bool ProductionRepository::saveActionCheckpoint(int runId, int orderId, int workpieceId,
ProductionActionCheckpoint *action, QString *error)
{
if (!action || !ensureOpen(error)) return false;
QSqlQuery query(DatabaseManager::instance().database());
query.prepare("update production_runs set action_token=:token, action_type=:type, "
"action_phase=:phase, action_next_step=:next, action_attempt=:attempt, "
"action_lock_version=action_lock_version+1, action_command_value=:command, "
"action_feedback_value=:feedback, manual_decision=:decision, manual_operator=:operator, "
"manual_decided_at=:decided, action_updated_at=now(), updated_at=now() "
"where id=:id and order_id=:order_id and current_workpiece_id is not distinct from :workpiece "
"and action_lock_version=:version");
query.bindValue(":token", action->token);
query.bindValue(":type", action->type);
query.bindValue(":phase", action->phase);
query.bindValue(":next", action->nextStep);
query.bindValue(":attempt", action->attempt);
query.bindValue(":command", action->command.isNull() ? QVariant(QVariant::Bool) : action->command);
query.bindValue(":feedback", action->feedback.isNull() ? QVariant(QVariant::Bool) : action->feedback);
query.bindValue(":decision", action->manualDecision);
query.bindValue(":operator", action->manualOperator);
query.bindValue(":decided", action->manualDecidedAt.isValid() ? QVariant(action->manualDecidedAt) : QVariant(QVariant::DateTime));
query.bindValue(":id", runId);
query.bindValue(":order_id", orderId);
query.bindValue(":workpiece", nullableId(workpieceId));
query.bindValue(":version", action->version);
if (!query.exec()) { setError(query, error); return false; }
if (query.numRowsAffected() != 1) {
if (error) *error = "动作检查点已改变,请重新读取恢复状态";
return false;
}
++action->version;
return true;
}
bool ProductionRepository::findInspectionResult(int workpieceId, const QString &side,
int *rawResult, QString *resultState, QString *error,
const QString &actionToken, int actionAttempt)
{
if (!rawResult || !resultState || (side != "FRONT" && side != "BACK")) {
if (error) *error = "Invalid inspection result request";
return false;
}
if (!ensureOpen(error)) return false;
QSqlQuery query(DatabaseManager::instance().database());
QString sql = "select raw_result, result_state from inspection_records "
"where workpiece_id=:id and inspection_side=:side and inspection_state='COMPLETED' "
"and created_at >= (select started_at from workpiece_process_records "
"where workpiece_id=:id and process_step=:step order by attempt_no desc limit 1) ";
if (!actionToken.isEmpty()) sql += "and message=:action_message ";
sql += "order by attempt_no desc limit 1";
query.prepare(sql);
query.bindValue(":id", workpieceId);
query.bindValue(":side", side);
query.bindValue(":step", side == "FRONT" ? "FRONT_CHECKING" : "BACK_CHECKING");
if (!actionToken.isEmpty())
query.bindValue(":action_message", "action=" + actionToken + ";attempt=" + QString::number(actionAttempt));
if (!query.exec()) { setError(query, error); return false; }
if (!query.next()) { if (error) *error = "检测结果尚未持久化,不能认定检测完成"; return false; }
if (query.value(0).isNull()) {
if (error) *error = "检测结果为空,不能认定检测完成";
return false;
}
*rawResult = query.value(0).toInt();
*resultState = query.value(1).toString();
return *resultState == "OK" || *resultState == "NG";
}
bool ProductionRepository::insertStateHistory(
int runId, int orderId, int workpieceId, const QString &fromState,
const QString &toState, const QString &processStep, const QString &source,
const QString &reason, const QString &message, QString *error)
const QString &reason, const QString &message, QString *error,
const QString &operatorName)
{
if (!ensureOpen(error)) {
return false;
@@ -189,9 +392,9 @@ bool ProductionRepository::insertStateHistory(
QSqlQuery query(DatabaseManager::instance().database());
query.prepare("insert into production_state_history "
"(production_run_id, order_id, workpiece_id, from_state, "
"to_state, process_step, source, reason, message) "
"to_state, process_step, source, reason, message, operator_name) "
"values (:run_id, :order_id, :workpiece_id, :from_state, "
":to_state, :process_step, :source, :reason, :message)");
":to_state, :process_step, :source, :reason, :message, :operator)");
query.bindValue(":run_id", nullableId(runId));
query.bindValue(":order_id", nullableId(orderId));
query.bindValue(":workpiece_id", nullableId(workpieceId));
@@ -201,6 +404,7 @@ bool ProductionRepository::insertStateHistory(
query.bindValue(":source", source);
query.bindValue(":reason", reason);
query.bindValue(":message", message);
query.bindValue(":operator", operatorName);
if (!query.exec()) {
setError(query, error);
return false;
+29 -1
View File
@@ -4,6 +4,22 @@
#include <QDateTime>
#include <QList>
#include <QString>
#include <QVariant>
struct ProductionActionCheckpoint
{
QString token;
QString type;
QString phase;
QString nextStep;
int attempt = 0;
int version = 0;
QVariant command;
QVariant feedback;
QString manualDecision;
QString manualOperator;
QDateTime manualDecidedAt;
};
struct ProductionRunSnapshot
{
@@ -20,6 +36,7 @@ struct ProductionRunSnapshot
QString timeoutState;
int recoveryRetryCount = 0;
QString lastError;
ProductionActionCheckpoint action;
};
struct WorkpieceProcessRecord
@@ -50,12 +67,23 @@ public:
QString *error = nullptr);
bool heartbeatRun(int runId, QString *error = nullptr);
bool findActiveRun(ProductionRunSnapshot *run, QString *error = nullptr);
bool findRun(int runId, ProductionRunSnapshot *run, QString *error = nullptr);
bool checkActionSchema(QString *error = nullptr);
bool saveActionCheckpoint(int runId, int orderId, int workpieceId,
ProductionActionCheckpoint *action,
QString *error = nullptr);
bool findInspectionResult(int workpieceId, const QString &side,
int *rawResult, QString *resultState,
QString *error = nullptr,
const QString &actionToken = QString(),
int actionAttempt = 0);
bool insertStateHistory(int runId, int orderId, int workpieceId,
const QString &fromState, const QString &toState,
const QString &processStep, const QString &source,
const QString &reason, const QString &message,
QString *error = nullptr);
QString *error = nullptr,
const QString &operatorName = QString());
bool startWorkpieceProcess(int orderId, int workpieceId,
const QString &processStep,
+87 -52
View File
@@ -523,35 +523,37 @@ void DeviceService::finishTermination(bool success, const QString &error)
void DeviceService::beginProductionAction(
ProductionAction action, int trayNo, int slotNo,
const OperationCallback &callback, const std::function<bool()> &beforeSend)
const VisionWriteCallback &callback, const std::function<bool()> &beforeSend)
{
if (m_terminationActive) {
if (callback) {
callback(false, "PLC termination is in progress");
callback(VisionWriteOutcome::NotSent, "PLC termination is in progress");
}
return;
}
if (ConfigManager::instance().simulationMode()) {
const bool permitted = !beforeSend || beforeSend();
if (callback) {
callback(true, QString());
callback(permitted ? VisionWriteOutcome::Confirmed : VisionWriteOutcome::NotSent,
permitted ? QString() : "Production action invalidated before transmission");
}
return;
}
if (!ConfigManager::instance().productionEnabled()) {
if (callback) {
callback(false, "Production control is disabled by configuration");
callback(VisionWriteOutcome::NotSent, "Production control is disabled by configuration");
}
return;
}
if (m_productionActionActive || m_productionActionBusy) {
if (callback) {
callback(false, "A PLC production action is already active");
callback(VisionWriteOutcome::NotSent, "A PLC production action is already active");
}
return;
}
if (trayNo <= 0 || slotNo < 1 || slotNo > 49) {
if (callback) {
callback(false, "PLC tray or slot position is invalid");
callback(VisionWriteOutcome::NotSent, "PLC tray or slot position is invalid");
}
return;
}
@@ -562,7 +564,7 @@ void DeviceService::beginProductionAction(
&m_productionCommandAddress,
&m_productionFeedbackAddress)) {
if (callback) {
callback(false, "Unknown PLC production action");
callback(VisionWriteOutcome::NotSent, "Unknown PLC production action");
}
return;
}
@@ -576,50 +578,40 @@ void DeviceService::beginProductionAction(
if (!success) {
m_productionActionBusy = false;
if (callback) {
callback(false, error);
callback(VisionWriteOutcome::NotSent, error);
}
return;
}
if (status.command || status.feedback) {
m_productionActionBusy = false;
if (callback) {
callback(false,
callback(VisionWriteOutcome::NotSent,
"PLC command or feedback is still active before a new action");
}
return;
}
auto sendCommand =
[this, callback](bool success, const QString &error) {
if (!success) {
m_productionActionBusy = false;
if (callback) {
callback(false, error);
}
return;
}
m_productionActionActive = true;
[this, callback](VisionWriteOutcome outcome, const QString &error) {
// An unacknowledged command may already be running. Do not
// permit another action until it has been reconciled.
m_productionActionActive = outcome != VisionWriteOutcome::NotSent;
m_productionActionBusy = false;
if (callback) {
callback(true, QString());
callback(outcome, error);
}
};
auto writeCommand = [this, sendCommand, beforeSend](bool success,
const QString &error) {
if (!success) {
sendCommand(false, error);
sendCommand(VisionWriteOutcome::NotSent, error);
return;
}
if (beforeSend) {
m_modbus->writeVisionCoil(m_productionCommandAddress, true,
[sendCommand](VisionWriteOutcome outcome, const QString &error) {
sendCommand(outcome == VisionWriteOutcome::Confirmed, error);
}, beforeSend);
} else {
m_modbus->writeCoil(m_productionCommandAddress, true, sendCommand);
}
// Action commands must never use the legacy automatic retry
// path, even when no persistence hook is supplied.
m_modbus->writeVisionCoil(m_productionCommandAddress, true,
sendCommand, beforeSend);
};
if (action == PhotoMoveAction || action == RackPick
@@ -706,7 +698,9 @@ void DeviceService::adoptProductionAction(ProductionAction action)
m_productionActionActive = true;
}
void DeviceService::pollProductionAction(const ActionCallback &callback)
void DeviceService::pollProductionAction(
const ActionCallback &callback,
const std::function<bool(QString *)> &beforeClear)
{
if (m_terminationActive) {
if (callback) {
@@ -715,9 +709,9 @@ void DeviceService::pollProductionAction(const ActionCallback &callback)
return;
}
if (ConfigManager::instance().simulationMode()) {
if (callback) {
callback(true, true, QString());
}
finishProductionAction([callback](bool success, const QString &error) {
if (callback) callback(success, success, error);
}, beforeClear);
return;
}
if (m_productionActionBusy) {
@@ -736,7 +730,7 @@ void DeviceService::pollProductionAction(const ActionCallback &callback)
m_productionActionBusy = true;
m_modbus->readCoil(
m_productionFeedbackAddress,
[this, callback](bool success, bool feedback,
[this, callback, beforeClear](bool success, bool feedback,
const QString &error) {
if (!success) {
m_productionActionBusy = false;
@@ -753,23 +747,62 @@ void DeviceService::pollProductionAction(const ActionCallback &callback)
return;
}
clearActionSignals(
[this, callback](bool cleared, const QString &clearError) {
m_productionActionBusy = false;
if (cleared) {
m_productionActionActive = false;
m_productionCommandAddress = -1;
m_productionFeedbackAddress = -1;
if (callback) {
callback(true, true, QString());
}
} else if (callback) {
callback(false, false, clearError);
}
});
QString checkpointError;
const bool saved = beforeClear && beforeClear(&checkpointError);
m_productionActionBusy = false;
if (!saved) {
if (!beforeClear)
checkpointError = "Action completion checkpoint hook is missing";
// An empty error explicitly defers completion while the
// caller gathers asynchronous inspection data.
if (callback) callback(checkpointError.isEmpty(), false, checkpointError);
return;
}
finishProductionAction(
[callback](bool cleared, const QString &clearError) {
if (callback) callback(cleared, cleared, clearError);
}, [](QString *) { return true; });
});
}
void DeviceService::finishProductionAction(
const OperationCallback &callback,
const std::function<bool(QString *)> &beforeClear)
{
if (m_terminationActive || m_productionActionBusy) {
if (callback) callback(false, "PLC production action is busy or terminating");
return;
}
const bool simulation = ConfigManager::instance().simulationMode();
if (!simulation && !m_productionActionActive) {
if (callback) callback(false, "No PLC production action is active");
return;
}
m_productionActionBusy = true;
QString checkpointError;
if (!beforeClear || !beforeClear(&checkpointError)) {
m_productionActionBusy = false;
if (callback) callback(false, checkpointError.isEmpty()
? "Action completion checkpoint was not saved"
: checkpointError);
return;
}
auto finish = [this, callback](bool success, const QString &error) {
m_productionActionBusy = false;
if (success) {
m_productionActionActive = false;
m_productionCommandAddress = -1;
m_productionFeedbackAddress = -1;
}
if (callback) callback(success, error);
};
if (simulation) {
finish(true, QString());
return;
}
clearActionSignals(finish);
}
void DeviceService::cancelProductionAction(const OperationCallback &callback)
{
if (m_terminationActive) {
@@ -830,14 +863,16 @@ void DeviceService::clearSignals(int commandAddress, int feedbackAddress,
commandAddress, false,
[this, feedbackAddress, callback](bool commandCleared,
const QString &commandError) {
if (!commandCleared) {
if (callback) callback(false, commandError);
return;
}
m_modbus->writeCoil(
feedbackAddress, false,
[callback, commandCleared, commandError](
[callback](
bool feedbackCleared, const QString &feedbackError) {
if (callback) {
callback(commandCleared && feedbackCleared,
commandCleared ? feedbackError
: commandError);
callback(feedbackCleared, feedbackError);
}
});
});
+5 -2
View File
@@ -84,9 +84,12 @@ public:
const OperationCallback &callback);
void terminate(const OperationCallback &callback);
void beginProductionAction(ProductionAction action, int trayNo,
int slotNo, const OperationCallback &callback,
int slotNo, const VisionWriteCallback &callback,
const std::function<bool()> &beforeSend = {});
void pollProductionAction(const ActionCallback &callback);
void pollProductionAction(const ActionCallback &callback,
const std::function<bool(QString *)> &beforeClear);
void finishProductionAction(const OperationCallback &callback,
const std::function<bool(QString *)> &beforeClear);
void inspectProductionAction(ProductionAction action,
const ActionStatusCallback &callback);
void adoptProductionAction(ProductionAction action);
File diff suppressed because it is too large Load Diff
+35 -6
View File
@@ -4,6 +4,7 @@
#include "deviceservice.h"
#include "../models/workpiece.h"
#include "../repositories/productionrepository.h"
#include <QElapsedTimer>
#include <QObject>
@@ -64,6 +65,7 @@ public:
bool stop(QString *error = nullptr);
bool clearAlarm(QString *error = nullptr);
bool recover(QString *error = nullptr);
bool submitRecoveryDecision(const QJsonObject &decision, QString *error = nullptr);
bool markCurrentWorkpieceNg(QString *error = nullptr);
bool restoreActiveRun(QString *error = nullptr);
void shutdown(const DeviceService::OperationCallback &callback);
@@ -89,6 +91,8 @@ signals:
void timeoutWarning(const QString &state, int elapsedMs, int timeoutMs);
void timeoutRecoveryRequired(const QString &state, const QString &message);
void recoveryCompleted(const QString &mode);
void recoveryDecisionRequired(const QJsonObject &context);
void recoveryBusyChanged(bool busy);
void visionMeasureRequested(const QJsonObject &request);
void visionCancelRequested(const QString &requestId);
void visionCycleChanged(const QJsonObject &cycle);
@@ -118,14 +122,29 @@ private:
void reportVision(const QString &phase, const QString &message, bool invalidated = false);
void invalidateVision(const QString &reason);
void visionFault(const QString &reason);
bool recoverVision(QString *error);
void publishVisionControl();
bool saveVisionRecoveryState(bool pending, QString *error);
void loadVisionRecoveryState();
ProductionService(const ProductionService &) = delete;
ProductionService &operator=(const ProductionService &) = delete;
void setState(State state);
bool setState(State state);
QString actionTypeForState(State state) const;
QString nextStepForState(State state) const;
bool ensureActionCheckpoint(State state, QString *error);
bool saveActionPhase(const QString &phase, QString *error);
bool saveActionCompletion(ProductionActionCheckpoint *action,
const QString &nextStep, int nextWorkpieceId,
QString *error);
bool actionCallbackCurrent(quint64 generation, const QString &token, int attempt) const;
bool loadRecoverySnapshot(QString *error);
void finishRecoveryCheck(const QString &error = QString());
void requestManualDecision(State state, const ProductionActionStatus &status,
const QString &reason, const QStringList &options);
void resumeRecoveredState(State state);
bool saveManualDecision(const QJsonObject &decision, QString *error);
void checkVisionRecovery(const QJsonObject &decision = QJsonObject());
bool pickTargetValid() const;
bool claimNextWorkpiece(QString *error);
bool updateCurrentProcessStep(const QString &processStep, QString *error,
bool forceRestart = false);
@@ -157,7 +176,6 @@ private:
QString resultStateForRawResult(int rawResult) const;
bool ensureOrderRunning(QString *error);
bool checkRecoverySafety(QString *error) const;
bool mapPlcStepToState(State *state, QString *processStep) const;
void startProcessTimer(const QString &processStep);
void pauseProcessTimer();
void resumeProcessTimer();
@@ -199,18 +217,31 @@ private:
bool m_actionStarting;
bool m_actionPollPending;
bool m_actionCompleted;
bool m_actionWasSent;
QString m_actionError;
bool m_actionCancelRequested;
DeviceService::OperationCallback m_deferredCancelCallback;
bool m_inspectionStatusPending;
bool m_inspectionStatusReady;
int m_inspectionRawResult = 0;
QString m_inspectionStatusError;
bool m_starting;
bool m_plcStarted;
bool m_tickRunning;
bool m_pauseAfterCurrentAction;
bool m_recoveryCheckPending;
quint64 m_actionGeneration = 0;
quint64 m_recoveryGeneration = 0;
ProductionActionCheckpoint m_checkpoint;
QJsonObject m_manualContext;
bool m_recoveryKeepPaused = false;
bool m_recoveryIdleUnlock = false;
bool m_targetReady = false;
int m_targetWorkpieceId = 0;
QString m_targetSession;
bool m_targetUsesVision = false;
bool m_forceNormalPick = false;
bool m_restoredRun = false;
bool m_persistenceUncertain = false;
DeviceService::ProductionAction m_pendingAction;
QString m_inspectionMode;
QString m_frontResultState;
@@ -235,8 +266,6 @@ private:
bool m_visionSuspended = false;
bool m_visionCommitStarted = false;
bool m_visionNeedsReconcile = false;
bool m_visionRecoveryChecking = false;
bool m_visionFaultCleanupPending = false;
QString m_visionStatePath;
};
+11
View File
@@ -45,6 +45,10 @@ void ProductionWorker::ensureService()
this, &ProductionWorker::timeoutRecoveryRequired);
connect(m_service, &ProductionService::recoveryCompleted,
this, &ProductionWorker::recoveryCompleted);
connect(m_service, &ProductionService::recoveryDecisionRequired,
this, &ProductionWorker::recoveryDecisionRequired);
connect(m_service, &ProductionService::recoveryBusyChanged,
this, &ProductionWorker::recoveryBusyChanged);
}
void ProductionWorker::requestStopImmediate()
@@ -119,6 +123,13 @@ void ProductionWorker::requestRecover()
reportFailure(m_service->recover(&error), error);
}
void ProductionWorker::requestRecoveryDecision(const QJsonObject &decision)
{
ensureService();
QString error;
reportFailure(m_service->submitRecoveryDecision(decision, &error), error);
}
void ProductionWorker::requestMarkNg()
{
ensureService();
+3
View File
@@ -21,6 +21,7 @@ public slots:
void requestStop();
void requestClearAlarm();
void requestRecover();
void requestRecoveryDecision(const QJsonObject &decision);
void requestMarkNg();
void requestRestore();
void requestShutdown();
@@ -42,6 +43,8 @@ signals:
void timeoutWarning(const QString &state, int elapsedMs, int timeoutMs);
void timeoutRecoveryRequired(const QString &state, const QString &message);
void recoveryCompleted(const QString &mode);
void recoveryDecisionRequired(const QJsonObject &context);
void recoveryBusyChanged(bool busy);
void shutdownReady();
void visionMeasureRequested(const QJsonObject &request);
void visionCancelRequested(const QString &requestId);
+5 -2
View File
@@ -280,7 +280,7 @@ bool WorkpieceService::updateState(int id, const QString &state,
bool WorkpieceService::updateProcessStepWithRecord(
int id, const QString &processStep, const QString &inspectionMode,
int plcStep, const QString &source, int durationMs, QString *error,
bool forceRestart)
bool forceRestart, const std::function<bool(QString *)> &beforeCommit)
{
if (id <= 0 || processStep.trimmed().isEmpty()) {
if (error) {
@@ -344,6 +344,7 @@ bool WorkpieceService::updateProcessStepWithRecord(
QString("工件 %1 工序更新为 %2")
.arg(workpiece.barcode, processStep),
&transactionError)
|| (beforeCommit && !beforeCommit(&transactionError))
|| !database.commit(&transactionError)) {
database.rollback();
if (error) {
@@ -358,7 +359,8 @@ bool WorkpieceService::completeWithInspection(
int id, const QString &state, const QString &processStep,
const QString &previousProcessStep, int durationMs, int rawResult,
const QString &resultState, int plcStep, const QString &inspectionMode,
const QString &source, QString *error)
const QString &source, QString *error,
const std::function<bool(QString *)> &beforeCommit)
{
if (id <= 0) {
if (error) {
@@ -408,6 +410,7 @@ bool WorkpieceService::completeWithInspection(
QString("工件 %1 检测结果为 %2")
.arg(workpiece.barcode, resultState),
&transactionError)
|| (beforeCommit && !beforeCommit(&transactionError))
|| !database.commit(&transactionError)) {
database.rollback();
if (error) {
+5 -2
View File
@@ -4,6 +4,7 @@
#include "../models/workpiece.h"
#include <QList>
#include <functional>
class WorkpieceService
{
@@ -25,7 +26,8 @@ public:
const QString &source,
int durationMs,
QString *error = nullptr,
bool forceRestart = false);
bool forceRestart = false,
const std::function<bool(QString *)> &beforeCommit = {});
bool recordInspection(int id, const QString &side, int rawResult,
const QString &resultState, int plcStep,
const QString &inspectionMode, const QString &source,
@@ -38,7 +40,8 @@ public:
const QString &resultState, int plcStep,
const QString &inspectionMode,
const QString &source,
QString *error = nullptr);
QString *error = nullptr,
const std::function<bool(QString *)> &beforeCommit = {});
private:
WorkpieceService() = default;
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.11.0, 2026-10-28T20:48:37. -->
<!-- Written by QtCreator 4.11.0, 2026-10-29T19:29:46. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>