添加状态点位表

This commit is contained in:
lidg
2026-08-24 17:28:59 +08:00
parent d780072f39
commit 76368d075a
18 changed files with 640 additions and 174 deletions
+68 -26
View File
@@ -16,6 +16,28 @@
#include <QTextEdit>
#include <QVBoxLayout>
namespace {
QString displayOrderStatus(const QString &status)
{
if (status == "NOT_START") return "未开始";
if (status == "RUNNING") return "加工中";
if (status == "PAUSED") return "已暂停";
if (status == "COMPLETED") return "已完成";
if (status == "ERROR") return "故障";
if (status == "STOPPING") return "终止中";
return status.isEmpty() ? "未采集" : status;
}
QString displayInspectionMode(const QString &mode)
{
if (mode == "BEFORE_PLATING") return "镀金前检测";
if (mode == "AFTER_PLATING") return "镀金后检测";
return mode.isEmpty() ? "未设置" : mode;
}
}
OrderPage::OrderPage(QWidget *parent)
: QWidget(parent)
, ui(new Ui::OrderPage)
@@ -31,23 +53,22 @@ OrderPage::OrderPage(QWidget *parent)
table->setColumnCount(14);
table->setHorizontalHeaderLabels(QStringList()
<< "订单编号" << "生产号" << "图纸号" << "批次号" << "计划"
<< "OK" << "NG" << "状态" << "开始时间" << "结束时间" << "备注");
table->setHorizontalHeaderItem(8, new QTableWidgetItem("Mode"));
table->setHorizontalHeaderItem(9, new QTableWidgetItem("Start tray"));
table->setHorizontalHeaderItem(10, new QTableWidgetItem("Start slot"));
table->setHorizontalHeaderItem(11, new QTableWidgetItem("Begin"));
table->setHorizontalHeaderItem(12, new QTableWidgetItem("End"));
table->setHorizontalHeaderItem(13, new QTableWidgetItem("Remark"));
<< "OK" << "NG" << "状态" << "检测模式" << "起始托盘"
<< "起始位置" << "开始时间" << "结束时间" << "备注");
table->horizontalHeader()->setStretchLastSection(true);
table->verticalHeader()->setVisible(false);
table->setEditTriggers(QAbstractItemView::NoEditTriggers);
table->setAlternatingRowColors(true);
table->setSelectionBehavior(QAbstractItemView::SelectRows);
table->setSelectionMode(QAbstractItemView::SingleSelection);
connect(ui->newButton, &QPushButton::clicked, this, &OrderPage::createOrder);
connect(ui->refreshButton, &QPushButton::clicked, this, &OrderPage::loadOrders);
connect(generateButton, &QPushButton::clicked,
this, &OrderPage::generateSelectedWorkpieces);
connect(ui->deleteButton, &QPushButton::clicked, this, &OrderPage::deleteSelectedOrder);
connect(table, &QTableWidget::itemSelectionChanged,
this, &OrderPage::updateSelectedOrderDetail);
loadOrders();
}
@@ -94,8 +115,8 @@ void OrderPage::fillOrderTable(const QList<Order> &orders)
<< QString::number(order.planNum)
<< QString::number(order.qualified)
<< QString::number(order.unqualified)
<< order.status
<< order.inspectionMode
<< displayOrderStatus(order.status)
<< displayInspectionMode(order.inspectionMode)
<< QString::number(order.startTrayNo)
<< QString::number(order.startSlotNo)
<< beginTime
@@ -108,20 +129,41 @@ void OrderPage::fillOrderTable(const QList<Order> &orders)
}
if (orders.isEmpty()) {
updateSelectedOrderDetail();
return;
}
table->setCurrentCell(0, 0);
updateSelectedOrderDetail();
}
void OrderPage::updateSelectedOrderDetail()
{
const int row = ui->orderTable->currentRow();
if (row < 0 || row >= orderIds.size()) {
ui->currentOrderLabel->setText("当前订单:-");
ui->progressLabel->setText("当前进度:0 / 0");
ui->currentStepLabel->setText("当前工序:-");
ui->currentStepLabel->setText("当前状态:-");
ui->memoLabel->setText("说明:暂无订单");
return;
}
const Order &first = orders.first();
ui->currentOrderLabel->setText("当前订单:" + first.no);
Order order;
QString error;
if (!OrderService::instance().findOrder(orderIds.at(row), &order, &error)) {
ui->currentOrderLabel->setText("当前订单:-");
ui->progressLabel->setText("当前进度:0 / 0");
ui->currentStepLabel->setText("当前状态:未采集");
ui->memoLabel->setText("说明:订单读取失败");
return;
}
ui->currentOrderLabel->setText("当前订单:" + order.no);
ui->progressLabel->setText(QString("当前进度:%1 / %2")
.arg(first.qualified + first.unqualified)
.arg(first.planNum));
ui->currentStepLabel->setText("当前工序:" + first.status);
ui->memoLabel->setText("说明:" + first.remark);
.arg(order.qualified + order.unqualified)
.arg(order.planNum));
ui->currentStepLabel->setText("当前状态:" + displayOrderStatus(order.status));
ui->memoLabel->setText("说明:" + (order.remark.isEmpty() ? "无" : order.remark));
}
void OrderPage::createOrder()
@@ -139,11 +181,11 @@ void OrderPage::createOrder()
QSpinBox *planNumSpin = new QSpinBox(&dialog);
QTextEdit *remarkEdit = new QTextEdit(&dialog);
modeCombo->addItem("BEFORE_PLATING", "BEFORE_PLATING");
modeCombo->addItem("AFTER_PLATING", "AFTER_PLATING");
startTraySpin->setRange(1, 999);
modeCombo->addItem("镀金前检测", "BEFORE_PLATING");
modeCombo->addItem("镀金后检测", "AFTER_PLATING");
startTraySpin->setRange(1, 6);
startSlotSpin->setRange(1, 49);
planNumSpin->setRange(1, 999999);
planNumSpin->setRange(1, 294);
planNumSpin->setValue(49);
remarkEdit->setFixedHeight(70);
@@ -155,9 +197,9 @@ void OrderPage::createOrder()
formLayout->addRow("计划数量:", planNumSpin);
formLayout->addRow("备注:", remarkEdit);
formLayout->addRow("Inspection mode:", modeCombo);
formLayout->addRow("Start tray:", startTraySpin);
formLayout->addRow("Start slot:", startSlotSpin);
formLayout->addRow("检测模式:", modeCombo);
formLayout->addRow("起始托盘:", startTraySpin);
formLayout->addRow("起始位置:", startSlotSpin);
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
&dialog);
@@ -220,13 +262,13 @@ void OrderPage::generateSelectedWorkpieces()
QString error;
if (!OrderService::instance().generateWorkpiecesAndAssign(orderIds.at(row), &error)) {
QMessageBox::warning(this, "生成工件失败", error);
emit logRequested("鎿嶄綔鏃ュ織", "璁㈠崟绠$悊", "生成工件", error, "澶辫触");
emit logRequested("操作日志", "订单管理", "生成工件", error, "失败");
return;
}
loadOrders();
emit logRequested("鎿嶄綔鏃ュ織", "璁㈠崟绠$悊", "生成工件",
"生成并分配订单 " + orderNo + " 的工件", "鎴愬姛");
emit logRequested("操作日志", "订单管理", "生成工件",
"生成并分配订单 " + orderNo + " 的工件", "成功");
}
void OrderPage::deleteSelectedOrder()