This commit is contained in:
lidg
2026-10-19 11:17:12 +08:00
parent 8f9a89a61e
commit 23674e0ede
20 changed files with 1509 additions and 333 deletions
+33 -1
View File
@@ -23,7 +23,8 @@ QString displayOrderStatus(const QString &status)
if (status == "NOT_START") return "未开始";
if (status == "RUNNING") return "加工中";
if (status == "PAUSED") return "已暂停";
if (status == "COMPLETED") return "已完成";
if (status == "FINISHED" || status == "COMPLETED") return "已完成";
if (status == "CANCELED") return "已取消";
if (status == "ERROR") return "故障";
if (status == "STOPPING") return "终止中";
return status.isEmpty() ? "未采集" : status;
@@ -48,6 +49,8 @@ OrderPage::OrderPage(QWidget *parent)
ui->deleteButton->setObjectName("dangerButton");
QPushButton *generateButton = new QPushButton("生成工件", this);
ui->toolbarLayout->insertWidget(5, generateButton);
QPushButton *cancelButton = new QPushButton("取消订单", this);
ui->toolbarLayout->insertWidget(8, cancelButton);
QTableWidget *table = ui->orderTable;
table->setColumnCount(14);
@@ -66,6 +69,8 @@ OrderPage::OrderPage(QWidget *parent)
connect(ui->refreshButton, &QPushButton::clicked, this, &OrderPage::loadOrders);
connect(generateButton, &QPushButton::clicked,
this, &OrderPage::generateSelectedWorkpieces);
connect(cancelButton, &QPushButton::clicked,
this, &OrderPage::cancelSelectedOrder);
connect(ui->deleteButton, &QPushButton::clicked, this, &OrderPage::deleteSelectedOrder);
connect(table, &QTableWidget::itemSelectionChanged,
this, &OrderPage::updateSelectedOrderDetail);
@@ -297,3 +302,30 @@ void OrderPage::deleteSelectedOrder()
emit logRequested("操作日志", "订单管理", "删除订单",
"删除订单:" + orderNo, "成功");
}
void OrderPage::cancelSelectedOrder()
{
const int row = ui->orderTable->currentRow();
if (row < 0 || row >= orderIds.size()) {
QMessageBox::information(this, "取消订单", "请先选择要取消的订单");
return;
}
const QString orderNo = ui->orderTable->item(row, 0)
? ui->orderTable->item(row, 0)->text() : QString::number(orderIds.at(row));
if (QMessageBox::question(this, "取消订单",
"确认取消订单:" + orderNo + "?") != QMessageBox::Yes) {
return;
}
QString error;
if (!OrderService::instance().cancelOrder(orderIds.at(row), &error)) {
QMessageBox::warning(this, "取消订单失败", error);
emit logRequested("操作日志", "订单管理", "取消订单", error, "失败");
return;
}
loadOrders();
emit logRequested("操作日志", "订单管理", "取消订单",
"取消订单:" + orderNo, "成功");
}