diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index a89e7db..77f0a9a 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -32,6 +32,9 @@ for(int i=0;i<2;i++) ui->tableWidget_Standard->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); ui->tableWidgetCheck->verticalHeader()->setParent(nullptr); + ui->comboBoxName->addItem("ALL"); + ui->comboBoxModal->addItem("ALL"); + ui->comboBoxCustomer->addItem("ALL"); getCheckDevice(); //ui->stackedWidget_2->setCurrentIndex(1); //ui->tableWidgetDevice->verticalHeader()->sectionResizeMode(QHeaderView::Stretch); @@ -293,7 +296,30 @@ dlg->show(); } -void CheckWindow::getCheckDevice() +void CheckWindow::SetHomePaheCombox(Dept task) +{ + if(comboBoxContainsItem(ui->comboBoxName,task.sample_name)){ + ui->comboBoxName->addItem(task.sample_name); + } + if(comboBoxContainsItem(ui->comboBoxModal,task.sample_model)){ + ui->comboBoxModal->addItem(task.sample_model); + } + if(comboBoxContainsItem(ui->comboBoxCustomer,task.customer_name)){ + ui->comboBoxCustomer->addItem(task.customer_name); + } +} + +bool CheckWindow::comboBoxContainsItem(QComboBox *comboBox, const QString &itemText) +{ + for (int i = 0; i < comboBox->count(); ++i) { + if (comboBox->itemText(i) == itemText) { + return false; // 找到匹配项,返回 true + } + } + return true; // 没有找到匹配项,返回 false +} + +void CheckWindow::getCheckDevice(bool bInit) { myTaskList.clear(); ui->tableWidgetDevice->clearContents(); @@ -302,8 +328,35 @@ QString userId="1695282436182188034"; //myTaskList = BaseCommonApi::getMyTasks(userId,"3"); myTaskList = BaseCommonApi::getAllData(); + if(bInit){ + for (int i=0;icomboBoxName->setCurrentIndex(0); + ui->comboBoxModal->setCurrentIndex(0); + ui->comboBoxCustomer->setCurrentIndex(0); + ui->lineEditNo->setText(""); + } + QString sFilterName = ui->comboBoxName->currentText(); + QString sFilterModal = ui->comboBoxModal->currentText(); + QString sFilterCustomer = ui->comboBoxCustomer->currentText(); + QString sFilterNo = ui->lineEditNo->text(); for (int i=myTaskList.length()-1;i>=0;i--){ - if(myTaskList[i].measure_status!="3"){ + bool bAdd=true; + if(sFilterName!="ALL"&&myTaskList[i].sample_name!=sFilterName){ + bAdd=false; + } + if(sFilterModal!="ALL"&&myTaskList[i].sample_model!=sFilterModal){ + bAdd=false; + } + if(sFilterCustomer!="ALL"&&myTaskList[i].customer_name!=sFilterCustomer){ + bAdd=false; + } + if(sFilterNo!=""&&!myTaskList[i].manufacture_no.contains(sFilterNo)){ + bAdd=false; + } + if(!bAdd||myTaskList[i].measure_status!="3"){ myTaskList.removeAt(i); } } @@ -336,6 +389,20 @@ ui->tableWidgetMethod->clearContents(); ui->tableWidgetMethod->setRowCount(0); programList = BaseCommonApi::getVerificationProgramInfoMain(); + QString sFilterName = ui->lineEditName->text(); + QString sFilterUser = ui->lineEditCreator->text(); + for(int i=programList.length()-1;i>=0;i--){ + bool bAdd=true; + if(sFilterName!=""&&!programList[i].program_name.contains(sFilterName)){ + bAdd=false; + } + if(sFilterUser!=""&&!programList[i].create_name.contains(sFilterUser)){ + bAdd=false; + } + if(!bAdd){ + programList.removeAt(i); + } + } int rowCount = 0; int row=0; for (const VerificationProgramInfo& program : programList) { @@ -554,3 +621,29 @@ { } + +void CheckWindow::on_pushButton_clicked() +{ + getCheckDevice(false); +} + +void CheckWindow::on_pushButton_2_clicked() +{ + ui->comboBoxName->setCurrentIndex(0); + ui->comboBoxModal->setCurrentIndex(0); + ui->comboBoxCustomer->setCurrentIndex(0); + ui->lineEditNo->setText(""); + getCheckDevice(false); +} + +void CheckWindow::on_pushButton_10_clicked() +{ + getCheckMethod(); +} + +void CheckWindow::on_pushButton_11_clicked() +{ + ui->lineEditName->setText(""); + ui->lineEditCreator->setText(""); + getCheckMethod(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index a89e7db..77f0a9a 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -32,6 +32,9 @@ for(int i=0;i<2;i++) ui->tableWidget_Standard->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); ui->tableWidgetCheck->verticalHeader()->setParent(nullptr); + ui->comboBoxName->addItem("ALL"); + ui->comboBoxModal->addItem("ALL"); + ui->comboBoxCustomer->addItem("ALL"); getCheckDevice(); //ui->stackedWidget_2->setCurrentIndex(1); //ui->tableWidgetDevice->verticalHeader()->sectionResizeMode(QHeaderView::Stretch); @@ -293,7 +296,30 @@ dlg->show(); } -void CheckWindow::getCheckDevice() +void CheckWindow::SetHomePaheCombox(Dept task) +{ + if(comboBoxContainsItem(ui->comboBoxName,task.sample_name)){ + ui->comboBoxName->addItem(task.sample_name); + } + if(comboBoxContainsItem(ui->comboBoxModal,task.sample_model)){ + ui->comboBoxModal->addItem(task.sample_model); + } + if(comboBoxContainsItem(ui->comboBoxCustomer,task.customer_name)){ + ui->comboBoxCustomer->addItem(task.customer_name); + } +} + +bool CheckWindow::comboBoxContainsItem(QComboBox *comboBox, const QString &itemText) +{ + for (int i = 0; i < comboBox->count(); ++i) { + if (comboBox->itemText(i) == itemText) { + return false; // 找到匹配项,返回 true + } + } + return true; // 没有找到匹配项,返回 false +} + +void CheckWindow::getCheckDevice(bool bInit) { myTaskList.clear(); ui->tableWidgetDevice->clearContents(); @@ -302,8 +328,35 @@ QString userId="1695282436182188034"; //myTaskList = BaseCommonApi::getMyTasks(userId,"3"); myTaskList = BaseCommonApi::getAllData(); + if(bInit){ + for (int i=0;icomboBoxName->setCurrentIndex(0); + ui->comboBoxModal->setCurrentIndex(0); + ui->comboBoxCustomer->setCurrentIndex(0); + ui->lineEditNo->setText(""); + } + QString sFilterName = ui->comboBoxName->currentText(); + QString sFilterModal = ui->comboBoxModal->currentText(); + QString sFilterCustomer = ui->comboBoxCustomer->currentText(); + QString sFilterNo = ui->lineEditNo->text(); for (int i=myTaskList.length()-1;i>=0;i--){ - if(myTaskList[i].measure_status!="3"){ + bool bAdd=true; + if(sFilterName!="ALL"&&myTaskList[i].sample_name!=sFilterName){ + bAdd=false; + } + if(sFilterModal!="ALL"&&myTaskList[i].sample_model!=sFilterModal){ + bAdd=false; + } + if(sFilterCustomer!="ALL"&&myTaskList[i].customer_name!=sFilterCustomer){ + bAdd=false; + } + if(sFilterNo!=""&&!myTaskList[i].manufacture_no.contains(sFilterNo)){ + bAdd=false; + } + if(!bAdd||myTaskList[i].measure_status!="3"){ myTaskList.removeAt(i); } } @@ -336,6 +389,20 @@ ui->tableWidgetMethod->clearContents(); ui->tableWidgetMethod->setRowCount(0); programList = BaseCommonApi::getVerificationProgramInfoMain(); + QString sFilterName = ui->lineEditName->text(); + QString sFilterUser = ui->lineEditCreator->text(); + for(int i=programList.length()-1;i>=0;i--){ + bool bAdd=true; + if(sFilterName!=""&&!programList[i].program_name.contains(sFilterName)){ + bAdd=false; + } + if(sFilterUser!=""&&!programList[i].create_name.contains(sFilterUser)){ + bAdd=false; + } + if(!bAdd){ + programList.removeAt(i); + } + } int rowCount = 0; int row=0; for (const VerificationProgramInfo& program : programList) { @@ -554,3 +621,29 @@ { } + +void CheckWindow::on_pushButton_clicked() +{ + getCheckDevice(false); +} + +void CheckWindow::on_pushButton_2_clicked() +{ + ui->comboBoxName->setCurrentIndex(0); + ui->comboBoxModal->setCurrentIndex(0); + ui->comboBoxCustomer->setCurrentIndex(0); + ui->lineEditNo->setText(""); + getCheckDevice(false); +} + +void CheckWindow::on_pushButton_10_clicked() +{ + getCheckMethod(); +} + +void CheckWindow::on_pushButton_11_clicked() +{ + ui->lineEditName->setText(""); + ui->lineEditCreator->setText(""); + getCheckMethod(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 0622e74..7b5cba0 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -47,14 +47,24 @@ void on_pushButton_stop_clicked(); + void on_pushButton_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_10_clicked(); + + void on_pushButton_11_clicked(); + private: - void getCheckDevice(); + void getCheckDevice(bool bInit=true); void getCheckMethod(); void initDeviceInfo(); void deleteItem(QLayout *layout); void initCheckTable(); InstructionLib* getCmdByCheckName(int idx,QString name); void Delay_MSec(unsigned int msec); + void SetHomePaheCombox(Dept task); + bool comboBoxContainsItem(QComboBox *comboBox, const QString &itemText); private: Ui::CheckWindow *ui; QList programList; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index a89e7db..77f0a9a 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -32,6 +32,9 @@ for(int i=0;i<2;i++) ui->tableWidget_Standard->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch); ui->tableWidgetCheck->verticalHeader()->setParent(nullptr); + ui->comboBoxName->addItem("ALL"); + ui->comboBoxModal->addItem("ALL"); + ui->comboBoxCustomer->addItem("ALL"); getCheckDevice(); //ui->stackedWidget_2->setCurrentIndex(1); //ui->tableWidgetDevice->verticalHeader()->sectionResizeMode(QHeaderView::Stretch); @@ -293,7 +296,30 @@ dlg->show(); } -void CheckWindow::getCheckDevice() +void CheckWindow::SetHomePaheCombox(Dept task) +{ + if(comboBoxContainsItem(ui->comboBoxName,task.sample_name)){ + ui->comboBoxName->addItem(task.sample_name); + } + if(comboBoxContainsItem(ui->comboBoxModal,task.sample_model)){ + ui->comboBoxModal->addItem(task.sample_model); + } + if(comboBoxContainsItem(ui->comboBoxCustomer,task.customer_name)){ + ui->comboBoxCustomer->addItem(task.customer_name); + } +} + +bool CheckWindow::comboBoxContainsItem(QComboBox *comboBox, const QString &itemText) +{ + for (int i = 0; i < comboBox->count(); ++i) { + if (comboBox->itemText(i) == itemText) { + return false; // 找到匹配项,返回 true + } + } + return true; // 没有找到匹配项,返回 false +} + +void CheckWindow::getCheckDevice(bool bInit) { myTaskList.clear(); ui->tableWidgetDevice->clearContents(); @@ -302,8 +328,35 @@ QString userId="1695282436182188034"; //myTaskList = BaseCommonApi::getMyTasks(userId,"3"); myTaskList = BaseCommonApi::getAllData(); + if(bInit){ + for (int i=0;icomboBoxName->setCurrentIndex(0); + ui->comboBoxModal->setCurrentIndex(0); + ui->comboBoxCustomer->setCurrentIndex(0); + ui->lineEditNo->setText(""); + } + QString sFilterName = ui->comboBoxName->currentText(); + QString sFilterModal = ui->comboBoxModal->currentText(); + QString sFilterCustomer = ui->comboBoxCustomer->currentText(); + QString sFilterNo = ui->lineEditNo->text(); for (int i=myTaskList.length()-1;i>=0;i--){ - if(myTaskList[i].measure_status!="3"){ + bool bAdd=true; + if(sFilterName!="ALL"&&myTaskList[i].sample_name!=sFilterName){ + bAdd=false; + } + if(sFilterModal!="ALL"&&myTaskList[i].sample_model!=sFilterModal){ + bAdd=false; + } + if(sFilterCustomer!="ALL"&&myTaskList[i].customer_name!=sFilterCustomer){ + bAdd=false; + } + if(sFilterNo!=""&&!myTaskList[i].manufacture_no.contains(sFilterNo)){ + bAdd=false; + } + if(!bAdd||myTaskList[i].measure_status!="3"){ myTaskList.removeAt(i); } } @@ -336,6 +389,20 @@ ui->tableWidgetMethod->clearContents(); ui->tableWidgetMethod->setRowCount(0); programList = BaseCommonApi::getVerificationProgramInfoMain(); + QString sFilterName = ui->lineEditName->text(); + QString sFilterUser = ui->lineEditCreator->text(); + for(int i=programList.length()-1;i>=0;i--){ + bool bAdd=true; + if(sFilterName!=""&&!programList[i].program_name.contains(sFilterName)){ + bAdd=false; + } + if(sFilterUser!=""&&!programList[i].create_name.contains(sFilterUser)){ + bAdd=false; + } + if(!bAdd){ + programList.removeAt(i); + } + } int rowCount = 0; int row=0; for (const VerificationProgramInfo& program : programList) { @@ -554,3 +621,29 @@ { } + +void CheckWindow::on_pushButton_clicked() +{ + getCheckDevice(false); +} + +void CheckWindow::on_pushButton_2_clicked() +{ + ui->comboBoxName->setCurrentIndex(0); + ui->comboBoxModal->setCurrentIndex(0); + ui->comboBoxCustomer->setCurrentIndex(0); + ui->lineEditNo->setText(""); + getCheckDevice(false); +} + +void CheckWindow::on_pushButton_10_clicked() +{ + getCheckMethod(); +} + +void CheckWindow::on_pushButton_11_clicked() +{ + ui->lineEditName->setText(""); + ui->lineEditCreator->setText(""); + getCheckMethod(); +} diff --git a/softwareDirectory/AutoVerScheme/checkwindow.h b/softwareDirectory/AutoVerScheme/checkwindow.h index 0622e74..7b5cba0 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.h +++ b/softwareDirectory/AutoVerScheme/checkwindow.h @@ -47,14 +47,24 @@ void on_pushButton_stop_clicked(); + void on_pushButton_clicked(); + + void on_pushButton_2_clicked(); + + void on_pushButton_10_clicked(); + + void on_pushButton_11_clicked(); + private: - void getCheckDevice(); + void getCheckDevice(bool bInit=true); void getCheckMethod(); void initDeviceInfo(); void deleteItem(QLayout *layout); void initCheckTable(); InstructionLib* getCmdByCheckName(int idx,QString name); void Delay_MSec(unsigned int msec); + void SetHomePaheCombox(Dept task); + bool comboBoxContainsItem(QComboBox *comboBox, const QString &itemText); private: Ui::CheckWindow *ui; QList programList; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.ui b/softwareDirectory/AutoVerScheme/checkwindow.ui index fb01e60..90a3172 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.ui +++ b/softwareDirectory/AutoVerScheme/checkwindow.ui @@ -392,19 +392,27 @@ 12 - + + + 扫码枪触发栏 + + - + - + - + + + 出厂编号 + + - + @@ -629,10 +637,18 @@ 12 - + + + 检定程序名称 + + - + + + 创建人 + +