diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index 66b8acb..1eb6827 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -88,6 +88,8 @@ void Create_Task::Load() { + //combox设置 + SetHomePaheComboBox(); //先设置为行为0 ui->tableWidget->setRowCount(0); ui->stackedWidget->setCurrentIndex(0); @@ -263,12 +265,9 @@ ui->customer_name->clear(); ui->stackedWidget->setCurrentIndex(1); Create_Task::State="Create"; - //查询出所有委托方和部门 - QList data=BaseCommonApi::getSelectSpecifyFields(); - foreach (SelectSpecifyFields item,data) { - ui->customer_name->addItem(item.customer_name); - ui->comboBox_5->addItem(item.FULL_NAME); - } + //查询出所有委托方 + SetPartPageComBox(); + ui->tableWidgetItem->setRowCount(0); ui->is_urgent->addItem("是"); ui->is_urgent->addItem("否"); @@ -346,6 +345,7 @@ // ======================================================================================== // 保存任务单按钮 先新增任务单 后新增任务单设备 // ==================================================================================== + bool IsSUCC=false; if(State=="Update") { if(TaskId=="")return; @@ -365,7 +365,7 @@ }else{insertTask.is_urgent=false;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.UpdateTask(insertTask); + IsSUCC=dbManager.UpdateTask(insertTask); //设备更新 编辑设备待写 }else{ @@ -388,22 +388,29 @@ insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.InsertTaskBasic(insertTask); + IsSUCC=dbManager.InsertTaskBasic(insertTask); if(IsSUCC) { - //显示任务单编号 - dbManager.AddTaskNumber(); - ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); - // + //根据用户查出部门ID + QString DeptId=dbManager.SelectDeptData("函数内默认添加")[0].id; + //获取选中的委托人ID + + QString CustomerID=""; + if(_model->rowCount()>0){ + QModelIndex currentIndex = _model->index(ui->combox_customer->currentIndex(),0); + CustomerID=currentIndex.data().toString(); + } + + //新增任务单设备 QString NewTaskId=dbManager.getCreateTaskListNew()[0].id; int count=0; - IsSUCC; if(SelectDataItem.count()!=0 && _IdList.count()!=0){ //InsertOrderSampleRelation foreach(TestedCatDevice DeviceInfo,SelectDataItem) { + //样品表 OrderSampleRelation orderSampleRelation; id = dbManager.generateId(); orderSampleRelation.id=QString::number(id); @@ -413,11 +420,41 @@ orderSampleRelation.sample_model=DeviceInfo.model; orderSampleRelation.measure_complete_time=QDateTime::currentDateTime(); IsSUCC=dbManager.InsertOrderSampleRelation(orderSampleRelation); - if(!IsSUCC){ShowMessageBox("提示","设备添加失败");} + + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=_IdList[count]; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + + if(!IsSUCC){ShowMessageBox("提示",QString("设备名称为: 1% 添加失败").arg(DeviceInfo.equipment_name));} count++; } - } - if(IsSUCC){ShowMessageBox("提示","委托单添加成功");} + }else{ + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=""; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + } + + + if(IsSUCC){ + ShowMessageBox("提示","委托单添加成功"); + //显示任务单编号 + dbManager.AddTaskNumber(); + ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); + } }else { @@ -446,7 +483,12 @@ ui->deliverer_tel->setText(data[0].deliverer_tel); ui->undertaker_name->setText(data[0].undertaker_name); ui->undertake_time->setDateTime(data[0].undertake_time); - ui->is_urgent->addItem(data[0].is_urgent); + if(data[0].is_urgent=="1"){ + ui->is_urgent->addItem("是"); + }else{ + ui->is_urgent->addItem("否"); + } + ui->comboBox_5->addItem(data[0].DEPT_FULL_NAME); ui->receive_illustrate->setText(data[0].receive_illustrate); //设备数据 @@ -516,6 +558,39 @@ } } +void Create_Task::SetHomePaheComboBox() +{ + // 创建 QStandardItemModel + /* + QStandardItemModel *model = new QStandardItemModel(0, 3, this); // 0 rows, 2 columns + model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"<<"dept"); // 设置列标题（可选） + + QList items; + items.append(new QStandardItem(data.id)); // ID + items.append(new QStandardItem(data.customer_name)); // Name + items.append(new QStandardItem(data.DEPT_FULL_NAME)); // Name + model->appendRow(items); + */ + ui->combox_customer->addItem("ALL"); + ui->combox_task_no->addItem("ALL"); + ui->combox_dept->addItem("ALL"); +} +void Create_Task::SetPartPageComBox() +{ + + QList data=BaseCommonApi::SelectCustomerData(); + + _model = new QStandardItemModel(0, 2); // 0 rows, 2 columns + _model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"); // 设置列标题（可选） + foreach (biz_resource_customer_info item, data) { + QList items; + items.append(new QStandardItem(item.id)); // ID + items.append(new QStandardItem(item.customer_name)); // Name + _model->appendRow(items); + } + ui->customer_name->setModel(_model); + ui->customer_name->setModelColumn(1); // 显示 Name +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index 66b8acb..1eb6827 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -88,6 +88,8 @@ void Create_Task::Load() { + //combox设置 + SetHomePaheComboBox(); //先设置为行为0 ui->tableWidget->setRowCount(0); ui->stackedWidget->setCurrentIndex(0); @@ -263,12 +265,9 @@ ui->customer_name->clear(); ui->stackedWidget->setCurrentIndex(1); Create_Task::State="Create"; - //查询出所有委托方和部门 - QList data=BaseCommonApi::getSelectSpecifyFields(); - foreach (SelectSpecifyFields item,data) { - ui->customer_name->addItem(item.customer_name); - ui->comboBox_5->addItem(item.FULL_NAME); - } + //查询出所有委托方 + SetPartPageComBox(); + ui->tableWidgetItem->setRowCount(0); ui->is_urgent->addItem("是"); ui->is_urgent->addItem("否"); @@ -346,6 +345,7 @@ // ======================================================================================== // 保存任务单按钮 先新增任务单 后新增任务单设备 // ==================================================================================== + bool IsSUCC=false; if(State=="Update") { if(TaskId=="")return; @@ -365,7 +365,7 @@ }else{insertTask.is_urgent=false;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.UpdateTask(insertTask); + IsSUCC=dbManager.UpdateTask(insertTask); //设备更新 编辑设备待写 }else{ @@ -388,22 +388,29 @@ insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.InsertTaskBasic(insertTask); + IsSUCC=dbManager.InsertTaskBasic(insertTask); if(IsSUCC) { - //显示任务单编号 - dbManager.AddTaskNumber(); - ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); - // + //根据用户查出部门ID + QString DeptId=dbManager.SelectDeptData("函数内默认添加")[0].id; + //获取选中的委托人ID + + QString CustomerID=""; + if(_model->rowCount()>0){ + QModelIndex currentIndex = _model->index(ui->combox_customer->currentIndex(),0); + CustomerID=currentIndex.data().toString(); + } + + //新增任务单设备 QString NewTaskId=dbManager.getCreateTaskListNew()[0].id; int count=0; - IsSUCC; if(SelectDataItem.count()!=0 && _IdList.count()!=0){ //InsertOrderSampleRelation foreach(TestedCatDevice DeviceInfo,SelectDataItem) { + //样品表 OrderSampleRelation orderSampleRelation; id = dbManager.generateId(); orderSampleRelation.id=QString::number(id); @@ -413,11 +420,41 @@ orderSampleRelation.sample_model=DeviceInfo.model; orderSampleRelation.measure_complete_time=QDateTime::currentDateTime(); IsSUCC=dbManager.InsertOrderSampleRelation(orderSampleRelation); - if(!IsSUCC){ShowMessageBox("提示","设备添加失败");} + + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=_IdList[count]; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + + if(!IsSUCC){ShowMessageBox("提示",QString("设备名称为: 1% 添加失败").arg(DeviceInfo.equipment_name));} count++; } - } - if(IsSUCC){ShowMessageBox("提示","委托单添加成功");} + }else{ + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=""; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + } + + + if(IsSUCC){ + ShowMessageBox("提示","委托单添加成功"); + //显示任务单编号 + dbManager.AddTaskNumber(); + ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); + } }else { @@ -446,7 +483,12 @@ ui->deliverer_tel->setText(data[0].deliverer_tel); ui->undertaker_name->setText(data[0].undertaker_name); ui->undertake_time->setDateTime(data[0].undertake_time); - ui->is_urgent->addItem(data[0].is_urgent); + if(data[0].is_urgent=="1"){ + ui->is_urgent->addItem("是"); + }else{ + ui->is_urgent->addItem("否"); + } + ui->comboBox_5->addItem(data[0].DEPT_FULL_NAME); ui->receive_illustrate->setText(data[0].receive_illustrate); //设备数据 @@ -516,6 +558,39 @@ } } +void Create_Task::SetHomePaheComboBox() +{ + // 创建 QStandardItemModel + /* + QStandardItemModel *model = new QStandardItemModel(0, 3, this); // 0 rows, 2 columns + model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"<<"dept"); // 设置列标题（可选） + + QList items; + items.append(new QStandardItem(data.id)); // ID + items.append(new QStandardItem(data.customer_name)); // Name + items.append(new QStandardItem(data.DEPT_FULL_NAME)); // Name + model->appendRow(items); + */ + ui->combox_customer->addItem("ALL"); + ui->combox_task_no->addItem("ALL"); + ui->combox_dept->addItem("ALL"); +} +void Create_Task::SetPartPageComBox() +{ + + QList data=BaseCommonApi::SelectCustomerData(); + + _model = new QStandardItemModel(0, 2); // 0 rows, 2 columns + _model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"); // 设置列标题（可选） + foreach (biz_resource_customer_info item, data) { + QList items; + items.append(new QStandardItem(item.id)); // ID + items.append(new QStandardItem(item.customer_name)); // Name + _model->appendRow(items); + } + ui->customer_name->setModel(_model); + ui->customer_name->setModelColumn(1); // 显示 Name +} diff --git a/softwareDirectory/AutoVerScheme/create_task.h b/softwareDirectory/AutoVerScheme/create_task.h index 4eeba7a..a6106b2 100644 --- a/softwareDirectory/AutoVerScheme/create_task.h +++ b/softwareDirectory/AutoVerScheme/create_task.h @@ -39,6 +39,8 @@ void on_pushButton_8_clicked(); void on_deletebutton_clicked(); + void SetHomePaheComboBox(); + void SetPartPageComBox(); private: @@ -47,6 +49,7 @@ QList SelectDataItem; QList _IdList; QString TaskId; + QStandardItemModel *_model; private: Ui::Create_Task *ui; }; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index 66b8acb..1eb6827 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -88,6 +88,8 @@ void Create_Task::Load() { + //combox设置 + SetHomePaheComboBox(); //先设置为行为0 ui->tableWidget->setRowCount(0); ui->stackedWidget->setCurrentIndex(0); @@ -263,12 +265,9 @@ ui->customer_name->clear(); ui->stackedWidget->setCurrentIndex(1); Create_Task::State="Create"; - //查询出所有委托方和部门 - QList data=BaseCommonApi::getSelectSpecifyFields(); - foreach (SelectSpecifyFields item,data) { - ui->customer_name->addItem(item.customer_name); - ui->comboBox_5->addItem(item.FULL_NAME); - } + //查询出所有委托方 + SetPartPageComBox(); + ui->tableWidgetItem->setRowCount(0); ui->is_urgent->addItem("是"); ui->is_urgent->addItem("否"); @@ -346,6 +345,7 @@ // ======================================================================================== // 保存任务单按钮 先新增任务单 后新增任务单设备 // ==================================================================================== + bool IsSUCC=false; if(State=="Update") { if(TaskId=="")return; @@ -365,7 +365,7 @@ }else{insertTask.is_urgent=false;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.UpdateTask(insertTask); + IsSUCC=dbManager.UpdateTask(insertTask); //设备更新 编辑设备待写 }else{ @@ -388,22 +388,29 @@ insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.InsertTaskBasic(insertTask); + IsSUCC=dbManager.InsertTaskBasic(insertTask); if(IsSUCC) { - //显示任务单编号 - dbManager.AddTaskNumber(); - ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); - // + //根据用户查出部门ID + QString DeptId=dbManager.SelectDeptData("函数内默认添加")[0].id; + //获取选中的委托人ID + + QString CustomerID=""; + if(_model->rowCount()>0){ + QModelIndex currentIndex = _model->index(ui->combox_customer->currentIndex(),0); + CustomerID=currentIndex.data().toString(); + } + + //新增任务单设备 QString NewTaskId=dbManager.getCreateTaskListNew()[0].id; int count=0; - IsSUCC; if(SelectDataItem.count()!=0 && _IdList.count()!=0){ //InsertOrderSampleRelation foreach(TestedCatDevice DeviceInfo,SelectDataItem) { + //样品表 OrderSampleRelation orderSampleRelation; id = dbManager.generateId(); orderSampleRelation.id=QString::number(id); @@ -413,11 +420,41 @@ orderSampleRelation.sample_model=DeviceInfo.model; orderSampleRelation.measure_complete_time=QDateTime::currentDateTime(); IsSUCC=dbManager.InsertOrderSampleRelation(orderSampleRelation); - if(!IsSUCC){ShowMessageBox("提示","设备添加失败");} + + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=_IdList[count]; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + + if(!IsSUCC){ShowMessageBox("提示",QString("设备名称为: 1% 添加失败").arg(DeviceInfo.equipment_name));} count++; } - } - if(IsSUCC){ShowMessageBox("提示","委托单添加成功");} + }else{ + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=""; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + } + + + if(IsSUCC){ + ShowMessageBox("提示","委托单添加成功"); + //显示任务单编号 + dbManager.AddTaskNumber(); + ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); + } }else { @@ -446,7 +483,12 @@ ui->deliverer_tel->setText(data[0].deliverer_tel); ui->undertaker_name->setText(data[0].undertaker_name); ui->undertake_time->setDateTime(data[0].undertake_time); - ui->is_urgent->addItem(data[0].is_urgent); + if(data[0].is_urgent=="1"){ + ui->is_urgent->addItem("是"); + }else{ + ui->is_urgent->addItem("否"); + } + ui->comboBox_5->addItem(data[0].DEPT_FULL_NAME); ui->receive_illustrate->setText(data[0].receive_illustrate); //设备数据 @@ -516,6 +558,39 @@ } } +void Create_Task::SetHomePaheComboBox() +{ + // 创建 QStandardItemModel + /* + QStandardItemModel *model = new QStandardItemModel(0, 3, this); // 0 rows, 2 columns + model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"<<"dept"); // 设置列标题（可选） + + QList items; + items.append(new QStandardItem(data.id)); // ID + items.append(new QStandardItem(data.customer_name)); // Name + items.append(new QStandardItem(data.DEPT_FULL_NAME)); // Name + model->appendRow(items); + */ + ui->combox_customer->addItem("ALL"); + ui->combox_task_no->addItem("ALL"); + ui->combox_dept->addItem("ALL"); +} +void Create_Task::SetPartPageComBox() +{ + + QList data=BaseCommonApi::SelectCustomerData(); + + _model = new QStandardItemModel(0, 2); // 0 rows, 2 columns + _model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"); // 设置列标题（可选） + foreach (biz_resource_customer_info item, data) { + QList items; + items.append(new QStandardItem(item.id)); // ID + items.append(new QStandardItem(item.customer_name)); // Name + _model->appendRow(items); + } + ui->customer_name->setModel(_model); + ui->customer_name->setModelColumn(1); // 显示 Name +} diff --git a/softwareDirectory/AutoVerScheme/create_task.h b/softwareDirectory/AutoVerScheme/create_task.h index 4eeba7a..a6106b2 100644 --- a/softwareDirectory/AutoVerScheme/create_task.h +++ b/softwareDirectory/AutoVerScheme/create_task.h @@ -39,6 +39,8 @@ void on_pushButton_8_clicked(); void on_deletebutton_clicked(); + void SetHomePaheComboBox(); + void SetPartPageComBox(); private: @@ -47,6 +49,7 @@ QList SelectDataItem; QList _IdList; QString TaskId; + QStandardItemModel *_model; private: Ui::Create_Task *ui; }; diff --git a/softwareDirectory/AutoVerScheme/create_task.ui b/softwareDirectory/AutoVerScheme/create_task.ui index c23d487..37c9121 100644 --- a/softwareDirectory/AutoVerScheme/create_task.ui +++ b/softwareDirectory/AutoVerScheme/create_task.ui @@ -80,7 +80,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index 66b8acb..1eb6827 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -88,6 +88,8 @@ void Create_Task::Load() { + //combox设置 + SetHomePaheComboBox(); //先设置为行为0 ui->tableWidget->setRowCount(0); ui->stackedWidget->setCurrentIndex(0); @@ -263,12 +265,9 @@ ui->customer_name->clear(); ui->stackedWidget->setCurrentIndex(1); Create_Task::State="Create"; - //查询出所有委托方和部门 - QList data=BaseCommonApi::getSelectSpecifyFields(); - foreach (SelectSpecifyFields item,data) { - ui->customer_name->addItem(item.customer_name); - ui->comboBox_5->addItem(item.FULL_NAME); - } + //查询出所有委托方 + SetPartPageComBox(); + ui->tableWidgetItem->setRowCount(0); ui->is_urgent->addItem("是"); ui->is_urgent->addItem("否"); @@ -346,6 +345,7 @@ // ======================================================================================== // 保存任务单按钮 先新增任务单 后新增任务单设备 // ==================================================================================== + bool IsSUCC=false; if(State=="Update") { if(TaskId=="")return; @@ -365,7 +365,7 @@ }else{insertTask.is_urgent=false;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.UpdateTask(insertTask); + IsSUCC=dbManager.UpdateTask(insertTask); //设备更新 编辑设备待写 }else{ @@ -388,22 +388,29 @@ insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.InsertTaskBasic(insertTask); + IsSUCC=dbManager.InsertTaskBasic(insertTask); if(IsSUCC) { - //显示任务单编号 - dbManager.AddTaskNumber(); - ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); - // + //根据用户查出部门ID + QString DeptId=dbManager.SelectDeptData("函数内默认添加")[0].id; + //获取选中的委托人ID + + QString CustomerID=""; + if(_model->rowCount()>0){ + QModelIndex currentIndex = _model->index(ui->combox_customer->currentIndex(),0); + CustomerID=currentIndex.data().toString(); + } + + //新增任务单设备 QString NewTaskId=dbManager.getCreateTaskListNew()[0].id; int count=0; - IsSUCC; if(SelectDataItem.count()!=0 && _IdList.count()!=0){ //InsertOrderSampleRelation foreach(TestedCatDevice DeviceInfo,SelectDataItem) { + //样品表 OrderSampleRelation orderSampleRelation; id = dbManager.generateId(); orderSampleRelation.id=QString::number(id); @@ -413,11 +420,41 @@ orderSampleRelation.sample_model=DeviceInfo.model; orderSampleRelation.measure_complete_time=QDateTime::currentDateTime(); IsSUCC=dbManager.InsertOrderSampleRelation(orderSampleRelation); - if(!IsSUCC){ShowMessageBox("提示","设备添加失败");} + + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=_IdList[count]; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + + if(!IsSUCC){ShowMessageBox("提示",QString("设备名称为: 1% 添加失败").arg(DeviceInfo.equipment_name));} count++; } - } - if(IsSUCC){ShowMessageBox("提示","委托单添加成功");} + }else{ + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=""; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + } + + + if(IsSUCC){ + ShowMessageBox("提示","委托单添加成功"); + //显示任务单编号 + dbManager.AddTaskNumber(); + ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); + } }else { @@ -446,7 +483,12 @@ ui->deliverer_tel->setText(data[0].deliverer_tel); ui->undertaker_name->setText(data[0].undertaker_name); ui->undertake_time->setDateTime(data[0].undertake_time); - ui->is_urgent->addItem(data[0].is_urgent); + if(data[0].is_urgent=="1"){ + ui->is_urgent->addItem("是"); + }else{ + ui->is_urgent->addItem("否"); + } + ui->comboBox_5->addItem(data[0].DEPT_FULL_NAME); ui->receive_illustrate->setText(data[0].receive_illustrate); //设备数据 @@ -516,6 +558,39 @@ } } +void Create_Task::SetHomePaheComboBox() +{ + // 创建 QStandardItemModel + /* + QStandardItemModel *model = new QStandardItemModel(0, 3, this); // 0 rows, 2 columns + model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"<<"dept"); // 设置列标题（可选） + + QList items; + items.append(new QStandardItem(data.id)); // ID + items.append(new QStandardItem(data.customer_name)); // Name + items.append(new QStandardItem(data.DEPT_FULL_NAME)); // Name + model->appendRow(items); + */ + ui->combox_customer->addItem("ALL"); + ui->combox_task_no->addItem("ALL"); + ui->combox_dept->addItem("ALL"); +} +void Create_Task::SetPartPageComBox() +{ + + QList data=BaseCommonApi::SelectCustomerData(); + + _model = new QStandardItemModel(0, 2); // 0 rows, 2 columns + _model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"); // 设置列标题（可选） + foreach (biz_resource_customer_info item, data) { + QList items; + items.append(new QStandardItem(item.id)); // ID + items.append(new QStandardItem(item.customer_name)); // Name + _model->appendRow(items); + } + ui->customer_name->setModel(_model); + ui->customer_name->setModelColumn(1); // 显示 Name +} diff --git a/softwareDirectory/AutoVerScheme/create_task.h b/softwareDirectory/AutoVerScheme/create_task.h index 4eeba7a..a6106b2 100644 --- a/softwareDirectory/AutoVerScheme/create_task.h +++ b/softwareDirectory/AutoVerScheme/create_task.h @@ -39,6 +39,8 @@ void on_pushButton_8_clicked(); void on_deletebutton_clicked(); + void SetHomePaheComboBox(); + void SetPartPageComBox(); private: @@ -47,6 +49,7 @@ QList SelectDataItem; QList _IdList; QString TaskId; + QStandardItemModel *_model; private: Ui::Create_Task *ui; }; diff --git a/softwareDirectory/AutoVerScheme/create_task.ui b/softwareDirectory/AutoVerScheme/create_task.ui index c23d487..37c9121 100644 --- a/softwareDirectory/AutoVerScheme/create_task.ui +++ b/softwareDirectory/AutoVerScheme/create_task.ui @@ -80,7 +80,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index bae72d0..0d0fa07 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -38,7 +38,7 @@ //初始化TableWidget 设置列 QStringList headers; - headers << "序号" << "设备名称" << "型号规则" << "辅助字段" << "辅助字段"<< "出厂编号" + headers << "序号" << "设备名称" << "型号规则" << "辅助字段" << "出厂编号" << "生产厂家" <<"委托方"<<"使用部门"<<"要求检完时间"<<"是否加急"; ui->tableWidget->setHorizontalHeaderLabels(headers); @@ -69,7 +69,7 @@ // 调用数据库管理器的函数获取数据 //模拟用户ID - QString userId="1695282436182188034"; + QString userId=""; QList data = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index 66b8acb..1eb6827 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -88,6 +88,8 @@ void Create_Task::Load() { + //combox设置 + SetHomePaheComboBox(); //先设置为行为0 ui->tableWidget->setRowCount(0); ui->stackedWidget->setCurrentIndex(0); @@ -263,12 +265,9 @@ ui->customer_name->clear(); ui->stackedWidget->setCurrentIndex(1); Create_Task::State="Create"; - //查询出所有委托方和部门 - QList data=BaseCommonApi::getSelectSpecifyFields(); - foreach (SelectSpecifyFields item,data) { - ui->customer_name->addItem(item.customer_name); - ui->comboBox_5->addItem(item.FULL_NAME); - } + //查询出所有委托方 + SetPartPageComBox(); + ui->tableWidgetItem->setRowCount(0); ui->is_urgent->addItem("是"); ui->is_urgent->addItem("否"); @@ -346,6 +345,7 @@ // ======================================================================================== // 保存任务单按钮 先新增任务单 后新增任务单设备 // ==================================================================================== + bool IsSUCC=false; if(State=="Update") { if(TaskId=="")return; @@ -365,7 +365,7 @@ }else{insertTask.is_urgent=false;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.UpdateTask(insertTask); + IsSUCC=dbManager.UpdateTask(insertTask); //设备更新 编辑设备待写 }else{ @@ -388,22 +388,29 @@ insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.InsertTaskBasic(insertTask); + IsSUCC=dbManager.InsertTaskBasic(insertTask); if(IsSUCC) { - //显示任务单编号 - dbManager.AddTaskNumber(); - ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); - // + //根据用户查出部门ID + QString DeptId=dbManager.SelectDeptData("函数内默认添加")[0].id; + //获取选中的委托人ID + + QString CustomerID=""; + if(_model->rowCount()>0){ + QModelIndex currentIndex = _model->index(ui->combox_customer->currentIndex(),0); + CustomerID=currentIndex.data().toString(); + } + + //新增任务单设备 QString NewTaskId=dbManager.getCreateTaskListNew()[0].id; int count=0; - IsSUCC; if(SelectDataItem.count()!=0 && _IdList.count()!=0){ //InsertOrderSampleRelation foreach(TestedCatDevice DeviceInfo,SelectDataItem) { + //样品表 OrderSampleRelation orderSampleRelation; id = dbManager.generateId(); orderSampleRelation.id=QString::number(id); @@ -413,11 +420,41 @@ orderSampleRelation.sample_model=DeviceInfo.model; orderSampleRelation.measure_complete_time=QDateTime::currentDateTime(); IsSUCC=dbManager.InsertOrderSampleRelation(orderSampleRelation); - if(!IsSUCC){ShowMessageBox("提示","设备添加失败");} + + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=_IdList[count]; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + + if(!IsSUCC){ShowMessageBox("提示",QString("设备名称为: 1% 添加失败").arg(DeviceInfo.equipment_name));} count++; } - } - if(IsSUCC){ShowMessageBox("提示","委托单添加成功");} + }else{ + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=""; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + } + + + if(IsSUCC){ + ShowMessageBox("提示","委托单添加成功"); + //显示任务单编号 + dbManager.AddTaskNumber(); + ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); + } }else { @@ -446,7 +483,12 @@ ui->deliverer_tel->setText(data[0].deliverer_tel); ui->undertaker_name->setText(data[0].undertaker_name); ui->undertake_time->setDateTime(data[0].undertake_time); - ui->is_urgent->addItem(data[0].is_urgent); + if(data[0].is_urgent=="1"){ + ui->is_urgent->addItem("是"); + }else{ + ui->is_urgent->addItem("否"); + } + ui->comboBox_5->addItem(data[0].DEPT_FULL_NAME); ui->receive_illustrate->setText(data[0].receive_illustrate); //设备数据 @@ -516,6 +558,39 @@ } } +void Create_Task::SetHomePaheComboBox() +{ + // 创建 QStandardItemModel + /* + QStandardItemModel *model = new QStandardItemModel(0, 3, this); // 0 rows, 2 columns + model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"<<"dept"); // 设置列标题（可选） + + QList items; + items.append(new QStandardItem(data.id)); // ID + items.append(new QStandardItem(data.customer_name)); // Name + items.append(new QStandardItem(data.DEPT_FULL_NAME)); // Name + model->appendRow(items); + */ + ui->combox_customer->addItem("ALL"); + ui->combox_task_no->addItem("ALL"); + ui->combox_dept->addItem("ALL"); +} +void Create_Task::SetPartPageComBox() +{ + + QList data=BaseCommonApi::SelectCustomerData(); + + _model = new QStandardItemModel(0, 2); // 0 rows, 2 columns + _model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"); // 设置列标题（可选） + foreach (biz_resource_customer_info item, data) { + QList items; + items.append(new QStandardItem(item.id)); // ID + items.append(new QStandardItem(item.customer_name)); // Name + _model->appendRow(items); + } + ui->customer_name->setModel(_model); + ui->customer_name->setModelColumn(1); // 显示 Name +} diff --git a/softwareDirectory/AutoVerScheme/create_task.h b/softwareDirectory/AutoVerScheme/create_task.h index 4eeba7a..a6106b2 100644 --- a/softwareDirectory/AutoVerScheme/create_task.h +++ b/softwareDirectory/AutoVerScheme/create_task.h @@ -39,6 +39,8 @@ void on_pushButton_8_clicked(); void on_deletebutton_clicked(); + void SetHomePaheComboBox(); + void SetPartPageComBox(); private: @@ -47,6 +49,7 @@ QList SelectDataItem; QList _IdList; QString TaskId; + QStandardItemModel *_model; private: Ui::Create_Task *ui; }; diff --git a/softwareDirectory/AutoVerScheme/create_task.ui b/softwareDirectory/AutoVerScheme/create_task.ui index c23d487..37c9121 100644 --- a/softwareDirectory/AutoVerScheme/create_task.ui +++ b/softwareDirectory/AutoVerScheme/create_task.ui @@ -80,7 +80,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index bae72d0..0d0fa07 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -38,7 +38,7 @@ //初始化TableWidget 设置列 QStringList headers; - headers << "序号" << "设备名称" << "型号规则" << "辅助字段" << "辅助字段"<< "出厂编号" + headers << "序号" << "设备名称" << "型号规则" << "辅助字段" << "出厂编号" << "生产厂家" <<"委托方"<<"使用部门"<<"要求检完时间"<<"是否加急"; ui->tableWidget->setHorizontalHeaderLabels(headers); @@ -69,7 +69,7 @@ // 调用数据库管理器的函数获取数据 //模拟用户ID - QString userId="1695282436182188034"; + QString userId=""; QList data = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; diff --git a/softwareDirectory/AutoVerScheme/my_task.ui b/softwareDirectory/AutoVerScheme/my_task.ui index 39f936a..96646e4 100644 --- a/softwareDirectory/AutoVerScheme/my_task.ui +++ b/softwareDirectory/AutoVerScheme/my_task.ui @@ -140,6 +140,16 @@ + + + 检测状态： + + + + + + + Qt::Horizontal diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 3fd6bbd..412d7b3 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -46,7 +46,12 @@ return result; } //获取我的任务 参数登录用户的id 和 任务状态 +//blei.measure_status 3 为检定中的状态 +//blei.measure_status 4 为检定完 +//blei.measure_status 10 已退回 QList BaseCommonApi::getMyTasks(QString userId,QString status){ + userId=temporary_user_id; + QList result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " @@ -55,7 +60,7 @@ "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " "JOIN biz_business_order_info bo ON bo.id = blei.order_id " "LEFT JOIN sys_dept sd ON blei.measure_dept_id = sd.ID " - " WHERE blei.measure_person_id = :userId " + " WHERE blei.create_user = :userId " " AND blei.measure_status = :status " " ORDER BY blei.update_time DESC"); @@ -163,6 +168,7 @@ return result; } + //创建任务单-查看/编辑 顶部数据 传参该条数据的id QListBaseCommonApi::getCatTask(QString id) { @@ -324,7 +330,34 @@ return isSuccess; } +//新增任务单 信息记录表 +bool BaseCommonApi::InsertTaskInfoRecord(biz_business_lab_executive_info eneity) +{ + eneity.create_user_id=temporary_user_id; + QSqlQuery query; + query.prepare("INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto" + ")VALUES" + "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," + ":create_user_id,:measure_status,:is_auto)"); + // Bind values to the parameters + query.bindValue(":id", eneity.id); + query.bindValue(":order_id", eneity.order_id); + query.bindValue(":sample_id", eneity.sample_id); + query.bindValue(":measure_dept_id", eneity.measure_dept_id); + query.bindValue(":measure_person_id", eneity.measure_person_id); + query.bindValue(":create_user_id", eneity.create_user_id); + query.bindValue(":measure_status","3"); + query.bindValue(":is_auto","0"); + bool isSuccess = query.exec(); + + if (!isSuccess) { + qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + } + + return isSuccess; +} //更新 任务单 bool BaseCommonApi::UpdateTask(InsertTask updateTask) { @@ -666,7 +699,7 @@ * 失真度标准装置 = 18 */ -//根据被检设备ID获取当前设备的 核查项目及核查点 +//根据被检设备ID获取当前设备的 检定项目及检定点 QList BaseCommonApi::Search_CalibrationTable(QString DeiverId,QStringList *HeadList) { @@ -677,14 +710,14 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: - //CliTable[0].id + //CliTable[0].id //1717086652508487681 DataList=BaseCommonApi::getVerMultiCal(CliTable[0].id,HeadList); } return DataList; } -//查找设备对应的装置表 传参设备id +//查找设备对应的装置表 传参设备id 核查项目及核查点 QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; @@ -699,10 +732,6 @@ return DataList; } - - - - //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -1787,3 +1816,41 @@ return isSuccess; } +//根据用户ID查询 当前部门ID和部门名称全程 +QList BaseCommonApi::SelectDeptData(QString UserId) +{ + UserId=temporary_user_id; + QList result; + QSqlQuery query; + bool isSuccess=query.exec(QString("SELECT dept.ID,dept.FULL_NAME FROM sys_dept as " + "dept WHERE dept.CREATE_USER=%1").arg(UserId)); + if (isSuccess) { + while (query.next()) { + Dept info; + info.id = query.value("id").toString(); + info.FULL_NAME = query.value("FULL_NAME").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询出所有委托方 +QList BaseCommonApi::SelectCustomerData() +{ + QList result; + QSqlQuery query; + bool isSuccess=query.exec("SELECT * FROM biz_resource_customer_info"); + if (isSuccess) { + while (query.next()) { + biz_resource_customer_info info; + info.id = query.value("id").toString(); + info.customer_name = query.value("customer_name").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 7b60173..d3945d2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -27,6 +27,7 @@ QDateTime require_over_time; QString is_urgent; }; + //我的任务 class MyTask { @@ -94,7 +95,13 @@ QString customer_name; //委托方名称 QString FULL_NAME; //使用部门 全称 }; - +//查询所有委托方 +class biz_resource_customer_info +{ +public: + QString id; //委托方名录表id和任务单 委托方id 对应 + QString customer_name; //委托方名称 +}; //创建任务单 @@ -127,6 +134,19 @@ QString create_user_id; // 型号规格 QDateTime measure_complete_time; //检定完成时间 }; +//新增任务单信息记录表 +class biz_business_lab_executive_info +{ +public: + QString id; + QString order_id; //委托单ID + QString sample_id; //设备ID + QString measure_dept_id; //部门ID + QString measure_person_id; // 检定人ID + QString create_user_id; // 用户ID + QString measure_status; //默认填3为检测中 + QString is_auto; //默认填0为自动系统检测 +}; //创建任务单编辑 class UpdateTask { @@ -726,6 +746,8 @@ static bool InsertTaskBasic(InsertTask insertTask); //插入任务单 新增任务单样品表 static bool InsertOrderSampleRelation(OrderSampleRelation orderSample); + //插入任务单 新增任务单信息记录表 + static bool InsertTaskInfoRecord(biz_business_lab_executive_info eneity); //更新任务单 编辑 static bool UpdateTask(InsertTask updateTask); //删除任务单 @@ -828,6 +850,10 @@ static QList getLocationInfoList(); //查询所有用户，用于自动检定/核查 结果保存 地点下拉框查询 static QList getUser(); + //根据用户ID查询 当前部门ID和部门名称全程 + static QList SelectDeptData(QString UserId); + //查询出所有委托方 + static QList SelectCustomerData(); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index 66b8acb..1eb6827 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -88,6 +88,8 @@ void Create_Task::Load() { + //combox设置 + SetHomePaheComboBox(); //先设置为行为0 ui->tableWidget->setRowCount(0); ui->stackedWidget->setCurrentIndex(0); @@ -263,12 +265,9 @@ ui->customer_name->clear(); ui->stackedWidget->setCurrentIndex(1); Create_Task::State="Create"; - //查询出所有委托方和部门 - QList data=BaseCommonApi::getSelectSpecifyFields(); - foreach (SelectSpecifyFields item,data) { - ui->customer_name->addItem(item.customer_name); - ui->comboBox_5->addItem(item.FULL_NAME); - } + //查询出所有委托方 + SetPartPageComBox(); + ui->tableWidgetItem->setRowCount(0); ui->is_urgent->addItem("是"); ui->is_urgent->addItem("否"); @@ -346,6 +345,7 @@ // ======================================================================================== // 保存任务单按钮 先新增任务单 后新增任务单设备 // ==================================================================================== + bool IsSUCC=false; if(State=="Update") { if(TaskId=="")return; @@ -365,7 +365,7 @@ }else{insertTask.is_urgent=false;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.UpdateTask(insertTask); + IsSUCC=dbManager.UpdateTask(insertTask); //设备更新 编辑设备待写 }else{ @@ -388,22 +388,29 @@ insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id="0"; - bool IsSUCC=dbManager.InsertTaskBasic(insertTask); + IsSUCC=dbManager.InsertTaskBasic(insertTask); if(IsSUCC) { - //显示任务单编号 - dbManager.AddTaskNumber(); - ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); - // + //根据用户查出部门ID + QString DeptId=dbManager.SelectDeptData("函数内默认添加")[0].id; + //获取选中的委托人ID + + QString CustomerID=""; + if(_model->rowCount()>0){ + QModelIndex currentIndex = _model->index(ui->combox_customer->currentIndex(),0); + CustomerID=currentIndex.data().toString(); + } + + //新增任务单设备 QString NewTaskId=dbManager.getCreateTaskListNew()[0].id; int count=0; - IsSUCC; if(SelectDataItem.count()!=0 && _IdList.count()!=0){ //InsertOrderSampleRelation foreach(TestedCatDevice DeviceInfo,SelectDataItem) { + //样品表 OrderSampleRelation orderSampleRelation; id = dbManager.generateId(); orderSampleRelation.id=QString::number(id); @@ -413,11 +420,41 @@ orderSampleRelation.sample_model=DeviceInfo.model; orderSampleRelation.measure_complete_time=QDateTime::currentDateTime(); IsSUCC=dbManager.InsertOrderSampleRelation(orderSampleRelation); - if(!IsSUCC){ShowMessageBox("提示","设备添加失败");} + + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=_IdList[count]; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + + if(!IsSUCC){ShowMessageBox("提示",QString("设备名称为: 1% 添加失败").arg(DeviceInfo.equipment_name));} count++; } - } - if(IsSUCC){ShowMessageBox("提示","委托单添加成功");} + }else{ + //每条设备对应一个信息表数据 + //增加biz_business_lab_executive_info 总信息表 + biz_business_lab_executive_info entity; + entity.id=QString::number(dbManager.generateId()); + entity.order_id=NewTaskId; + entity.sample_id=""; + entity.create_user_id="函数内默认添加"; + entity.measure_dept_id=DeptId; // + entity.measure_person_id=CustomerID; + IsSUCC=dbManager.InsertTaskInfoRecord(entity); + } + + + if(IsSUCC){ + ShowMessageBox("提示","委托单添加成功"); + //显示任务单编号 + dbManager.AddTaskNumber(); + ui->LineEditNumber->setText(dbManager.GenerateTaskNumber()); + } }else { @@ -446,7 +483,12 @@ ui->deliverer_tel->setText(data[0].deliverer_tel); ui->undertaker_name->setText(data[0].undertaker_name); ui->undertake_time->setDateTime(data[0].undertake_time); - ui->is_urgent->addItem(data[0].is_urgent); + if(data[0].is_urgent=="1"){ + ui->is_urgent->addItem("是"); + }else{ + ui->is_urgent->addItem("否"); + } + ui->comboBox_5->addItem(data[0].DEPT_FULL_NAME); ui->receive_illustrate->setText(data[0].receive_illustrate); //设备数据 @@ -516,6 +558,39 @@ } } +void Create_Task::SetHomePaheComboBox() +{ + // 创建 QStandardItemModel + /* + QStandardItemModel *model = new QStandardItemModel(0, 3, this); // 0 rows, 2 columns + model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"<<"dept"); // 设置列标题（可选） + + QList items; + items.append(new QStandardItem(data.id)); // ID + items.append(new QStandardItem(data.customer_name)); // Name + items.append(new QStandardItem(data.DEPT_FULL_NAME)); // Name + model->appendRow(items); + */ + ui->combox_customer->addItem("ALL"); + ui->combox_task_no->addItem("ALL"); + ui->combox_dept->addItem("ALL"); +} +void Create_Task::SetPartPageComBox() +{ + + QList data=BaseCommonApi::SelectCustomerData(); + + _model = new QStandardItemModel(0, 2); // 0 rows, 2 columns + _model->setHorizontalHeaderLabels(QStringList() << "ID" << "customer"); // 设置列标题（可选） + foreach (biz_resource_customer_info item, data) { + QList items; + items.append(new QStandardItem(item.id)); // ID + items.append(new QStandardItem(item.customer_name)); // Name + _model->appendRow(items); + } + ui->customer_name->setModel(_model); + ui->customer_name->setModelColumn(1); // 显示 Name +} diff --git a/softwareDirectory/AutoVerScheme/create_task.h b/softwareDirectory/AutoVerScheme/create_task.h index 4eeba7a..a6106b2 100644 --- a/softwareDirectory/AutoVerScheme/create_task.h +++ b/softwareDirectory/AutoVerScheme/create_task.h @@ -39,6 +39,8 @@ void on_pushButton_8_clicked(); void on_deletebutton_clicked(); + void SetHomePaheComboBox(); + void SetPartPageComBox(); private: @@ -47,6 +49,7 @@ QList SelectDataItem; QList _IdList; QString TaskId; + QStandardItemModel *_model; private: Ui::Create_Task *ui; }; diff --git a/softwareDirectory/AutoVerScheme/create_task.ui b/softwareDirectory/AutoVerScheme/create_task.ui index c23d487..37c9121 100644 --- a/softwareDirectory/AutoVerScheme/create_task.ui +++ b/softwareDirectory/AutoVerScheme/create_task.ui @@ -80,7 +80,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/softwareDirectory/AutoVerScheme/my_task.cpp b/softwareDirectory/AutoVerScheme/my_task.cpp index bae72d0..0d0fa07 100644 --- a/softwareDirectory/AutoVerScheme/my_task.cpp +++ b/softwareDirectory/AutoVerScheme/my_task.cpp @@ -38,7 +38,7 @@ //初始化TableWidget 设置列 QStringList headers; - headers << "序号" << "设备名称" << "型号规则" << "辅助字段" << "辅助字段"<< "出厂编号" + headers << "序号" << "设备名称" << "型号规则" << "辅助字段" << "出厂编号" << "生产厂家" <<"委托方"<<"使用部门"<<"要求检完时间"<<"是否加急"; ui->tableWidget->setHorizontalHeaderLabels(headers); @@ -69,7 +69,7 @@ // 调用数据库管理器的函数获取数据 //模拟用户ID - QString userId="1695282436182188034"; + QString userId=""; QList data = BaseCommonApi::getMyTasks(userId,"3"); int rowCount = 0; diff --git a/softwareDirectory/AutoVerScheme/my_task.ui b/softwareDirectory/AutoVerScheme/my_task.ui index 39f936a..96646e4 100644 --- a/softwareDirectory/AutoVerScheme/my_task.ui +++ b/softwareDirectory/AutoVerScheme/my_task.ui @@ -140,6 +140,16 @@ + + + 检测状态： + + + + + + + Qt::Horizontal diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp index 4b6a5e0..eda35ae 100644 --- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp @@ -204,7 +204,7 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList bizDeviceManageData=dbManager.getCheckDCPower(id,&headlist); + QList Data=dbManager.Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidgetItem->setRowCount(0); @@ -214,23 +214,19 @@ int rowCount=0; int row=0; - for (const CheckDCPower& checkDCPower : bizDeviceManageData) + for (const QStringList& item : Data) { + //获取行号 并进行添加行 rowCount = ui->tableWidgetItem->rowCount(); ui->tableWidgetItem->insertRow(rowCount); + //添加 序号 ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidgetItem->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidgetItem->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidgetItem->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidgetItem->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidgetItem->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidgetItem->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidgetItem->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidgetItem->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidgetItem->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位 - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); + //循环读取值 headlist，count是列的数量 + for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); + } - //QDebug row++; }