feat(production): 修改删除订单问题
This commit is contained in:
@@ -475,7 +475,7 @@ void DashboardPage::stopProduction()
|
||||
const int confirmedRunId = active ? productionSnapshot.runId : 0;
|
||||
const int confirmedOrderId = active ? productionSnapshot.orderId : selectedOrderId;
|
||||
if (!stopButton->isEnabled()
|
||||
|| !confirmControlOperation("终止订单", "将当前订单标记为已完成,保留实际加工数量及记录,剩余工件不再执行。此操作不是机器人急停。")) return;
|
||||
|| !confirmControlOperation("终止订单", "终止后剩余工件不再执行。无测量记录时自动删除订单、关联工件及动作记录,并释放料位;已有测量记录时保留订单和历史数据。此操作不是机器人急停。")) return;
|
||||
if (recoveryDialog) recoveryDialog->reject();
|
||||
QMetaObject::invokeMethod(productionWorker, "requestStopOrder",
|
||||
Qt::QueuedConnection, Q_ARG(int, confirmedRunId),
|
||||
|
||||
+2
-1
@@ -292,7 +292,8 @@ void OrderPage::deleteSelectedOrder()
|
||||
const QString orderNo = ui->orderTable->item(row, 0)
|
||||
? ui->orderTable->item(row, 0)->text() : QString::number(orderIds.at(row));
|
||||
if (QMessageBox::question(this, "删除订单",
|
||||
"仅未开始或已取消且无测量记录的订单可以删除。\n"
|
||||
"仅未开始、已取消或手动终止,且无测量记录的订单可以删除。\n"
|
||||
"正常完成的订单不能删除。\n"
|
||||
"删除会清除其未测量工件、动作记录并释放料位。\n\n"
|
||||
"确认删除订单:" + orderNo + "?") != QMessageBox::Yes) {
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user