订单流程添加修改
This commit is contained in:
+25
-1
@@ -2,6 +2,7 @@
|
||||
#include "ui_orderpage.h"
|
||||
|
||||
#include <QAbstractItemView>
|
||||
#include <QComboBox>
|
||||
#include <QDialog>
|
||||
#include <QDialogButtonBox>
|
||||
#include <QFormLayout>
|
||||
@@ -27,10 +28,16 @@ OrderPage::OrderPage(QWidget *parent)
|
||||
ui->toolbarLayout->insertWidget(5, generateButton);
|
||||
|
||||
QTableWidget *table = ui->orderTable;
|
||||
table->setColumnCount(11);
|
||||
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"));
|
||||
table->horizontalHeader()->setStretchLastSection(true);
|
||||
table->verticalHeader()->setVisible(false);
|
||||
table->setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||
@@ -88,6 +95,9 @@ void OrderPage::fillOrderTable(const QList<Order> &orders)
|
||||
<< QString::number(order.qualified)
|
||||
<< QString::number(order.unqualified)
|
||||
<< order.status
|
||||
<< order.inspectionMode
|
||||
<< QString::number(order.startTrayNo)
|
||||
<< QString::number(order.startSlotNo)
|
||||
<< beginTime
|
||||
<< endTime
|
||||
<< order.remark;
|
||||
@@ -123,9 +133,16 @@ void OrderPage::createOrder()
|
||||
QLineEdit *productionNoEdit = new QLineEdit(&dialog);
|
||||
QLineEdit *drawingNoEdit = new QLineEdit(&dialog);
|
||||
QLineEdit *batchNoEdit = new QLineEdit(&dialog);
|
||||
QComboBox *modeCombo = new QComboBox(&dialog);
|
||||
QSpinBox *startTraySpin = new QSpinBox(&dialog);
|
||||
QSpinBox *startSlotSpin = new QSpinBox(&dialog);
|
||||
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);
|
||||
startSlotSpin->setRange(1, 49);
|
||||
planNumSpin->setRange(1, 999999);
|
||||
planNumSpin->setValue(49);
|
||||
remarkEdit->setFixedHeight(70);
|
||||
@@ -138,6 +155,10 @@ void OrderPage::createOrder()
|
||||
formLayout->addRow("计划数量:", planNumSpin);
|
||||
formLayout->addRow("备注:", remarkEdit);
|
||||
|
||||
formLayout->addRow("Inspection mode:", modeCombo);
|
||||
formLayout->addRow("Start tray:", startTraySpin);
|
||||
formLayout->addRow("Start slot:", startSlotSpin);
|
||||
|
||||
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel,
|
||||
&dialog);
|
||||
QVBoxLayout *layout = new QVBoxLayout(&dialog);
|
||||
@@ -156,6 +177,9 @@ void OrderPage::createOrder()
|
||||
order.productionNo = productionNoEdit->text().trimmed();
|
||||
order.drawingNo = drawingNoEdit->text().trimmed();
|
||||
order.batchNo = batchNoEdit->text().trimmed();
|
||||
order.inspectionMode = modeCombo->currentData().toString();
|
||||
order.startTrayNo = startTraySpin->value();
|
||||
order.startSlotNo = startSlotSpin->value();
|
||||
order.planNum = planNumSpin->value();
|
||||
order.status = "NOT_START";
|
||||
order.remark = remarkEdit->toPlainText().trimmed();
|
||||
|
||||
Reference in New Issue
Block a user