diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()< result; QSqlQuery query; query.prepare("SELECT blei.id AS id, eei.equipment_name AS sampleName, eei.model AS sampleModel, eei.help_instruction AS helpInstruction, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index a70890d..c11b9fd 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -25,7 +25,7 @@ QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); +// QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -40,32 +40,32 @@ int rowCount=0; int row=0; - for (const QStringList& item : ptList) - { - rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); +// for (const QStringList& item : ptList) +// { +// rowCount = ui->tableWidget->rowCount(); +// ui->tableWidget->insertRow(rowCount); +// /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 +// ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 +// ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 +// ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel +// ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 +// ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ +// //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); - //QDebug - //循环读取值 headlist，count是列的数量 - for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); - } - row++; +// //QDebug +// //循环读取值 headlist，count是列的数量 +// for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); +// } +// row++; - } +// } } void FormVeryPoint::on_pushButton_14_clicked() { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index a70890d..c11b9fd 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -25,7 +25,7 @@ QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); +// QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -40,32 +40,32 @@ int rowCount=0; int row=0; - for (const QStringList& item : ptList) - { - rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); +// for (const QStringList& item : ptList) +// { +// rowCount = ui->tableWidget->rowCount(); +// ui->tableWidget->insertRow(rowCount); +// /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 +// ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 +// ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 +// ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel +// ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 +// ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ +// //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); - //QDebug - //循环读取值 headlist，count是列的数量 - for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); - } - row++; +// //QDebug +// //循环读取值 headlist，count是列的数量 +// for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); +// } +// row++; - } +// } } void FormVeryPoint::on_pushButton_14_clicked() { diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index bfada13..44ce662 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -256,29 +256,29 @@ // ==================================================================================== QStringList headlist; - QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); +// QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); ui->tableWidgetItem->setHorizontalHeaderLabels(headlist); //循环数据 rowCount=0; row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void InspectDataItem::SetHomePaheCombox(CheckData entity) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index a70890d..c11b9fd 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -25,7 +25,7 @@ QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); +// QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -40,32 +40,32 @@ int rowCount=0; int row=0; - for (const QStringList& item : ptList) - { - rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); +// for (const QStringList& item : ptList) +// { +// rowCount = ui->tableWidget->rowCount(); +// ui->tableWidget->insertRow(rowCount); +// /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 +// ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 +// ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 +// ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel +// ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 +// ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ +// //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); - //QDebug - //循环读取值 headlist，count是列的数量 - for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); - } - row++; +// //QDebug +// //循环读取值 headlist，count是列的数量 +// for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); +// } +// row++; - } +// } } void FormVeryPoint::on_pushButton_14_clicked() { diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index bfada13..44ce662 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -256,29 +256,29 @@ // ==================================================================================== QStringList headlist; - QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); +// QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); ui->tableWidgetItem->setHorizontalHeaderLabels(headlist); //循环数据 rowCount=0; row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void InspectDataItem::SetHomePaheCombox(CheckData entity) { diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 64b173b..4680544 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -157,53 +157,54 @@ idList = checkIds.split(","); for(const QString& id : idList) { - CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); +// CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); //QList result = BaseCommonApi::getTestedCatDevice(id); - if(result.id!=""){ - rowCount = ui->tableWidget->rowCount(); +// if(result.id!="") +// { +// rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); - QPushButton *btn_1 = new QPushButton(); - btn_1->setText(tr("设置命令")); - btn_1->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_1->setCursor(Qt::PointingHandCursor); - int type=0; - connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { - on_cmdButton_clicked(type,id); - }); +// ui->tableWidget->insertRow(rowCount); +// ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); +// QPushButton *btn_1 = new QPushButton(); +// btn_1->setText(tr("设置命令")); +// btn_1->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_1->setCursor(Qt::PointingHandCursor); +// int type=0; +// connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { +// on_cmdButton_clicked(type,id); +// }); - btn_1->setIconSize(QSize(16,16)); - btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); - QPushButton *btn_2 = new QPushButton(); - btn_2->setText(tr("设置设备接口")); - btn_2->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_2->setCursor(Qt::PointingHandCursor); - connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { - on_commButton_clicked(type,id); - }); - btn_2->setIconSize(QSize(16,16)); - btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); - QWidget *tmp_widget = new QWidget(); - QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); - tmp_layout->addWidget(btn_1); - tmp_layout->addWidget(btn_2); - tmp_layout->setMargin(0); - ui->tableWidget->setCellWidget(row,5,tmp_widget); - row++; - } +// btn_1->setIconSize(QSize(16,16)); +// btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); +// QPushButton *btn_2 = new QPushButton(); +// btn_2->setText(tr("设置设备接口")); +// btn_2->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_2->setCursor(Qt::PointingHandCursor); +// connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { +// on_commButton_clicked(type,id); +// }); +// btn_2->setIconSize(QSize(16,16)); +// btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); +// QWidget *tmp_widget = new QWidget(); +// QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); +// tmp_layout->addWidget(btn_1); +// tmp_layout->addWidget(btn_2); +// tmp_layout->setMargin(0); +// ui->tableWidget->setCellWidget(row,5,tmp_widget); +// row++; +// } } idList.clear(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index a70890d..c11b9fd 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -25,7 +25,7 @@ QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); +// QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -40,32 +40,32 @@ int rowCount=0; int row=0; - for (const QStringList& item : ptList) - { - rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); +// for (const QStringList& item : ptList) +// { +// rowCount = ui->tableWidget->rowCount(); +// ui->tableWidget->insertRow(rowCount); +// /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 +// ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 +// ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 +// ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel +// ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 +// ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ +// //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); - //QDebug - //循环读取值 headlist，count是列的数量 - for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); - } - row++; +// //QDebug +// //循环读取值 headlist，count是列的数量 +// for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); +// } +// row++; - } +// } } void FormVeryPoint::on_pushButton_14_clicked() { diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index bfada13..44ce662 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -256,29 +256,29 @@ // ==================================================================================== QStringList headlist; - QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); +// QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); ui->tableWidgetItem->setHorizontalHeaderLabels(headlist); //循环数据 rowCount=0; row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void InspectDataItem::SetHomePaheCombox(CheckData entity) { diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 64b173b..4680544 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -157,53 +157,54 @@ idList = checkIds.split(","); for(const QString& id : idList) { - CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); +// CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); //QList result = BaseCommonApi::getTestedCatDevice(id); - if(result.id!=""){ - rowCount = ui->tableWidget->rowCount(); +// if(result.id!="") +// { +// rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); - QPushButton *btn_1 = new QPushButton(); - btn_1->setText(tr("设置命令")); - btn_1->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_1->setCursor(Qt::PointingHandCursor); - int type=0; - connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { - on_cmdButton_clicked(type,id); - }); +// ui->tableWidget->insertRow(rowCount); +// ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); +// QPushButton *btn_1 = new QPushButton(); +// btn_1->setText(tr("设置命令")); +// btn_1->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_1->setCursor(Qt::PointingHandCursor); +// int type=0; +// connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { +// on_cmdButton_clicked(type,id); +// }); - btn_1->setIconSize(QSize(16,16)); - btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); - QPushButton *btn_2 = new QPushButton(); - btn_2->setText(tr("设置设备接口")); - btn_2->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_2->setCursor(Qt::PointingHandCursor); - connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { - on_commButton_clicked(type,id); - }); - btn_2->setIconSize(QSize(16,16)); - btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); - QWidget *tmp_widget = new QWidget(); - QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); - tmp_layout->addWidget(btn_1); - tmp_layout->addWidget(btn_2); - tmp_layout->setMargin(0); - ui->tableWidget->setCellWidget(row,5,tmp_widget); - row++; - } +// btn_1->setIconSize(QSize(16,16)); +// btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); +// QPushButton *btn_2 = new QPushButton(); +// btn_2->setText(tr("设置设备接口")); +// btn_2->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_2->setCursor(Qt::PointingHandCursor); +// connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { +// on_commButton_clicked(type,id); +// }); +// btn_2->setIconSize(QSize(16,16)); +// btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); +// QWidget *tmp_widget = new QWidget(); +// QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); +// tmp_layout->addWidget(btn_1); +// tmp_layout->addWidget(btn_2); +// tmp_layout->setMargin(0); +// ui->tableWidget->setCellWidget(row,5,tmp_widget); +// row++; +// } } idList.clear(); } diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp index 3ef9d60..f50bc56 100644 --- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp @@ -235,7 +235,7 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList Data=dbManager.Search_VerifyTable(id,&headlist); +// QList Data=dbManager.Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidgetItem->setRowCount(0); @@ -245,22 +245,22 @@ int rowCount=0; int row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void Standard_DeviceItem::SetHomePaheCombox(BizDevice entity) { @@ -373,6 +373,3 @@ - - - diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index a70890d..c11b9fd 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -25,7 +25,7 @@ QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); +// QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -40,32 +40,32 @@ int rowCount=0; int row=0; - for (const QStringList& item : ptList) - { - rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); +// for (const QStringList& item : ptList) +// { +// rowCount = ui->tableWidget->rowCount(); +// ui->tableWidget->insertRow(rowCount); +// /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 +// ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 +// ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 +// ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel +// ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 +// ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ +// //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); - //QDebug - //循环读取值 headlist，count是列的数量 - for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); - } - row++; +// //QDebug +// //循环读取值 headlist，count是列的数量 +// for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); +// } +// row++; - } +// } } void FormVeryPoint::on_pushButton_14_clicked() { diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index bfada13..44ce662 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -256,29 +256,29 @@ // ==================================================================================== QStringList headlist; - QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); +// QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); ui->tableWidgetItem->setHorizontalHeaderLabels(headlist); //循环数据 rowCount=0; row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void InspectDataItem::SetHomePaheCombox(CheckData entity) { diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 64b173b..4680544 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -157,53 +157,54 @@ idList = checkIds.split(","); for(const QString& id : idList) { - CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); +// CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); //QList result = BaseCommonApi::getTestedCatDevice(id); - if(result.id!=""){ - rowCount = ui->tableWidget->rowCount(); +// if(result.id!="") +// { +// rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); - QPushButton *btn_1 = new QPushButton(); - btn_1->setText(tr("设置命令")); - btn_1->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_1->setCursor(Qt::PointingHandCursor); - int type=0; - connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { - on_cmdButton_clicked(type,id); - }); +// ui->tableWidget->insertRow(rowCount); +// ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); +// QPushButton *btn_1 = new QPushButton(); +// btn_1->setText(tr("设置命令")); +// btn_1->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_1->setCursor(Qt::PointingHandCursor); +// int type=0; +// connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { +// on_cmdButton_clicked(type,id); +// }); - btn_1->setIconSize(QSize(16,16)); - btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); - QPushButton *btn_2 = new QPushButton(); - btn_2->setText(tr("设置设备接口")); - btn_2->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_2->setCursor(Qt::PointingHandCursor); - connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { - on_commButton_clicked(type,id); - }); - btn_2->setIconSize(QSize(16,16)); - btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); - QWidget *tmp_widget = new QWidget(); - QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); - tmp_layout->addWidget(btn_1); - tmp_layout->addWidget(btn_2); - tmp_layout->setMargin(0); - ui->tableWidget->setCellWidget(row,5,tmp_widget); - row++; - } +// btn_1->setIconSize(QSize(16,16)); +// btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); +// QPushButton *btn_2 = new QPushButton(); +// btn_2->setText(tr("设置设备接口")); +// btn_2->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_2->setCursor(Qt::PointingHandCursor); +// connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { +// on_commButton_clicked(type,id); +// }); +// btn_2->setIconSize(QSize(16,16)); +// btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); +// QWidget *tmp_widget = new QWidget(); +// QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); +// tmp_layout->addWidget(btn_1); +// tmp_layout->addWidget(btn_2); +// tmp_layout->setMargin(0); +// ui->tableWidget->setCellWidget(row,5,tmp_widget); +// row++; +// } } idList.clear(); } diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp index 3ef9d60..f50bc56 100644 --- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp @@ -235,7 +235,7 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList Data=dbManager.Search_VerifyTable(id,&headlist); +// QList Data=dbManager.Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidgetItem->setRowCount(0); @@ -245,22 +245,22 @@ int rowCount=0; int row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void Standard_DeviceItem::SetHomePaheCombox(BizDevice entity) { @@ -373,6 +373,3 @@ - - - diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 93a904e..46c29c2 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -34,7 +34,7 @@ int rowCount=0; int row=0; bizDeviceList.clear(); - bizDeviceList = BaseCommonApi::getCheckDeviceList(); +// bizDeviceList = BaseCommonApi::getCheckDeviceList(); QString sFilterName = ui->lineEdit->text(); QString sFilterModel = ui->lineEdit_2->text(); QString sFilterNo = ui->lineEdit_3->text(); @@ -74,7 +74,7 @@ int rowCount=0; int row=0; testedDeviceList.clear(); - testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); +// testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); QString sFilterName = ui->lineEdit_4->text(); QString sFilterModel = ui->lineEdit_5->text(); QString sFilterNo = ui->lineEdit_6->text(); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 8887d63..d83d734 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -161,7 +161,7 @@ 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, " - "eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," + " eei.manufacture_no AS manufactureNo, eei.manufacturer,bo.customer_name,sd.SIMPLE_NAME AS measureDeptName,bo.require_over_time ," " bo.is_urgent,blei.measure_status " "FROM biz_business_lab_executive_info blei " "JOIN eqpt_equipment_info eei ON eei.id = blei.sample_id " @@ -753,45 +753,45 @@ } - //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 -QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) -{ +// //核查直流稳压电源检定装置 待修改 禁用 2024年3月20日13:55:12 查询的不对 +//QListBaseCommonApi::getCheckDCPower(QString equipment_id,QStringList *headList) +//{ -// equipment_id="1693435753272557570"; - QList result; - QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " - " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); - // 将参数绑定到占位符 1693435753272557570 - query.bindValue(":equipment_id", equipment_id); - if (query.exec()) { - while (query.next()) { - CheckDCPower checkDCPower; - checkDCPower.id = query.value("id").toString(); - checkDCPower.params = query.value("params").toString(); - checkDCPower.check_point = query.value("check_point").toString(); - checkDCPower.unit = query.value("unit").toString(); - checkDCPower.resolution = query.value("resolution").toString(); - checkDCPower.urel = query.value("urel").toString(); - checkDCPower.check_type = query.value("check_type").toString(); - checkDCPower.datum_point = query.value("datum_point").toString(); - checkDCPower.cycle_number = query.value("cycle_number").toString(); - checkDCPower.resistance_value = query.value("resistance_value").toString(); - checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); - checkDCPower.remark = query.value("remark").toString(); +//// equipment_id="1693435753272557570"; +// QList result; +// QSqlQuery query; +// query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " +// " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); +// // 将参数绑定到占位符 1693435753272557570 +// query.bindValue(":equipment_id", equipment_id); +// if (query.exec()) { +// while (query.next()) { +// CheckDCPower checkDCPower; +// checkDCPower.id = query.value("id").toString(); +// checkDCPower.params = query.value("params").toString(); +// checkDCPower.check_point = query.value("check_point").toString(); +// checkDCPower.unit = query.value("unit").toString(); +// checkDCPower.resolution = query.value("resolution").toString(); +// checkDCPower.urel = query.value("urel").toString(); +// checkDCPower.check_type = query.value("check_type").toString(); +// checkDCPower.datum_point = query.value("datum_point").toString(); +// checkDCPower.cycle_number = query.value("cycle_number").toString(); +// checkDCPower.resistance_value = query.value("resistance_value").toString(); +// checkDCPower.resistance_value_unit = query.value("resistance_value_unit").toString(); +// checkDCPower.remark = query.value("remark").toString(); - result.append(checkDCPower); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result.append(checkDCPower); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" - <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; +// *headList <<"序号"<<"核查项目"<<"核查点"<<"单位"<<"分辨力"<<"Urel"<<"核查类型"<<"是否为基准点(1/0)"<<"循环次数" +// <<"电阻值/频率"<<"电阻值单位/频率单位"<<"核查项备注"; - return result; -} +// return result; +//} //根据id获取装置名称 2024年4月23日17:53:40 主系统数据库已变 //QString BaseCommonApi::getApparatus(QString id,QString name) //{ @@ -881,31 +881,31 @@ return result; } -//核查 判断哪个装置表 -JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) -{ - JudgeCalibrationTable result; - QSqlQuery query; - query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " - " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " - " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); - // 将参数绑定到占位符 '1692796512381222914' - query.bindValue(":deviceId", deviceId); - if (query.exec()) { - while (query.next()) { - JudgeCalibrationTable calibration; - calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); - // QString equipmentValue = query.value("belong_standard_equipment").toString(); +////核查 判断哪个装置表 +//JudgeCalibrationTable BaseCommonApi::getJudgeVerifyTable(QString deviceId) +//{ +// JudgeCalibrationTable result; +// QSqlQuery query; +// query.prepare("SELECT besi.standard_name,bescic.belong_standard_equipment FROM biz_equipment_standard_info besi " +// " JOIN biz_equipment_standard_check_item_category bescic ON bescic.belong_standard_equipment_name = besi.standard_name " +// " WHERE besi.id = ( SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :deviceId )"); +// // 将参数绑定到占位符 '1692796512381222914' +// query.bindValue(":deviceId", deviceId); +// if (query.exec()) { +// while (query.next()) { +// JudgeCalibrationTable calibration; +// calibration.belong_standard_equipment = query.value("belong_standard_equipment").toString(); +// // QString equipmentValue = query.value("belong_standard_equipment").toString(); - result = calibration; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } +// result = calibration; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } - return result; -} +// return result; +//} //判断 检定 哪个装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) @@ -997,7 +997,6 @@ //示波器标准装置 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; - } return DataList; @@ -1047,19 +1046,19 @@ // return DataList; //}; //核查设备对应的装置表 核查项及核查点 传参设备id -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); - break; - } - return DataList; -}; +//QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +//{ +// QList DataList; +// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getVerificationItemsMultiList(DeiverId,HeadList); +// break; +// } +// return DataList; +//}; //判断检定数据管理 结果信息表 QList BaseCommonApi::Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList) { @@ -1074,21 +1073,20 @@ } return DataList; }; -//判断核查数据管理 结果信息表 -QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) -{ - QList DataList; - JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); - if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; - switch(CliTable.belong_standard_equipment.toInt()) - { - case 1: //多功能校准源 - - DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); - break; - } - return DataList; -}; +////判断核查数据管理 结果信息表 +//QList BaseCommonApi::Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList) +//{ +// QList DataList; +//// JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); +// if(CliTable.belong_standard_equipment.isEmpty() || CliTable.belong_standard_equipment.isNull()) return DataList; +// switch(CliTable.belong_standard_equipment.toInt()) +// { +// case 1: //多功能校准源 +// DataList = BaseCommonApi::getCheckDataManageResultManageMult(dataId,HeadList); +// break; +// } +// return DataList; +//}; //被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { @@ -2340,7 +2338,7 @@ " actual_division_value_unit, conclusion, restriction_instruction, outcome," " other_outcome, remark, other_remark, create_user_id, measure_person_id," " create_user_name,meter_identify, create_time, update_time " - " ) VALUES ( " + " ) VALUES ( " " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, " " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, " " :measure_address, :temperature, :humidity, :data_source, :ipri, :ipri_unit, " @@ -3013,13 +3011,13 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage"); + bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment_name,create_name,remark FROM zd_verification_program_manage"); if (isSuccess) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); - programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); programInfo.create_name = query.value("create_name").toString(); // programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); @@ -3030,26 +3028,31 @@ } return result; }; -//核查程序管理-编辑查询单个 + + +//核查程序管理-编辑查询单个 参数核查程序id CheckProgramManage BaseCommonApi::getCheckProgramManageById(QString id) { CheckProgramManage result; QSqlQuery query; - query.prepare("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time " - "FROM zd_verification_program_manage where id = :id "); + query.prepare("SELECT id,check_name,belong_standard_equipment_name,category_name,create_name,create_time,remark,img_path," + " standard_device_id,verification_documents_id FROM zd_verification_program_manage " + "WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { CheckProgramManage programInfo; programInfo.id = query.value("id").toString(); programInfo.check_name = query.value("check_name").toString(); + programInfo.belong_standard_equipment_name = query.value("belong_standard_equipment_name").toString(); + programInfo.category_name = query.value("category_name").toString(); programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); programInfo.img_path = query.value("img_path").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.verification_documents_id = query.value("verification_documents_id").toString(); - programInfo.update_time = query.value("update_time").toDateTime(); +// programInfo.update_time = query.value("update_time").toDateTime(); result = programInfo; } } else { @@ -3057,12 +3060,14 @@ } return result; }; - //核查程序管理-编辑查询 选择设备 选择标准 + + +////核查程序管理-编辑查询 选择设备 选择标准 QList BaseCommonApi::getCheckDeviceList() { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -3078,92 +3083,56 @@ } return result; }; -//核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 -QList BaseCommonApi::getCheckAndTestedDeviceList() -{ - QList result; - QSqlQuery query; - bool isSuccess = query.exec("SELECT " - " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " - " FROM biz_equipment_info bei UNION ALL SELECT " - " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result.append(device); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; - //核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 -QList BaseCommonApi::getVerificationItemsMultiList(QString equipment_id,QStringList *headList) -{ - QList resultData; - QStringList result; - QSqlQuery query; - query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " - "WHERE equipment_id = :equipment_id"); - query.bindValue(":equipment_id", equipment_id); +////核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 +//QList BaseCommonApi::getCheckAndTestedDeviceList(QString standardId) +//{ +// QList result; +// QSqlQuery query; +// bool isSuccess = query.exec("SELECT " +// " bei.id , bei.equipment_name , bei.model , bei.manufacture_no , bei.manufacturer " +// " FROM biz_equipment_info bei UNION ALL SELECT " +// " eei.id , eei.equipment_name , eei.model , eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id;"); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result.append(device); +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; - if (query.exec()) { - while (query.next()) { - result.clear(); - result.append( query.value("id").toString()); - result.append( query.value("item_category_id").toString()); - result.append( query.value("equipment_id").toString()); - result.append( query.value("check_type").toString()); - result.append( query.value("test_type").toString()); - result.append( query.value("params").toString()); - result.append( query.value("unit").toString()); - result.append( query.value("frequency").toString()); - result.append( query.value("check_point").toString()); - result.append( query.value("resolution").toString()); - result.append( query.value("cycle_number").toString()); - result.append( query.value("frequency_unit").toString()); - result.append( query.value("urel").toString()); - result.append( query.value("thoroughfare").toString()); - result.append( query.value("dccp").toString()); - result.append( query.value("flit").toString()); - result.append( query.value("remark").toString()); - result.append( query.value("create_time").toString()); - result.append( query.value("update_time").toString()); - resultData.append(result); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - *headList <<"id"<<"核查项分类id"<<"配套设备id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"分辨力"<<"核查点" - <<"频率单位"<<"循环次数"<<"Urel"<<"通道"<<"TFER"<<"DCCP"<<"FLIT"<<"核查项备注"<<"创建时间"<<"更新时间"; - return resultData; -}; //新增核查程序 bool BaseCommonApi::InsertCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_manage " - " (id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time) " - " VALUES (:id,:check_name,:create_name,:create_time,:remark,:img_path,:standard_device_id, " - " :verification_documents_id,:update_time)"); + query.prepare("INSERT INTO zd_verification_program_manage (id,check_name,create_name,remark,img_path,standard_device_id," + " verification_documents_id,belong_standard_equipment_name,belong_standard_equipment,category_name,equipment_type," + " create_time,update_time) " + " VALUES (:id,:check_name,:create_name,:remark,:img_path,:standard_device_id,:verification_documents_id," + ":belong_standard_equipment_name,:belong_standard_equipment,:category_name,:equipment_type,:create_time,:update_time)"); QString formattedDateTime = check.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", check.id); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); - query.bindValue(":create_time", formattedDateTime); query.bindValue(":remark", check.remark); query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); + query.bindValue(":create_time", formattedDateTime); query.bindValue(":update_time",formattedDateTime); - bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -3176,9 +3145,16 @@ bool BaseCommonApi::UpdateCheckProgramManage(CheckProgramManage check) { QSqlQuery query; - query.prepare("UPDATE zd_verification_program_manage SET check_name =:check_name," - " create_name = :create_name, remark = :remark, img_path =:img_path, standard_device_id =:standard_device_id," - " verification_documents_id=:verification_documents_id, update_time=:update_time WHERE id = :id;"); + query.prepare(" UPDATE zd_verification_program_manage " + " SET check_name =:check_name, create_name = :create_name, remark = :remark, img_path =:img_path, " + " standard_device_id =:standard_device_id," + " verification_documents_id=:verification_documents_id," + " belong_standard_equipment_name=:belong_standard_equipment_name," + " belong_standard_equipment=:belong_standard_equipment," + " category_name=:category_name," + " equipment_type=:equipment_type," + " update_time=:update_time" + " WHERE id = :id;"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":check_name", check.check_name); query.bindValue(":create_name", check.create_name); @@ -3186,6 +3162,10 @@ query.bindValue(":img_path", check.img_path); query.bindValue(":standard_device_id", check.standard_device_id); query.bindValue(":verification_documents_id", check.verification_documents_id); + query.bindValue(":belong_standard_equipment_name", check.belong_standard_equipment_name); + query.bindValue(":belong_standard_equipment", check.belong_standard_equipment); + query.bindValue(":category_name", check.category_name); + query.bindValue(":equipment_type", check.equipment_type); query.bindValue(":update_time",currentDateTime); query.bindValue(":id", check.id); bool isSuccess = query.exec(); @@ -3206,33 +3186,33 @@ } return isSuccess; }; -// 自动核查-根据 设备id查询核查件设备信息 -CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) -{ - CheckAndTestedDevice result; - QSqlQuery query; - query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," - " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " - " UNION ALL " - " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " - " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); - query.bindValue(":deviceId", deviceId); - bool isSuccess = query.exec(); - if (isSuccess) { - while (query.next()) { - CheckAndTestedDevice device; - device.id = query.value("id").toString(); - device.equipment_name = query.value("equipment_name").toString(); - device.model = query.value("model").toString(); - device.manufacture_no = query.value("manufacture_no").toString(); - device.manufacturer = query.value("manufacturer").toString(); - result=device; - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -}; +//// 自动核查-根据 设备id查询核查件设备信息 +//CheckAndTestedDevice BaseCommonApi::getCheckAndTestedDeviceById(QString deviceId) +//{ +// CheckAndTestedDevice result; +// QSqlQuery query; +// query.prepare("SELECT bei.id , bei.equipment_name , bei.model , bei.manufacture_no ," +// " bei.manufacturer FROM biz_equipment_info bei WHERE bei.id = :deviceId " +// " UNION ALL " +// " SELECT eei.id , eei.equipment_name , eei.model, eei.manufacture_no , eei.manufacturer " +// " FROM eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :deviceId"); +// query.bindValue(":deviceId", deviceId); +// bool isSuccess = query.exec(); +// if (isSuccess) { +// while (query.next()) { +// CheckAndTestedDevice device; +// device.id = query.value("id").toString(); +// device.equipment_name = query.value("equipment_name").toString(); +// device.model = query.value("model").toString(); +// device.manufacture_no = query.value("manufacture_no").toString(); +// device.manufacturer = query.value("manufacturer").toString(); +// result=device; +// } +// } else { +// qDebug() << "Query execution failed: " << query.lastError().text(); +// } +// return result; +//}; //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -6459,7 +6439,11 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info "); + bool isSuccess = query.exec("SELECT besi.id, besi.standard_no, besi.standard_name, besi.dept_name, besi.manage_status, " + " GROUP_CONCAT(bestir.measure_item SEPARATOR ';') AS merged_measure_items" + " FROM biz_equipment_standard_info besi" + " LEFT JOIN biz_equipment_standard_technology_index_relation bestir ON besi.standard_no = bestir.standard_no" + " GROUP BY besi.id;"); if(isSuccess){ while (query.next()) { StandardInfo info; @@ -6468,6 +6452,7 @@ info.standard_name = query.value("standard_name").toString(); info.dept_name = query.value("dept_name").toString(); info.manage_status = query.value("manage_status").toString(); + info.measure_item = query.value("merged_measure_items").toString(); result.append(info); } }else { @@ -6481,9 +6466,12 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type FROM biz_equipment_info bei " - " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id " - " WHERE beser.standard_id = :standardId "); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type," + " GROUP_CONCAT(bett.measure_param SEPARATOR ';') AS measure_params FROM biz_equipment_info bei" + " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id" + " LEFT JOIN biz_equipment_technical_target bett ON bett.equipment_no = bei.equipment_no" + " WHERE beser.standard_id = :standardId" + " GROUP BY bei.id "); query.bindValue(":standardId",standardId); if (isSuccess) { while (query.next()) { @@ -6494,6 +6482,7 @@ device.manufacture_no = query.value("manufacture_no").toString(); device.manufacturer = query.value("manufacturer").toString(); device.type = query.value("type").toString(); + device.measure_param = query.value("measure_params").toString(); result.append(device); } } else { @@ -6503,3 +6492,261 @@ } +//核查程序管理-核查设置-多功能校准源 参数设备id 同信息管理-标准设备管理-核查项及核查点 +QMap> BaseCommonApi::getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList) +{ + QMap> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_calibrator " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("test_type").toString());//核查点类型(直接存字典value) + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("frequency").toString());//频率 + result.append(query.value("resolution").toString());//分辨力 + result.append(query.value("check_point").toString());//核查点 + result.append(query.value("frequency_unit").toString());//频率单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("thoroughfare").toString());//通道(直接存字典value,多个分号分割) + result.append(query.value("tfer").toString());//TFER(直接存字典value) + result.append(query.value("dccp").toString());//DCCP(直接存字典value) + result.append(query.value("flit").toString());//FLIT(直接存字典value) + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + DataMapList = GetDataReturnItemListByCheckItemDataCalibrator(resultData,DataMapList,headList); + + return DataMapList; +}; +//【查询】核查项-多功能校准源 +QMap> BaseCommonApi::GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList) +{ + QMap> result; + QList DCVList; + QList ACVList; + QList DCIList; + QList ACIList; + QList RList; + for(const QStringList &row : ResultData){ + QString VerificationItem=NULL; + if (!row.isEmpty() && row[5] == "DCV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCVList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACV") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACVList.append(Data); + }else if (!row.isEmpty() && row[5] == "DCI" ) { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + DCIList.append(Data); + }else if (!row.isEmpty() && row[5] == "ACI") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + ACIList.append(Data); + }else if (!row.isEmpty() && row[5] == "R") { + VerificationItem = row[5]; + //添加列头 + QStringList head; + head <<"序号"<<"核查项目"<<"核查点"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" + <<"标准偏差S(X)"<<"相对重复性" ; + headList->insert(VerificationItem,head); + //添加数据 + QStringList Data; + Data.append(row[0]); //ID + Data.append(VerificationItem); //检定项目 + Data.append(row[9]);//核查点 + Data.append(row[10] + row[7]);//单位(频率) + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");// + Data.append("");//算数平均值 + Data.append("");//标准偏差S(X) + Data.append("");//相对重复性 + RList.append(Data); + } + } + result.insert("DCV",DCVList); + result.insert("ACV",ACVList); + result.insert("DCI",DCIList); + result.insert("ACI",ACIList); + result.insert("R",RList); + return result; +} +//【保存】核查数据-多功能校准源 +bool BaseCommonApi::InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_data_calibrator ( id, data_id, check_type, test_type, params, unit, " + " frequency, frequency_unit, check_point, test_value_one_date, test_value_one, test_value_two_date, test_value_two, " + " test_value_three_date, test_value_three, test_value_four_date, test_value_four, test_value_five_date, test_value_five," + " test_value_six_date, test_value_six, average_value, standard_deviation, relative_repeatability, urel, less_than, qualified, " + " create_time, update_time ) VALUES ( :id, :data_id, :check_type, :test_type, :params, :unit, :frequency, :frequency_unit, " + " :check_point, :test_value_one_date, :test_value_one, :test_value_two_date, :test_value_two, :test_value_three_date, :test_value_three, " + " :test_value_four_date, :test_value_four, :test_value_five_date, :test_value_five, :test_value_six_date, :test_value_six, :average_value, " + " :standard_deviation, :relative_repeatability, :urel, :less_than, :qualified, :create_time, :update_time );"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", calibrator.id); + query.bindValue(":data_id", calibrator.data_id); + query.bindValue(":check_type", calibrator.check_type); + query.bindValue(":test_type", calibrator.test_type); + query.bindValue(":params", calibrator.params); + query.bindValue(":unit", calibrator.unit); + query.bindValue(":frequency", calibrator.frequency); + query.bindValue(":frequency_unit", calibrator.frequency_unit); + query.bindValue(":check_point", calibrator.check_point); + query.bindValue(":test_value_one_date", calibrator.test_value_one_date); + query.bindValue(":test_value_one", calibrator.test_value_one); + query.bindValue(":test_value_two_date", calibrator.test_value_two_date); + query.bindValue(":test_value_two", calibrator.test_value_two); + query.bindValue(":test_value_three_date", calibrator.test_value_three_date); + query.bindValue(":test_value_three", calibrator.test_value_three); + query.bindValue(":test_value_four_date", calibrator.test_value_four_date); + query.bindValue(":test_value_four", calibrator.test_value_four); + query.bindValue(":test_value_five_date", calibrator.test_value_five_date); + query.bindValue(":test_value_five", calibrator.test_value_five); + query.bindValue(":test_value_six_date", calibrator.test_value_six_date); + query.bindValue(":test_value_six", calibrator.test_value_six); + query.bindValue(":average_value", calibrator.average_value); + query.bindValue(":standard_deviation", calibrator.standard_deviation); + query.bindValue(":relative_repeatability", calibrator.relative_repeatability); + query.bindValue(":urel", calibrator.urel); + query.bindValue(":less_than", calibrator.less_than); + query.bindValue(":qualified", calibrator.qualified); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<getCheckDCPower(QString item_category_id,QStringList *headList); +// static QListgetCheckDCPower(QString item_category_id,QStringList *headList); //获取被检设备管理首页数据 static QList getTestedDevice(); // 被检设备管理查看设备信息 @@ -1428,7 +1489,7 @@ //判断 检定哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //判断 核查哪个 装置表 传参 设备id - static JudgeCalibrationTable getJudgeVerifyTable(QString id); +// static JudgeCalibrationTable getJudgeVerifyTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId,QStringList *headList); static QMap> getVerMultiCalClass(QString itemCatoryName,QString itemId,QMap *headList); @@ -1506,18 +1567,17 @@ static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); - // 核查程序管理首页查询 + + // 核查程序-首页查询 static QList getCheckProgramManage(); - //核查程序管理-编辑查询单个 + //核查程序-编辑查询单个 static CheckProgramManage getCheckProgramManageById(QString id); - //核查程序管理-编辑查询 选择设备 选择标准 + //核查程序-编辑查询 选择设备 选择标准 static QList getCheckDeviceList(); - //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集 - static QList getCheckAndTestedDeviceList(); + //核查程序-编辑查询 选择核查件 参数标准装置字典 +// static QList getCheckAndTestedDeviceList(QString standardId); //多功能校准源 核查项及核查点 参数设备id - static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); - - +// static QList getVerificationItemsMultiList(QString equipment_id,QStringList *headList); //新增核查程序 static bool InsertCheckProgramManage(CheckProgramManage check); @@ -1525,10 +1585,18 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); + + + + + // 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); // 自动核查-根据 设备id查询核查件设备信息 - static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); +// static CheckAndTestedDevice getCheckAndTestedDeviceById(QString deviceId); + + + //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 @@ -1636,6 +1704,13 @@ static QList getStandardInfo(); //根据标准装置id查询标准设备 static QList getStandardInfoListByStandardId(QString standardId); + //【保存】核查基本信息 + static bool InsertStandardCheckInfo(StandardCheckInfo info); + //【查询】核查项-多功能校准源 + static QMap> getStandardCheckItemDataCalibrator(QString equipment_id,QMap *headList); + static QMap> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap> DataMapList,QMap *headList); + //【保存】核查数据-多功能校准源 + static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); }; diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp index d32ade9..8c852c2 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp @@ -307,7 +307,7 @@ measInfo.manufacturer = taskList[curDevciceIdx].manufacturer; measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no; measInfo.measure_category =QString::number(num) ; - measInfo.item_id=catoryList[0].eqptDeviceModelId; + measInfo.item_id=catoryList[0].id; measInfo.temperature = ui->lineEditTemp->text(); measInfo.humidity =ui->lineEdit_Hum->text(); measInfo.measure_address=ui->comboBoxPlace->currentText(); diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.h b/softwareDirectory/AutoVerScheme/dialogcheckresult.h index e67a423..c04967d 100644 --- a/softwareDirectory/AutoVerScheme/dialogcheckresult.h +++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.h @@ -25,6 +25,7 @@ void on_pushButtonPrint_clicked(); + private: void deleteItem(QLayout *layout); void initCalDataTable(int idx); diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp index 9391083..eae92e1 100644 --- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp +++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp @@ -82,10 +82,10 @@ //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(sDeviceId,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); - for (const QStringList& item : ptList){ - this->ui->comboBox->addItem(item[2]); - } +// QList ptList = BaseCommonApi::Search_VerifyTable(sDeviceId,&headlist); +// for (const QStringList& item : ptList){ +// this->ui->comboBox->addItem(item[2]); +// } } } diff --git a/softwareDirectory/AutoVerScheme/formverypoint.cpp b/softwareDirectory/AutoVerScheme/formverypoint.cpp index a70890d..c11b9fd 100644 --- a/softwareDirectory/AutoVerScheme/formverypoint.cpp +++ b/softwareDirectory/AutoVerScheme/formverypoint.cpp @@ -25,7 +25,7 @@ QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); //QList bizDeviceManageData=BaseCommonApi::getCheckDCPower(id,&headlist); - QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); +// QList ptList = BaseCommonApi::Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidget->setRowCount(0); @@ -40,32 +40,32 @@ int rowCount=0; int row=0; - for (const QStringList& item : ptList) - { - rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 - ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 - ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 - ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel - ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 - ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ - //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); +// for (const QStringList& item : ptList) +// { +// rowCount = ui->tableWidget->rowCount(); +// ui->tableWidget->insertRow(rowCount); +// /*ui->tableWidget->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(checkDCPower.check_type)); //核查类型 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(checkDCPower.params)); //参数 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(checkDCPower.unit)); //单位 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(checkDCPower.datum_point));//基准点 +// ui->tableWidget->setItem(row, 5, new QTableWidgetItem(checkDCPower.resolution));//分辨力 +// ui->tableWidget->setItem(row, 6, new QTableWidgetItem(checkDCPower.cycle_number));//循环次数 +// ui->tableWidget->setItem(row, 7, new QTableWidgetItem(checkDCPower.urel));//urel +// ui->tableWidget->setItem(row, 8, new QTableWidgetItem(checkDCPower.resistance_value));//电阻值 +// ui->tableWidget->setItem(row, 9, new QTableWidgetItem(checkDCPower.resistance_value_unit));//电阻值单位*/ +// //ui->tableWidget->setItem(row, 0, new QTableWidgetItem(dept.id)); - //QDebug - //循环读取值 headlist，count是列的数量 - for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); - } - row++; +// //QDebug +// //循环读取值 headlist，count是列的数量 +// for(int i=0;itableWidget->setItem(row, i, new QTableWidgetItem(item[i])); +// } +// row++; - } +// } } void FormVeryPoint::on_pushButton_14_clicked() { diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index bfada13..44ce662 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -256,29 +256,29 @@ // ==================================================================================== QStringList headlist; - QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); +// QList Data = dbManager.Search_VerifyDataTable(entity.equipment_id,entity.id,&headlist); ui->tableWidgetItem->setRowCount(0); ui->tableWidgetItem->setColumnCount(headlist.count()); ui->tableWidgetItem->setHorizontalHeaderLabels(headlist); //循环数据 rowCount=0; row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void InspectDataItem::SetHomePaheCombox(CheckData entity) { diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp index 64b173b..4680544 100644 --- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp +++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp @@ -157,53 +157,54 @@ idList = checkIds.split(","); for(const QString& id : idList) { - CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); +// CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); //QList result = BaseCommonApi::getTestedCatDevice(id); - if(result.id!=""){ - rowCount = ui->tableWidget->rowCount(); +// if(result.id!="") +// { +// rowCount = ui->tableWidget->rowCount(); - ui->tableWidget->insertRow(rowCount); - ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); - ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 - ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); - QPushButton *btn_1 = new QPushButton(); - btn_1->setText(tr("设置命令")); - btn_1->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_1->setCursor(Qt::PointingHandCursor); - int type=0; - connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { - on_cmdButton_clicked(type,id); - }); +// ui->tableWidget->insertRow(rowCount); +// ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件")); +// ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据 +// ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据 +// ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据 +// ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer)); +// QPushButton *btn_1 = new QPushButton(); +// btn_1->setText(tr("设置命令")); +// btn_1->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_1->setCursor(Qt::PointingHandCursor); +// int type=0; +// connect(btn_1, &QPushButton::clicked, this, [this,type, id]() { +// on_cmdButton_clicked(type,id); +// }); - btn_1->setIconSize(QSize(16,16)); - btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); - QPushButton *btn_2 = new QPushButton(); - btn_2->setText(tr("设置设备接口")); - btn_2->setStyleSheet("QPushButton{" - "background-color:rgba(255,255,255,0);" - "color:rgba(92,170,54,100);" - "text-decoration:underline;" - "}"); - btn_2->setCursor(Qt::PointingHandCursor); - connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { - on_commButton_clicked(type,id); - }); - btn_2->setIconSize(QSize(16,16)); - btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); - QWidget *tmp_widget = new QWidget(); - QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); - tmp_layout->addWidget(btn_1); - tmp_layout->addWidget(btn_2); - tmp_layout->setMargin(0); - ui->tableWidget->setCellWidget(row,5,tmp_widget); - row++; - } +// btn_1->setIconSize(QSize(16,16)); +// btn_1->setIcon(QIcon(":/image/Index/u2324.svg")); +// QPushButton *btn_2 = new QPushButton(); +// btn_2->setText(tr("设置设备接口")); +// btn_2->setStyleSheet("QPushButton{" +// "background-color:rgba(255,255,255,0);" +// "color:rgba(92,170,54,100);" +// "text-decoration:underline;" +// "}"); +// btn_2->setCursor(Qt::PointingHandCursor); +// connect(btn_2, &QPushButton::clicked, this, [this,type, id]() { +// on_commButton_clicked(type,id); +// }); +// btn_2->setIconSize(QSize(16,16)); +// btn_2->setIcon(QIcon(":/image/Index/u2324.svg")); +// QWidget *tmp_widget = new QWidget(); +// QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget); +// tmp_layout->addWidget(btn_1); +// tmp_layout->addWidget(btn_2); +// tmp_layout->setMargin(0); +// ui->tableWidget->setCellWidget(row,5,tmp_widget); +// row++; +// } } idList.clear(); } diff --git a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp index 3ef9d60..f50bc56 100644 --- a/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp +++ b/softwareDirectory/AutoVerScheme/standard_deviceitem.cpp @@ -235,7 +235,7 @@ //获取核查点tablewight的数据 QStringList headlist; //QString DeviceName = BaseCommonApi::getApparatus(id); - QList Data=dbManager.Search_VerifyTable(id,&headlist); +// QList Data=dbManager.Search_VerifyTable(id,&headlist); //QList bizDeviceManageData = BaseCommonApi::getCheckDCPower(id); //设置tablewight ui->tableWidgetItem->setRowCount(0); @@ -245,22 +245,22 @@ int rowCount=0; int row=0; - for (const QStringList& item : Data) - { - //获取行号 并进行添加行 - rowCount = ui->tableWidgetItem->rowCount(); - ui->tableWidgetItem->insertRow(rowCount); - //添加 序号 - ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); - //循环读取值 headlist，count是列的数量 - for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); - } +// for (const QStringList& item : Data) +// { +// //获取行号 并进行添加行 +// rowCount = ui->tableWidgetItem->rowCount(); +// ui->tableWidgetItem->insertRow(rowCount); +// //添加 序号 +// ui->tableWidgetItem->setItem(row, 0, new QTableWidgetItem(QString::number(row+1))); +// //循环读取值 headlist，count是列的数量 +// for(int i=1;itableWidgetItem->setItem(row, i, new QTableWidgetItem(item[i])); +// } - row++; +// row++; - } +// } } void Standard_DeviceItem::SetHomePaheCombox(BizDevice entity) { @@ -373,6 +373,3 @@ - - - diff --git a/softwareDirectory/AutoVerScheme/verifydevice.cpp b/softwareDirectory/AutoVerScheme/verifydevice.cpp index 93a904e..46c29c2 100644 --- a/softwareDirectory/AutoVerScheme/verifydevice.cpp +++ b/softwareDirectory/AutoVerScheme/verifydevice.cpp @@ -34,7 +34,7 @@ int rowCount=0; int row=0; bizDeviceList.clear(); - bizDeviceList = BaseCommonApi::getCheckDeviceList(); +// bizDeviceList = BaseCommonApi::getCheckDeviceList(); QString sFilterName = ui->lineEdit->text(); QString sFilterModel = ui->lineEdit_2->text(); QString sFilterNo = ui->lineEdit_3->text(); @@ -74,7 +74,7 @@ int rowCount=0; int row=0; testedDeviceList.clear(); - testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); +// testedDeviceList = BaseCommonApi::getCheckAndTestedDeviceList(); QString sFilterName = ui->lineEdit_4->text(); QString sFilterModel = ui->lineEdit_5->text(); QString sFilterNo = ui->lineEdit_6->text(); diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp index 20d9c62..6ba9de5 100644 --- a/softwareDirectory/AutoVerScheme/verifywindow.cpp +++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp @@ -143,9 +143,9 @@ ConnectInfo info; info.state="未连接"; info.type = 0; - CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); +// CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id); - info.deviceName = result.equipment_name; +// info.deviceName = result.equipment_name; QList addrList = BaseCommonApi::getVerificationProgramConfigInterface(id); if(addrList.length()>0){ @@ -315,7 +315,7 @@ { headList.clear(); calibrationList.clear(); - calibrationList =BaseCommonApi::Search_VerifyTable(standardId,&headList); +// calibrationList =BaseCommonApi::Search_VerifyTable(standardId,&headList); //tableWidgetItem ui->tableWidget_Point->clearContents();