diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 412d7b3..45d7624 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -717,8 +717,9 @@ return DataList; } -//查找设备对应的装置表 传参设备id 核查项目及核查点 -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +<<<<<<< .mine//核查设备对应的装置表 核查项及核查点 传参设备id +=======//查找设备对应的装置表 传参设备id 核查项目及核查点 +>>>>>>> .theirsQList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -731,8 +732,40 @@ } return DataList; } +//判断检定数据管理 结果信息表 +QList Search_CalibrationDataTable(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: //多功能校准源 -//被检设备管理-检定项目及检定点-多功能校准源 +<<<<<<< .mine DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); + break; + } + return DataList; +} +//判断核查数据管理 结果信息表 +QList 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; +} + + + +=======>>>>>>> .theirs//被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { QList resultData; @@ -784,12 +817,17 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bbdmi.id , bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ," - "bbdmi.manufacturer , bboi.customer_name , dept.FULL_NAME , _user.NAME , bbdmi.trace_date ," - "bbdmi.measure_valid_date , eei.meter_identify , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id"); + bool isSuccess = query.exec("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " + " bbdmii.belong_standard_equipment, bboi.customer_address,_user.NAME,eei.meter_identify,dept.FULL_NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " + " LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = " + " bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " ORDER BY bbdmi.create_time DESC"); if (isSuccess) { while (query.next()) { @@ -800,6 +838,7 @@ verificationData.help_instruction = query.value("help_instruction").toString(); verificationData.manufacture_no = query.value("manufacture_no").toString(); verificationData.manufacturer = query.value("manufacturer").toString(); + verificationData.customer_name = query.value("customer_name").toString(); verificationData.FULL_NAME = query.value("FULL_NAME").toString(); verificationData.NAME = query.value("NAME").toString(); verificationData.trace_date = query.value("trace_date").toDate(); @@ -815,40 +854,28 @@ return result; } -//检定数据管理-检定基本信息 -QList BaseCommonApi::getVerificationBasicDataDetails(QString id) +//检定数据管理-检定基本信息-标准设备 参数：首页数据的id +QList BaseCommonApi::getVerificationBasicDataDevice(QString data_id) { -QList result; +QList result; QSqlQuery query; - query.prepare("SELECT bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ,bbdmi.manufacturer ," - " bboi.customer_name, eemtte.based_documents, bbdmi.trace_date , bbdmi.temperature , bbdmi.humidity ," - "bbdmi.measure_address , bbdmi.measure_valid_date , _user.NAME , bbdmi.conclusion , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id " - " LEFT JOIN biz_business_device_measure_item_info bbdmii ON bbdmi.item_id = bbdmii.id " - " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id WHERE bbdmi.id = :id "); + query.prepare("SELECT bei.id AS equipmentId, bei.equipment_no, bei.equipment_name, bei.manufacture_no, bei.model, bei.measure_valid_date, " + "bett.uncertainty " + " FROM biz_business_device_measure_equipment bbdme " + " JOIN biz_equipment_info bei ON bei.id = bbdme.equipment_id " + " Left JOIN biz_equipment_technical_target bett ON bei.equipment_no = bett.equipment_no " + " WHERE bbdme.data_id = :data_id"); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - VerificationBasicDataDetails dataDetails; - dataDetails.sample_name = query.value("sample_name").toString(); + VerificationBasicDataDevice dataDetails; + dataDetails.equipmentId = query.value("equipmentId").toString(); + dataDetails.equipment_no = query.value("equipment_no").toString(); + dataDetails.equipment_name = query.value("equipment_name").toString(); dataDetails.model = query.value("model").toString(); - dataDetails.help_instruction = query.value("help_instruction").toString(); - dataDetails.manufacture_no = query.value("manufacture_no").toString(); - dataDetails.manufacturer = query.value("manufacturer").toString(); - dataDetails.customer_name = query.value("customer_name").toString(); - dataDetails.trace_date = query.value("trace_date").toDate(); - dataDetails.temperature = query.value("temperature").toString(); - dataDetails.humidity = query.value("humidity").toString(); - dataDetails.measure_address = query.value("measure_address").toString(); dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); - dataDetails.based_documents = query.value("based_documents").toString(); - dataDetails.NAME = query.value("NAME").toString(); - dataDetails.conclusion = query.value("conclusion").toString(); - dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); - + dataDetails.uncertainty = query.value("uncertainty").toString(); result.append(dataDetails); } } else { @@ -857,22 +884,55 @@ return result; } -//检定数据管理-检定结果信息 -QList BaseCommonApi::getVerificationResultData(QString sampleId,QStringList *HeadList) +//检定数据管理-检定基本信息 +VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id) { - sampleId="1716997603953311746"; + VerificationBasicDataDetails result; + QSqlQuery query; + query.prepare("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bboi.order_no,,eemtte.based_documents,_user.NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) " + " JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " WHERE bbdmi.item_id = :item_id " + " ORDER BY bbdmi.update_time DESC" + " LIMIT 1"); + // 将参数绑定到占位符 + query.bindValue(":item_id", item_id); + if (query.exec()) { + while (query.next()) { + VerificationBasicDataDetails dataDetails; + dataDetails.customer_name = query.value("customer_name").toString(); + dataDetails.humidity = query.value("humidity").toString(); + dataDetails.temperature = query.value("temperature").toString(); +// dataDetails.model = query.value("model").toString(); + dataDetails.measure_address = query.value("measure_address").toString(); + dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); + dataDetails.conclusion = query.value("conclusion").toString(); + dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); + dataDetails.based_documents = query.value("based_documents").toString(); + dataDetails.trace_date = query.value("trace_date").toDate(); + dataDetails.NAME = query.value("NAME").toString(); + result = dataDetails; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} +//检定数据管理-检定结果信息 SaveDeviceMeasureCalibrator 多功能校准源结果数据表 +QList BaseCommonApi::getVerificationMultiCalResultData(QString dataId,QStringList *HeadList) +{ QList resultData; QStringList result; QSqlQuery query; - query.prepare("SELECT bbdmidc.id ,bbdmidc.params ,bbdmidc.capacity ,bbdmidc.unit ," - " bbdmidc.frequency , bbdmidc.range_range , bbdmidc.standard_value , bbdmidc.resolution , bbdmidc.maximum_error , " - " bbdmidc.error_param_a , bbdmidc.error_param_b ,bbdmi.other_outcome " - " FROM biz_business_device_measure_item_data_calibrator bbdmidc " - " LEFT JOIN biz_business_device_measure_info bbdmi ON bbdmi.item_id = bbdmidc.item_id " - "WHERE bbdmidc.item_id = (SELECT CONVERT(item_id USING utf8mb4) COLLATE utf8mb4_0900_ai_ci FROM biz_business_device_measure_info bbdmi " - " WHERE sample_id = :sampleId )"); + query.prepare("SELECT * FROM biz_business_device_measure_data_calibrator WHERE data_id = :dataId "); // 将参数绑定到占位符 - query.bindValue(":sampleId", sampleId); + query.bindValue(":dataId", dataId); if (query.exec()) { while (query.next()) { result.clear(); @@ -894,7 +954,7 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - *HeadList<<"序号"<<"参数"<<"量"<<"单位"<<"频率" + *HeadList<<"id"<<"参数"<<"量"<<"单位"<<"频率" <<"量程"<<"标准值"<<"分辨力"<<"最大允许误差"<<"误差参数a" <<"误差参数b"<<"合格率"; @@ -906,19 +966,21 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id , bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.meter_standard_name ,bei.meter_standard_id ," - " besci.create_user_name , besci.check_date , bei.dept_name,blrd.biz_lab_code " - " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id" - " LEFT JOIN biz_lab_rel_dept blrd ON blrd.dept_id = bei.dept_id"); + bool isSuccess = query.exec("SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, " + " bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment,beit.manufacture_no,besci.create_user_name " + " FROM biz_equipment_standard_check_info besci " + " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " + " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " + " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); if (isSuccess) { while (query.next()) { CheckData dataManage; dataManage.id = query.value("id").toString(); - dataManage.equipment_name = query.value("equipment_name").toString(); - dataManage.model = query.value("model").toString(); + dataManage.equipmentName = query.value("equipmentName").toString(); + dataManage.equipmentModel = query.value("equipmentModel").toString(); dataManage.manufacture_no = query.value("manufacture_no").toString(); - dataManage.meter_standard_name = query.value("meter_standard_name").toString(); - dataManage.meter_standard_id = query.value("meter_standard_id").toString(); +// dataManage.meter_standard_name = query.value("meter_standard_name").toString(); +// dataManage.meter_standard_id = query.value("meter_standard_id").toString(); dataManage.create_user_name = query.value("create_user_name").toString(); dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); @@ -931,19 +993,18 @@ return result; } -//核查数据管理-核查基本信息 -QList BaseCommonApi::getCheckDataManageBasicInfo(QString id) + +//核查数据管理-核查基本信息-核查件 参数为 首页id +QList BaseCommonApi::getCheckDataManageBasicInfoDevice(QString data_id) { QList result; QSqlQuery query; - query.prepare("SELECT bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer ,besci.temperature ,besci.humidity ,besci.check_date ," - " besci.check_address , besci.create_user_name , besci.conclusion " - "FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id " - " LEFT JOIN biz_equipment_standard_check_info_equipment bescie ON bei.id = bescie.check_equipment_id" - " WHERE bei.id = :id "); + query.prepare("SELECT bei.* FROM biz_equipment_standard_check_info_equipment bescie " + " JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id " + " WHERE bescie.data_id = :data_id "); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { CheckDataManageBasicInfo basicInfo; @@ -951,13 +1012,6 @@ basicInfo.model = query.value("model").toString(); basicInfo.manufacture_no = query.value("manufacture_no").toString(); basicInfo.manufacturer = query.value("manufacturer").toString(); - basicInfo.temperature = query.value("temperature").toString(); - basicInfo.humidity = query.value("humidity").toString(); - basicInfo.check_date = query.value("check_date").toDate(); - basicInfo.check_address = query.value("check_address").toString(); - basicInfo.create_user_name = query.value("create_user_name").toString(); - basicInfo.conclusion = query.value("conclusion").toString(); - result.append(basicInfo); } } else { @@ -966,40 +1020,95 @@ return result; } -//核查数据管理-核查结果信息-核查项多功能校准源数据 待修改2024年3月18日13:05:42 -QList BaseCommonApi::getCheckDataManageResultManageMult(QString equipment_id) -{ -QList result; -QSqlQuery query; - query.prepare("SELECT DISTINCT bescidc.id , bescidc.check_type ,bescidc.params ,bescidc.unit ,bescidc.frequency ,bescidc.check_point ,besci.check_date ,bescidc.urel ," - " bescidc.tfer ,bescidc.dccp ,bescidc.flit " - " FROM biz_equipment_standard_check_item_data_calibrator bescidc " - " LEFT JOIN biz_equipment_standard_check_info besci ON besci.item_category_id = bescidc.item_category_id " - " WHERE bescidc.equipment_id = :equipment_id "); - // 将参数绑定到占位符 1692796512381222914 - query.bindValue(":equipment_id", equipment_id); +//核查数据管理-核查基本信息-基本信息 +CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id) +{ + CheckDataManageBasicInfo result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_info WHERE equipment_id = :equipment_id"); + + // 将参数绑定到占位符 + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + CheckDataManageBasicInfo basicInfo; + basicInfo.temperature = query.value("temperature").toString(); + basicInfo.humidity = query.value("humidity").toString(); + basicInfo.check_date = query.value("check_date").toDate(); + basicInfo.check_address = query.value("check_address").toString(); + basicInfo.create_user_name = query.value("create_user_name").toString(); + basicInfo.conclusion = query.value("conclusion").toString(); + result=basicInfo; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} + + +//核查数据管理-核查结果信息-核查项多功能校准源数据 参数首页数据的id +QList BaseCommonApi::getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList) +{ +QList result; +QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_data_calibrator WHERE data_id = :data_id "); + + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - CheckDataManageResultManageMult dataCalibrator; + StandCheckDataCalibrator dataCalibrator; dataCalibrator.id = query.value("id").toString(); + dataCalibrator.data_id = query.value("data_id").toString(); dataCalibrator.check_type = query.value("check_type").toString(); + dataCalibrator.test_type = query.value("test_type").toString(); dataCalibrator.params = query.value("params").toString(); dataCalibrator.unit = query.value("unit").toString(); dataCalibrator.frequency = query.value("frequency").toString(); + dataCalibrator.frequency_unit = query.value("frequency_unit").toString(); dataCalibrator.check_point = query.value("check_point").toString(); - dataCalibrator.check_date = query.value("check_date").toDate(); + + dataCalibrator.test_value_one_date = query.value("test_value_one_date").toDate(); + dataCalibrator.test_value_one = query.value("test_value_one").toString(); + + dataCalibrator.test_value_two_date = query.value("test_value_two_date").toDate(); + dataCalibrator.test_value_two = query.value("test_value_two").toString(); + + dataCalibrator.test_value_three_date = query.value("test_value_three_date").toDate(); + dataCalibrator.test_value_three = query.value("test_value_three").toString(); + + dataCalibrator.test_value_four_date = query.value("test_value_four_date").toDate(); + dataCalibrator.test_value_four = query.value("test_value_four").toString(); + + dataCalibrator.test_value_five_date = query.value("test_value_five_date").toDate(); + dataCalibrator.test_value_five = query.value("test_value_five").toString(); + + dataCalibrator.test_value_six_date = query.value("test_value_six_date").toDate(); + dataCalibrator.test_value_six = query.value("test_value_six").toString(); + + dataCalibrator.average_value = query.value("average_value").toString(); + dataCalibrator.standard_deviation = query.value("standard_deviation").toString(); + dataCalibrator.relative_repeatability = query.value("relative_repeatability").toString(); dataCalibrator.urel = query.value("urel").toString(); - dataCalibrator.tfer = query.value("tfer").toString(); - dataCalibrator.dccp = query.value("dccp").toString(); - dataCalibrator.flit = query.value("flit").toString(); + dataCalibrator.less_than = query.value("less_than").toString(); + dataCalibrator.qualified = query.value("qualified").toString(); + + + dataCalibrator.create_time = query.value("create_time").toDateTime(); + dataCalibrator.update_time = query.value("update_time").toDateTime(); result.append(dataCalibrator); } } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *HeadList<<"id"<<"核查数据管理基础信息表id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"频率单位"<<"核查点" + <<"核查读数1日期"<<"核查读数1(示值)"<<"核查读数2日期（稳定性）"<<"核查读数2（示值）" + <<"核查读数3日期（稳定性） "<<"核查读数3（示值）"<<"核查读数4日期（稳定性）"<<"核查读数4（示值）"<<"核查读数5日期（稳定性）" + <<"核查读数5（示值）"<<"核查读数6日期（稳定性）"<<"核查读数6（本次示值）"<<"核查读数平均值(算数平均值)"<<"Sn(x)(标准偏差)" + <<"Sn(x)/核查读数平均值(相对重复性)"<<"UREL"<<"是否小于相对扩展不确定度Urel(0/1)"<<"稳定性考核是否合格"<<"创建时间"<<"更新时间"; return result; } @@ -1352,6 +1461,27 @@ return isSuccess; } +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 +bool BaseCommonApi::InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:id,:data_id,:equipment_id,:create_time,:update_time)"); + QString createTime = deviceMeasure.create_time.toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", deviceMeasure.id); + query.bindValue(":data_id", deviceMeasure.data_id); + query.bindValue(":equipment_id", deviceMeasure.equipment_id); + query.bindValue(":create_time", createTime); + query.bindValue(":update_time", createTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) @@ -1600,8 +1730,6 @@ } return isSuccess; } -//自动核查-结果保存- - //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -1762,6 +1890,27 @@ } return result; } +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +bool BaseCommonApi::InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_info_equipment " + " (id,check_equipment_id,data_id) " + " VALUES " + " (:id,:check_equipment_id,:data_id)"); + query.bindValue(":id",equiment.id); + query.bindValue(":data_no",equiment.check_equipment_id); + query.bindValue(":check_date",equiment.data_id); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} + + + //自动核查--结果保存-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 bool BaseCommonApi::InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 412d7b3..45d7624 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -717,8 +717,9 @@ return DataList; } -//查找设备对应的装置表 传参设备id 核查项目及核查点 -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +<<<<<<< .mine//核查设备对应的装置表 核查项及核查点 传参设备id +=======//查找设备对应的装置表 传参设备id 核查项目及核查点 +>>>>>>> .theirsQList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -731,8 +732,40 @@ } return DataList; } +//判断检定数据管理 结果信息表 +QList Search_CalibrationDataTable(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: //多功能校准源 -//被检设备管理-检定项目及检定点-多功能校准源 +<<<<<<< .mine DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); + break; + } + return DataList; +} +//判断核查数据管理 结果信息表 +QList 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; +} + + + +=======>>>>>>> .theirs//被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { QList resultData; @@ -784,12 +817,17 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bbdmi.id , bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ," - "bbdmi.manufacturer , bboi.customer_name , dept.FULL_NAME , _user.NAME , bbdmi.trace_date ," - "bbdmi.measure_valid_date , eei.meter_identify , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id"); + bool isSuccess = query.exec("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " + " bbdmii.belong_standard_equipment, bboi.customer_address,_user.NAME,eei.meter_identify,dept.FULL_NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " + " LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = " + " bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " ORDER BY bbdmi.create_time DESC"); if (isSuccess) { while (query.next()) { @@ -800,6 +838,7 @@ verificationData.help_instruction = query.value("help_instruction").toString(); verificationData.manufacture_no = query.value("manufacture_no").toString(); verificationData.manufacturer = query.value("manufacturer").toString(); + verificationData.customer_name = query.value("customer_name").toString(); verificationData.FULL_NAME = query.value("FULL_NAME").toString(); verificationData.NAME = query.value("NAME").toString(); verificationData.trace_date = query.value("trace_date").toDate(); @@ -815,40 +854,28 @@ return result; } -//检定数据管理-检定基本信息 -QList BaseCommonApi::getVerificationBasicDataDetails(QString id) +//检定数据管理-检定基本信息-标准设备 参数：首页数据的id +QList BaseCommonApi::getVerificationBasicDataDevice(QString data_id) { -QList result; +QList result; QSqlQuery query; - query.prepare("SELECT bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ,bbdmi.manufacturer ," - " bboi.customer_name, eemtte.based_documents, bbdmi.trace_date , bbdmi.temperature , bbdmi.humidity ," - "bbdmi.measure_address , bbdmi.measure_valid_date , _user.NAME , bbdmi.conclusion , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id " - " LEFT JOIN biz_business_device_measure_item_info bbdmii ON bbdmi.item_id = bbdmii.id " - " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id WHERE bbdmi.id = :id "); + query.prepare("SELECT bei.id AS equipmentId, bei.equipment_no, bei.equipment_name, bei.manufacture_no, bei.model, bei.measure_valid_date, " + "bett.uncertainty " + " FROM biz_business_device_measure_equipment bbdme " + " JOIN biz_equipment_info bei ON bei.id = bbdme.equipment_id " + " Left JOIN biz_equipment_technical_target bett ON bei.equipment_no = bett.equipment_no " + " WHERE bbdme.data_id = :data_id"); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - VerificationBasicDataDetails dataDetails; - dataDetails.sample_name = query.value("sample_name").toString(); + VerificationBasicDataDevice dataDetails; + dataDetails.equipmentId = query.value("equipmentId").toString(); + dataDetails.equipment_no = query.value("equipment_no").toString(); + dataDetails.equipment_name = query.value("equipment_name").toString(); dataDetails.model = query.value("model").toString(); - dataDetails.help_instruction = query.value("help_instruction").toString(); - dataDetails.manufacture_no = query.value("manufacture_no").toString(); - dataDetails.manufacturer = query.value("manufacturer").toString(); - dataDetails.customer_name = query.value("customer_name").toString(); - dataDetails.trace_date = query.value("trace_date").toDate(); - dataDetails.temperature = query.value("temperature").toString(); - dataDetails.humidity = query.value("humidity").toString(); - dataDetails.measure_address = query.value("measure_address").toString(); dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); - dataDetails.based_documents = query.value("based_documents").toString(); - dataDetails.NAME = query.value("NAME").toString(); - dataDetails.conclusion = query.value("conclusion").toString(); - dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); - + dataDetails.uncertainty = query.value("uncertainty").toString(); result.append(dataDetails); } } else { @@ -857,22 +884,55 @@ return result; } -//检定数据管理-检定结果信息 -QList BaseCommonApi::getVerificationResultData(QString sampleId,QStringList *HeadList) +//检定数据管理-检定基本信息 +VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id) { - sampleId="1716997603953311746"; + VerificationBasicDataDetails result; + QSqlQuery query; + query.prepare("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bboi.order_no,,eemtte.based_documents,_user.NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) " + " JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " WHERE bbdmi.item_id = :item_id " + " ORDER BY bbdmi.update_time DESC" + " LIMIT 1"); + // 将参数绑定到占位符 + query.bindValue(":item_id", item_id); + if (query.exec()) { + while (query.next()) { + VerificationBasicDataDetails dataDetails; + dataDetails.customer_name = query.value("customer_name").toString(); + dataDetails.humidity = query.value("humidity").toString(); + dataDetails.temperature = query.value("temperature").toString(); +// dataDetails.model = query.value("model").toString(); + dataDetails.measure_address = query.value("measure_address").toString(); + dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); + dataDetails.conclusion = query.value("conclusion").toString(); + dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); + dataDetails.based_documents = query.value("based_documents").toString(); + dataDetails.trace_date = query.value("trace_date").toDate(); + dataDetails.NAME = query.value("NAME").toString(); + result = dataDetails; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} +//检定数据管理-检定结果信息 SaveDeviceMeasureCalibrator 多功能校准源结果数据表 +QList BaseCommonApi::getVerificationMultiCalResultData(QString dataId,QStringList *HeadList) +{ QList resultData; QStringList result; QSqlQuery query; - query.prepare("SELECT bbdmidc.id ,bbdmidc.params ,bbdmidc.capacity ,bbdmidc.unit ," - " bbdmidc.frequency , bbdmidc.range_range , bbdmidc.standard_value , bbdmidc.resolution , bbdmidc.maximum_error , " - " bbdmidc.error_param_a , bbdmidc.error_param_b ,bbdmi.other_outcome " - " FROM biz_business_device_measure_item_data_calibrator bbdmidc " - " LEFT JOIN biz_business_device_measure_info bbdmi ON bbdmi.item_id = bbdmidc.item_id " - "WHERE bbdmidc.item_id = (SELECT CONVERT(item_id USING utf8mb4) COLLATE utf8mb4_0900_ai_ci FROM biz_business_device_measure_info bbdmi " - " WHERE sample_id = :sampleId )"); + query.prepare("SELECT * FROM biz_business_device_measure_data_calibrator WHERE data_id = :dataId "); // 将参数绑定到占位符 - query.bindValue(":sampleId", sampleId); + query.bindValue(":dataId", dataId); if (query.exec()) { while (query.next()) { result.clear(); @@ -894,7 +954,7 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - *HeadList<<"序号"<<"参数"<<"量"<<"单位"<<"频率" + *HeadList<<"id"<<"参数"<<"量"<<"单位"<<"频率" <<"量程"<<"标准值"<<"分辨力"<<"最大允许误差"<<"误差参数a" <<"误差参数b"<<"合格率"; @@ -906,19 +966,21 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id , bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.meter_standard_name ,bei.meter_standard_id ," - " besci.create_user_name , besci.check_date , bei.dept_name,blrd.biz_lab_code " - " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id" - " LEFT JOIN biz_lab_rel_dept blrd ON blrd.dept_id = bei.dept_id"); + bool isSuccess = query.exec("SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, " + " bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment,beit.manufacture_no,besci.create_user_name " + " FROM biz_equipment_standard_check_info besci " + " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " + " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " + " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); if (isSuccess) { while (query.next()) { CheckData dataManage; dataManage.id = query.value("id").toString(); - dataManage.equipment_name = query.value("equipment_name").toString(); - dataManage.model = query.value("model").toString(); + dataManage.equipmentName = query.value("equipmentName").toString(); + dataManage.equipmentModel = query.value("equipmentModel").toString(); dataManage.manufacture_no = query.value("manufacture_no").toString(); - dataManage.meter_standard_name = query.value("meter_standard_name").toString(); - dataManage.meter_standard_id = query.value("meter_standard_id").toString(); +// dataManage.meter_standard_name = query.value("meter_standard_name").toString(); +// dataManage.meter_standard_id = query.value("meter_standard_id").toString(); dataManage.create_user_name = query.value("create_user_name").toString(); dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); @@ -931,19 +993,18 @@ return result; } -//核查数据管理-核查基本信息 -QList BaseCommonApi::getCheckDataManageBasicInfo(QString id) + +//核查数据管理-核查基本信息-核查件 参数为 首页id +QList BaseCommonApi::getCheckDataManageBasicInfoDevice(QString data_id) { QList result; QSqlQuery query; - query.prepare("SELECT bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer ,besci.temperature ,besci.humidity ,besci.check_date ," - " besci.check_address , besci.create_user_name , besci.conclusion " - "FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id " - " LEFT JOIN biz_equipment_standard_check_info_equipment bescie ON bei.id = bescie.check_equipment_id" - " WHERE bei.id = :id "); + query.prepare("SELECT bei.* FROM biz_equipment_standard_check_info_equipment bescie " + " JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id " + " WHERE bescie.data_id = :data_id "); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { CheckDataManageBasicInfo basicInfo; @@ -951,13 +1012,6 @@ basicInfo.model = query.value("model").toString(); basicInfo.manufacture_no = query.value("manufacture_no").toString(); basicInfo.manufacturer = query.value("manufacturer").toString(); - basicInfo.temperature = query.value("temperature").toString(); - basicInfo.humidity = query.value("humidity").toString(); - basicInfo.check_date = query.value("check_date").toDate(); - basicInfo.check_address = query.value("check_address").toString(); - basicInfo.create_user_name = query.value("create_user_name").toString(); - basicInfo.conclusion = query.value("conclusion").toString(); - result.append(basicInfo); } } else { @@ -966,40 +1020,95 @@ return result; } -//核查数据管理-核查结果信息-核查项多功能校准源数据 待修改2024年3月18日13:05:42 -QList BaseCommonApi::getCheckDataManageResultManageMult(QString equipment_id) -{ -QList result; -QSqlQuery query; - query.prepare("SELECT DISTINCT bescidc.id , bescidc.check_type ,bescidc.params ,bescidc.unit ,bescidc.frequency ,bescidc.check_point ,besci.check_date ,bescidc.urel ," - " bescidc.tfer ,bescidc.dccp ,bescidc.flit " - " FROM biz_equipment_standard_check_item_data_calibrator bescidc " - " LEFT JOIN biz_equipment_standard_check_info besci ON besci.item_category_id = bescidc.item_category_id " - " WHERE bescidc.equipment_id = :equipment_id "); - // 将参数绑定到占位符 1692796512381222914 - query.bindValue(":equipment_id", equipment_id); +//核查数据管理-核查基本信息-基本信息 +CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id) +{ + CheckDataManageBasicInfo result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_info WHERE equipment_id = :equipment_id"); + + // 将参数绑定到占位符 + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + CheckDataManageBasicInfo basicInfo; + basicInfo.temperature = query.value("temperature").toString(); + basicInfo.humidity = query.value("humidity").toString(); + basicInfo.check_date = query.value("check_date").toDate(); + basicInfo.check_address = query.value("check_address").toString(); + basicInfo.create_user_name = query.value("create_user_name").toString(); + basicInfo.conclusion = query.value("conclusion").toString(); + result=basicInfo; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} + + +//核查数据管理-核查结果信息-核查项多功能校准源数据 参数首页数据的id +QList BaseCommonApi::getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList) +{ +QList result; +QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_data_calibrator WHERE data_id = :data_id "); + + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - CheckDataManageResultManageMult dataCalibrator; + StandCheckDataCalibrator dataCalibrator; dataCalibrator.id = query.value("id").toString(); + dataCalibrator.data_id = query.value("data_id").toString(); dataCalibrator.check_type = query.value("check_type").toString(); + dataCalibrator.test_type = query.value("test_type").toString(); dataCalibrator.params = query.value("params").toString(); dataCalibrator.unit = query.value("unit").toString(); dataCalibrator.frequency = query.value("frequency").toString(); + dataCalibrator.frequency_unit = query.value("frequency_unit").toString(); dataCalibrator.check_point = query.value("check_point").toString(); - dataCalibrator.check_date = query.value("check_date").toDate(); + + dataCalibrator.test_value_one_date = query.value("test_value_one_date").toDate(); + dataCalibrator.test_value_one = query.value("test_value_one").toString(); + + dataCalibrator.test_value_two_date = query.value("test_value_two_date").toDate(); + dataCalibrator.test_value_two = query.value("test_value_two").toString(); + + dataCalibrator.test_value_three_date = query.value("test_value_three_date").toDate(); + dataCalibrator.test_value_three = query.value("test_value_three").toString(); + + dataCalibrator.test_value_four_date = query.value("test_value_four_date").toDate(); + dataCalibrator.test_value_four = query.value("test_value_four").toString(); + + dataCalibrator.test_value_five_date = query.value("test_value_five_date").toDate(); + dataCalibrator.test_value_five = query.value("test_value_five").toString(); + + dataCalibrator.test_value_six_date = query.value("test_value_six_date").toDate(); + dataCalibrator.test_value_six = query.value("test_value_six").toString(); + + dataCalibrator.average_value = query.value("average_value").toString(); + dataCalibrator.standard_deviation = query.value("standard_deviation").toString(); + dataCalibrator.relative_repeatability = query.value("relative_repeatability").toString(); dataCalibrator.urel = query.value("urel").toString(); - dataCalibrator.tfer = query.value("tfer").toString(); - dataCalibrator.dccp = query.value("dccp").toString(); - dataCalibrator.flit = query.value("flit").toString(); + dataCalibrator.less_than = query.value("less_than").toString(); + dataCalibrator.qualified = query.value("qualified").toString(); + + + dataCalibrator.create_time = query.value("create_time").toDateTime(); + dataCalibrator.update_time = query.value("update_time").toDateTime(); result.append(dataCalibrator); } } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *HeadList<<"id"<<"核查数据管理基础信息表id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"频率单位"<<"核查点" + <<"核查读数1日期"<<"核查读数1(示值)"<<"核查读数2日期（稳定性）"<<"核查读数2（示值）" + <<"核查读数3日期（稳定性） "<<"核查读数3（示值）"<<"核查读数4日期（稳定性）"<<"核查读数4（示值）"<<"核查读数5日期（稳定性）" + <<"核查读数5（示值）"<<"核查读数6日期（稳定性）"<<"核查读数6（本次示值）"<<"核查读数平均值(算数平均值)"<<"Sn(x)(标准偏差)" + <<"Sn(x)/核查读数平均值(相对重复性)"<<"UREL"<<"是否小于相对扩展不确定度Urel(0/1)"<<"稳定性考核是否合格"<<"创建时间"<<"更新时间"; return result; } @@ -1352,6 +1461,27 @@ return isSuccess; } +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 +bool BaseCommonApi::InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:id,:data_id,:equipment_id,:create_time,:update_time)"); + QString createTime = deviceMeasure.create_time.toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", deviceMeasure.id); + query.bindValue(":data_id", deviceMeasure.data_id); + query.bindValue(":equipment_id", deviceMeasure.equipment_id); + query.bindValue(":create_time", createTime); + query.bindValue(":update_time", createTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) @@ -1600,8 +1730,6 @@ } return isSuccess; } -//自动核查-结果保存- - //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -1762,6 +1890,27 @@ } return result; } +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +bool BaseCommonApi::InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_info_equipment " + " (id,check_equipment_id,data_id) " + " VALUES " + " (:id,:check_equipment_id,:data_id)"); + query.bindValue(":id",equiment.id); + query.bindValue(":data_no",equiment.check_equipment_id); + query.bindValue(":check_date",equiment.data_id); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} + + + //自动核查--结果保存-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 bool BaseCommonApi::InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d3945d2..a8a8755 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -176,31 +176,30 @@ class CatDeviceInfor { public: - QString equipment_name; - QString model; - QString manufacture_no; - QString measure_valid_date; - QString product_country; - QString manufacturer; - QString produce_date; - QString purchase_date; - QString unit_price; - QString usage_status; - QString quality_status; - QString dept_name; - QString director_name; - QString supplier_name; - QString location; - QString type; - QString standard_type; - QString category; - QString level; - QString measure_cycle; - QString unpack_record_name; - QString remark; - + QString equipment_name; //设备名称 + QString model;//规格型号 + QString manufacture_no;//出厂编号 + QString measure_valid_date;//检定有效期 + QString product_country;//生产国家 + QString manufacturer;//生产厂家 + QString produce_date;//生产日期 + QString purchase_date;//购进日期 + QString unit_price;//设备单价 + QString usage_status;//使用状态 + QString quality_status;//质量状况 + QString dept_name;//所属部门 + QString director_name;//负责人 + QString supplier_name;//设备供方 + QString location;//位置信息 + QString type;//设备类型 + QString standard_type;//标准类型 + QString category;//设备分类 + QString level;//重要等级 + QString measure_cycle;//检定周期 + QString unpack_record_name;//对应开箱记录 + QString remark;//备注 }; -//标准设备管理-核查项目及核查点-直流稳压电源检定装置 +//标准设备管理-核查项目及核查点-直流稳压电源检定装置 待修改 2024年3月21日09:18:12 class CheckDCPower { public: @@ -312,27 +311,53 @@ QString meter_identify;//计量标识 QString restriction_instruction;//限用说明 }; -//检定数据管理-检定基本信息 -class VerificationBasicDataDetails +//检定数据管理-检定基本信息-标准设备 +class VerificationBasicDataDevice { public: -QString sample_name;//设备名称 +QString equipmentId;//设备id QString model;//型号规格 -QString help_instruction;//辅助字段 -QString manufacture_no;//出厂编号 +QString equipment_no;//出厂编号 QString manufacturer;//生产厂家 -QString customer_name;//委托单位 -QString based_documents;//依据技术文件 -QDate trace_date;//检定日期 -QString temperature;//环境温度 -QString humidity;//环境湿度 -QString measure_address;//检定地点 +QString equipment_name;//设备名称 +QString uncertainty;//不确定度 QDateTime measure_valid_date;//检定有效期 -QString NAME;//检定员 -QString conclusion;//结论 -QString restriction_instruction;//限用说明 }; -//检定数据管理-检定结果信息 待修改 查询的不对 2024年3月20日11:55:34 +//检定数据管理-检定基本信息 +class VerificationBasicDataDetails +{ +public: + QString id; + QString device_model_id;//受检设备规格型号表id + QString device_type;//设备分类(eqptDeviceType字典code) + QString belong_standard_equipment;//检校标准装置(字典code) + QString help_field_instruction;//辅助字段说明 + QString item_category_id;//设备检定项分类表id + QString item_category_name;//设备检定项分类名字 + QString data_sync;//检定项数据是否同步(1/0) + QString sync_time;//自动检定系统最新同步时间 + QString appearance_function_check;//外观及功能性检查(1/0) + QString category;//.设备分类(字典code) + QString equipment_name;//设备名称 + QString model;//型号规格 + QString help_instruction;//辅助说明 + QString item_remark;//检定项备注 + QString customer_name;//委托单位 + QString humidity;//湿度 + QString temperature;//温度 + QString measure_address;//检定地点 + QDateTime measure_valid_date;//检定有效期 + QString conclusion;//结论 + QString restriction_instruction;//限用说明 + QString based_documents;//技术文件 + QDate trace_date;//检定日期 + QString NAME;//检定员 + QDateTime create_time; + QDateTime update_time; + +}; + +//检定数据管理-检定结果信息 未使用 2024年3月21日09:24:38 使用的是QStringList class VerificationResultData { public: @@ -355,8 +380,8 @@ { public: QString id; - QString equipment_name;//设备名称 - QString model;//型号规格 + QString equipmentName;//设备名称 + QString equipmentModel;//型号规格 QString manufacture_no;//出厂编号 QString meter_standard_name;//核查件 QString meter_standard_id;//核查件编号 @@ -390,22 +415,33 @@ QDateTime create_time; QDateTime update_time; }; -//核查数据管理-核查结果信息-核查项多功能校准源数据 -class CheckDataManageResultManageMult -{ -public: - QString id;//序号 - QString check_type;//核查类型 - QString params;//参数 - QString unit;//单位 - QString frequency;//频率 - QString check_point;//核查点 - QDate check_date;//核查日期 - QString urel;//Urel - QString tfer;//tfer - QString dccp;//dccp - QString flit;//flit -}; + + +////核查数据管理-核查结果信息-核查项多功能校准源数据 +//class CheckDataManageResultManageMult +//{ +//public: +// QString id;//序号 +// QString check_type;//核查类型 +// QString params;//参数 +// QString unit;//单位 +// QString frequency;//频率 +// QString check_point;//核查点 +// QDate test_value_one_date;//核查日期1 +// QString test_value_one;//核查读数1（示值） +// QDate test_value_two_date;//核查日期2 +// QString test_value_two;//核查读数2（示值） +// QDate test_value_three_date;//核查日期3 +// QString test_value_three;//核查读数3（示值） +// QDate test_value_four_date;//核查日期4 +// QString test_value_four;//核查读数4（示值） +// QDate test_value_five_date;//核查日期5 +// QString test_value_five;//核查读数5（示值） +// QDate test_value_six_date;//核查日期6 +// QString test_value_six;//核查读数6（本次示值） +// QString dccp;//dccp +// QString flit;//flit +//}; //技术文件 class Technique_File @@ -581,7 +617,7 @@ QString manufacture_no;//出厂编号 QString manufacturer;//生产厂家 }; -// 核查项及核查点--多功能校准源 biz_equipment_standard_check_item_data_calibrator +// 核查项及核查点--多功能校准源 biz_equipment_standard_check_item_data_calibrator 未使用 使用的是QStringList class VerificationItemsMulti { public: @@ -606,6 +642,15 @@ QDateTime create_time;//创建时间 QDateTime update_time;//更新时间 }; +//设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +class StandCheckInfoEquipent +{ +public: + QString id; + QString check_equipment_id;//做核查标准设备id + QString data_id;//核查数据基本信息表id +}; + //核查结果信息数据保存-多功能校准源-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 class StandCheckDataCalibrator { @@ -703,7 +748,16 @@ QString NAME;//名字 QString DEPT_ID;//部门id }; - +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 2024年3月21日10:26:01 +class DeviceMeasureEquipment +{ +public: + QString id; + QString data_id;//检定数据管理基础信息表id + QString equipment_id;//设备台账id + QDateTime create_time; + QDateTime update_time; +}; @@ -722,6 +776,11 @@ //判断核查装置表并查询 参数设备id static QList Search_VerifyTable(QString DeiverId,QStringList *HeadList ); + //判断检定数据管理 结果信息表 + static QList Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList); + + //判断核查数据管理 结果信息表 + static QList Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList); //部门任务 废弃 @@ -773,16 +832,21 @@ static QList getVerMultiCal(QString itemId,QStringList *headList); // 获取检定数据管理 首页 static QList getVerificationData(); - // 检定数据管理-检定基本信息 - static QList getVerificationBasicDataDetails(QString id); - //检定数据管理-检定结果信息 - static QList getVerificationResultData(QString sampleId,QStringList *HeadList); + // 检定数据管理-检定基本信息-标准设备 + static QList getVerificationBasicDataDevice(QString id); + //检定数据管理-基本信息 参数首页数据的id + static VerificationBasicDataDetails getVerificationBasicDataDetails(QString dataId); + //检定数据管理-检定结果信息-多功能校准源 + static QList getVerificationMultiCalResultData(QString sampleId,QStringList *HeadList); //核查数据管理-首页 static QList getCheckData(); - // 核查数据管理-基本信息 - static QList getCheckDataManageBasicInfo(QString id); - //核查数据管理-核查结果信息-核查项多功能校准源数据 - static QList getCheckDataManageResultManageMult(QString equipment_id); + // 核查数据管理-基本信息-核查件 + static QList getCheckDataManageBasicInfoDevice(QString id); + //核查数据管理-基本信息-基本信息 参数设备id + static CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id); + + //核查数据管理-核查结果信息-核查数据 多功能校准源数据 + static QList getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList); //技术文件 static QList getTechnique_File(); //检定程序管理首页查询 @@ -820,6 +884,8 @@ bool AddTaskNumber(); //自动检定-结果保存-基本信息 static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); + //自动检定-结果保存-数据关联-计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 + static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-更新检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); // 核查程序管理首页查询 @@ -838,6 +904,8 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 412d7b3..45d7624 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -717,8 +717,9 @@ return DataList; } -//查找设备对应的装置表 传参设备id 核查项目及核查点 -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +<<<<<<< .mine//核查设备对应的装置表 核查项及核查点 传参设备id +=======//查找设备对应的装置表 传参设备id 核查项目及核查点 +>>>>>>> .theirsQList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -731,8 +732,40 @@ } return DataList; } +//判断检定数据管理 结果信息表 +QList Search_CalibrationDataTable(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: //多功能校准源 -//被检设备管理-检定项目及检定点-多功能校准源 +<<<<<<< .mine DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); + break; + } + return DataList; +} +//判断核查数据管理 结果信息表 +QList 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; +} + + + +=======>>>>>>> .theirs//被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { QList resultData; @@ -784,12 +817,17 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bbdmi.id , bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ," - "bbdmi.manufacturer , bboi.customer_name , dept.FULL_NAME , _user.NAME , bbdmi.trace_date ," - "bbdmi.measure_valid_date , eei.meter_identify , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id"); + bool isSuccess = query.exec("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " + " bbdmii.belong_standard_equipment, bboi.customer_address,_user.NAME,eei.meter_identify,dept.FULL_NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " + " LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = " + " bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " ORDER BY bbdmi.create_time DESC"); if (isSuccess) { while (query.next()) { @@ -800,6 +838,7 @@ verificationData.help_instruction = query.value("help_instruction").toString(); verificationData.manufacture_no = query.value("manufacture_no").toString(); verificationData.manufacturer = query.value("manufacturer").toString(); + verificationData.customer_name = query.value("customer_name").toString(); verificationData.FULL_NAME = query.value("FULL_NAME").toString(); verificationData.NAME = query.value("NAME").toString(); verificationData.trace_date = query.value("trace_date").toDate(); @@ -815,40 +854,28 @@ return result; } -//检定数据管理-检定基本信息 -QList BaseCommonApi::getVerificationBasicDataDetails(QString id) +//检定数据管理-检定基本信息-标准设备 参数：首页数据的id +QList BaseCommonApi::getVerificationBasicDataDevice(QString data_id) { -QList result; +QList result; QSqlQuery query; - query.prepare("SELECT bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ,bbdmi.manufacturer ," - " bboi.customer_name, eemtte.based_documents, bbdmi.trace_date , bbdmi.temperature , bbdmi.humidity ," - "bbdmi.measure_address , bbdmi.measure_valid_date , _user.NAME , bbdmi.conclusion , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id " - " LEFT JOIN biz_business_device_measure_item_info bbdmii ON bbdmi.item_id = bbdmii.id " - " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id WHERE bbdmi.id = :id "); + query.prepare("SELECT bei.id AS equipmentId, bei.equipment_no, bei.equipment_name, bei.manufacture_no, bei.model, bei.measure_valid_date, " + "bett.uncertainty " + " FROM biz_business_device_measure_equipment bbdme " + " JOIN biz_equipment_info bei ON bei.id = bbdme.equipment_id " + " Left JOIN biz_equipment_technical_target bett ON bei.equipment_no = bett.equipment_no " + " WHERE bbdme.data_id = :data_id"); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - VerificationBasicDataDetails dataDetails; - dataDetails.sample_name = query.value("sample_name").toString(); + VerificationBasicDataDevice dataDetails; + dataDetails.equipmentId = query.value("equipmentId").toString(); + dataDetails.equipment_no = query.value("equipment_no").toString(); + dataDetails.equipment_name = query.value("equipment_name").toString(); dataDetails.model = query.value("model").toString(); - dataDetails.help_instruction = query.value("help_instruction").toString(); - dataDetails.manufacture_no = query.value("manufacture_no").toString(); - dataDetails.manufacturer = query.value("manufacturer").toString(); - dataDetails.customer_name = query.value("customer_name").toString(); - dataDetails.trace_date = query.value("trace_date").toDate(); - dataDetails.temperature = query.value("temperature").toString(); - dataDetails.humidity = query.value("humidity").toString(); - dataDetails.measure_address = query.value("measure_address").toString(); dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); - dataDetails.based_documents = query.value("based_documents").toString(); - dataDetails.NAME = query.value("NAME").toString(); - dataDetails.conclusion = query.value("conclusion").toString(); - dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); - + dataDetails.uncertainty = query.value("uncertainty").toString(); result.append(dataDetails); } } else { @@ -857,22 +884,55 @@ return result; } -//检定数据管理-检定结果信息 -QList BaseCommonApi::getVerificationResultData(QString sampleId,QStringList *HeadList) +//检定数据管理-检定基本信息 +VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id) { - sampleId="1716997603953311746"; + VerificationBasicDataDetails result; + QSqlQuery query; + query.prepare("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bboi.order_no,,eemtte.based_documents,_user.NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) " + " JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " WHERE bbdmi.item_id = :item_id " + " ORDER BY bbdmi.update_time DESC" + " LIMIT 1"); + // 将参数绑定到占位符 + query.bindValue(":item_id", item_id); + if (query.exec()) { + while (query.next()) { + VerificationBasicDataDetails dataDetails; + dataDetails.customer_name = query.value("customer_name").toString(); + dataDetails.humidity = query.value("humidity").toString(); + dataDetails.temperature = query.value("temperature").toString(); +// dataDetails.model = query.value("model").toString(); + dataDetails.measure_address = query.value("measure_address").toString(); + dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); + dataDetails.conclusion = query.value("conclusion").toString(); + dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); + dataDetails.based_documents = query.value("based_documents").toString(); + dataDetails.trace_date = query.value("trace_date").toDate(); + dataDetails.NAME = query.value("NAME").toString(); + result = dataDetails; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} +//检定数据管理-检定结果信息 SaveDeviceMeasureCalibrator 多功能校准源结果数据表 +QList BaseCommonApi::getVerificationMultiCalResultData(QString dataId,QStringList *HeadList) +{ QList resultData; QStringList result; QSqlQuery query; - query.prepare("SELECT bbdmidc.id ,bbdmidc.params ,bbdmidc.capacity ,bbdmidc.unit ," - " bbdmidc.frequency , bbdmidc.range_range , bbdmidc.standard_value , bbdmidc.resolution , bbdmidc.maximum_error , " - " bbdmidc.error_param_a , bbdmidc.error_param_b ,bbdmi.other_outcome " - " FROM biz_business_device_measure_item_data_calibrator bbdmidc " - " LEFT JOIN biz_business_device_measure_info bbdmi ON bbdmi.item_id = bbdmidc.item_id " - "WHERE bbdmidc.item_id = (SELECT CONVERT(item_id USING utf8mb4) COLLATE utf8mb4_0900_ai_ci FROM biz_business_device_measure_info bbdmi " - " WHERE sample_id = :sampleId )"); + query.prepare("SELECT * FROM biz_business_device_measure_data_calibrator WHERE data_id = :dataId "); // 将参数绑定到占位符 - query.bindValue(":sampleId", sampleId); + query.bindValue(":dataId", dataId); if (query.exec()) { while (query.next()) { result.clear(); @@ -894,7 +954,7 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - *HeadList<<"序号"<<"参数"<<"量"<<"单位"<<"频率" + *HeadList<<"id"<<"参数"<<"量"<<"单位"<<"频率" <<"量程"<<"标准值"<<"分辨力"<<"最大允许误差"<<"误差参数a" <<"误差参数b"<<"合格率"; @@ -906,19 +966,21 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id , bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.meter_standard_name ,bei.meter_standard_id ," - " besci.create_user_name , besci.check_date , bei.dept_name,blrd.biz_lab_code " - " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id" - " LEFT JOIN biz_lab_rel_dept blrd ON blrd.dept_id = bei.dept_id"); + bool isSuccess = query.exec("SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, " + " bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment,beit.manufacture_no,besci.create_user_name " + " FROM biz_equipment_standard_check_info besci " + " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " + " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " + " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); if (isSuccess) { while (query.next()) { CheckData dataManage; dataManage.id = query.value("id").toString(); - dataManage.equipment_name = query.value("equipment_name").toString(); - dataManage.model = query.value("model").toString(); + dataManage.equipmentName = query.value("equipmentName").toString(); + dataManage.equipmentModel = query.value("equipmentModel").toString(); dataManage.manufacture_no = query.value("manufacture_no").toString(); - dataManage.meter_standard_name = query.value("meter_standard_name").toString(); - dataManage.meter_standard_id = query.value("meter_standard_id").toString(); +// dataManage.meter_standard_name = query.value("meter_standard_name").toString(); +// dataManage.meter_standard_id = query.value("meter_standard_id").toString(); dataManage.create_user_name = query.value("create_user_name").toString(); dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); @@ -931,19 +993,18 @@ return result; } -//核查数据管理-核查基本信息 -QList BaseCommonApi::getCheckDataManageBasicInfo(QString id) + +//核查数据管理-核查基本信息-核查件 参数为 首页id +QList BaseCommonApi::getCheckDataManageBasicInfoDevice(QString data_id) { QList result; QSqlQuery query; - query.prepare("SELECT bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer ,besci.temperature ,besci.humidity ,besci.check_date ," - " besci.check_address , besci.create_user_name , besci.conclusion " - "FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id " - " LEFT JOIN biz_equipment_standard_check_info_equipment bescie ON bei.id = bescie.check_equipment_id" - " WHERE bei.id = :id "); + query.prepare("SELECT bei.* FROM biz_equipment_standard_check_info_equipment bescie " + " JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id " + " WHERE bescie.data_id = :data_id "); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { CheckDataManageBasicInfo basicInfo; @@ -951,13 +1012,6 @@ basicInfo.model = query.value("model").toString(); basicInfo.manufacture_no = query.value("manufacture_no").toString(); basicInfo.manufacturer = query.value("manufacturer").toString(); - basicInfo.temperature = query.value("temperature").toString(); - basicInfo.humidity = query.value("humidity").toString(); - basicInfo.check_date = query.value("check_date").toDate(); - basicInfo.check_address = query.value("check_address").toString(); - basicInfo.create_user_name = query.value("create_user_name").toString(); - basicInfo.conclusion = query.value("conclusion").toString(); - result.append(basicInfo); } } else { @@ -966,40 +1020,95 @@ return result; } -//核查数据管理-核查结果信息-核查项多功能校准源数据 待修改2024年3月18日13:05:42 -QList BaseCommonApi::getCheckDataManageResultManageMult(QString equipment_id) -{ -QList result; -QSqlQuery query; - query.prepare("SELECT DISTINCT bescidc.id , bescidc.check_type ,bescidc.params ,bescidc.unit ,bescidc.frequency ,bescidc.check_point ,besci.check_date ,bescidc.urel ," - " bescidc.tfer ,bescidc.dccp ,bescidc.flit " - " FROM biz_equipment_standard_check_item_data_calibrator bescidc " - " LEFT JOIN biz_equipment_standard_check_info besci ON besci.item_category_id = bescidc.item_category_id " - " WHERE bescidc.equipment_id = :equipment_id "); - // 将参数绑定到占位符 1692796512381222914 - query.bindValue(":equipment_id", equipment_id); +//核查数据管理-核查基本信息-基本信息 +CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id) +{ + CheckDataManageBasicInfo result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_info WHERE equipment_id = :equipment_id"); + + // 将参数绑定到占位符 + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + CheckDataManageBasicInfo basicInfo; + basicInfo.temperature = query.value("temperature").toString(); + basicInfo.humidity = query.value("humidity").toString(); + basicInfo.check_date = query.value("check_date").toDate(); + basicInfo.check_address = query.value("check_address").toString(); + basicInfo.create_user_name = query.value("create_user_name").toString(); + basicInfo.conclusion = query.value("conclusion").toString(); + result=basicInfo; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} + + +//核查数据管理-核查结果信息-核查项多功能校准源数据 参数首页数据的id +QList BaseCommonApi::getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList) +{ +QList result; +QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_data_calibrator WHERE data_id = :data_id "); + + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - CheckDataManageResultManageMult dataCalibrator; + StandCheckDataCalibrator dataCalibrator; dataCalibrator.id = query.value("id").toString(); + dataCalibrator.data_id = query.value("data_id").toString(); dataCalibrator.check_type = query.value("check_type").toString(); + dataCalibrator.test_type = query.value("test_type").toString(); dataCalibrator.params = query.value("params").toString(); dataCalibrator.unit = query.value("unit").toString(); dataCalibrator.frequency = query.value("frequency").toString(); + dataCalibrator.frequency_unit = query.value("frequency_unit").toString(); dataCalibrator.check_point = query.value("check_point").toString(); - dataCalibrator.check_date = query.value("check_date").toDate(); + + dataCalibrator.test_value_one_date = query.value("test_value_one_date").toDate(); + dataCalibrator.test_value_one = query.value("test_value_one").toString(); + + dataCalibrator.test_value_two_date = query.value("test_value_two_date").toDate(); + dataCalibrator.test_value_two = query.value("test_value_two").toString(); + + dataCalibrator.test_value_three_date = query.value("test_value_three_date").toDate(); + dataCalibrator.test_value_three = query.value("test_value_three").toString(); + + dataCalibrator.test_value_four_date = query.value("test_value_four_date").toDate(); + dataCalibrator.test_value_four = query.value("test_value_four").toString(); + + dataCalibrator.test_value_five_date = query.value("test_value_five_date").toDate(); + dataCalibrator.test_value_five = query.value("test_value_five").toString(); + + dataCalibrator.test_value_six_date = query.value("test_value_six_date").toDate(); + dataCalibrator.test_value_six = query.value("test_value_six").toString(); + + dataCalibrator.average_value = query.value("average_value").toString(); + dataCalibrator.standard_deviation = query.value("standard_deviation").toString(); + dataCalibrator.relative_repeatability = query.value("relative_repeatability").toString(); dataCalibrator.urel = query.value("urel").toString(); - dataCalibrator.tfer = query.value("tfer").toString(); - dataCalibrator.dccp = query.value("dccp").toString(); - dataCalibrator.flit = query.value("flit").toString(); + dataCalibrator.less_than = query.value("less_than").toString(); + dataCalibrator.qualified = query.value("qualified").toString(); + + + dataCalibrator.create_time = query.value("create_time").toDateTime(); + dataCalibrator.update_time = query.value("update_time").toDateTime(); result.append(dataCalibrator); } } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *HeadList<<"id"<<"核查数据管理基础信息表id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"频率单位"<<"核查点" + <<"核查读数1日期"<<"核查读数1(示值)"<<"核查读数2日期（稳定性）"<<"核查读数2（示值）" + <<"核查读数3日期（稳定性） "<<"核查读数3（示值）"<<"核查读数4日期（稳定性）"<<"核查读数4（示值）"<<"核查读数5日期（稳定性）" + <<"核查读数5（示值）"<<"核查读数6日期（稳定性）"<<"核查读数6（本次示值）"<<"核查读数平均值(算数平均值)"<<"Sn(x)(标准偏差)" + <<"Sn(x)/核查读数平均值(相对重复性)"<<"UREL"<<"是否小于相对扩展不确定度Urel(0/1)"<<"稳定性考核是否合格"<<"创建时间"<<"更新时间"; return result; } @@ -1352,6 +1461,27 @@ return isSuccess; } +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 +bool BaseCommonApi::InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:id,:data_id,:equipment_id,:create_time,:update_time)"); + QString createTime = deviceMeasure.create_time.toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", deviceMeasure.id); + query.bindValue(":data_id", deviceMeasure.data_id); + query.bindValue(":equipment_id", deviceMeasure.equipment_id); + query.bindValue(":create_time", createTime); + query.bindValue(":update_time", createTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) @@ -1600,8 +1730,6 @@ } return isSuccess; } -//自动核查-结果保存- - //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -1762,6 +1890,27 @@ } return result; } +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +bool BaseCommonApi::InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_info_equipment " + " (id,check_equipment_id,data_id) " + " VALUES " + " (:id,:check_equipment_id,:data_id)"); + query.bindValue(":id",equiment.id); + query.bindValue(":data_no",equiment.check_equipment_id); + query.bindValue(":check_date",equiment.data_id); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} + + + //自动核查--结果保存-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 bool BaseCommonApi::InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d3945d2..a8a8755 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -176,31 +176,30 @@ class CatDeviceInfor { public: - QString equipment_name; - QString model; - QString manufacture_no; - QString measure_valid_date; - QString product_country; - QString manufacturer; - QString produce_date; - QString purchase_date; - QString unit_price; - QString usage_status; - QString quality_status; - QString dept_name; - QString director_name; - QString supplier_name; - QString location; - QString type; - QString standard_type; - QString category; - QString level; - QString measure_cycle; - QString unpack_record_name; - QString remark; - + QString equipment_name; //设备名称 + QString model;//规格型号 + QString manufacture_no;//出厂编号 + QString measure_valid_date;//检定有效期 + QString product_country;//生产国家 + QString manufacturer;//生产厂家 + QString produce_date;//生产日期 + QString purchase_date;//购进日期 + QString unit_price;//设备单价 + QString usage_status;//使用状态 + QString quality_status;//质量状况 + QString dept_name;//所属部门 + QString director_name;//负责人 + QString supplier_name;//设备供方 + QString location;//位置信息 + QString type;//设备类型 + QString standard_type;//标准类型 + QString category;//设备分类 + QString level;//重要等级 + QString measure_cycle;//检定周期 + QString unpack_record_name;//对应开箱记录 + QString remark;//备注 }; -//标准设备管理-核查项目及核查点-直流稳压电源检定装置 +//标准设备管理-核查项目及核查点-直流稳压电源检定装置 待修改 2024年3月21日09:18:12 class CheckDCPower { public: @@ -312,27 +311,53 @@ QString meter_identify;//计量标识 QString restriction_instruction;//限用说明 }; -//检定数据管理-检定基本信息 -class VerificationBasicDataDetails +//检定数据管理-检定基本信息-标准设备 +class VerificationBasicDataDevice { public: -QString sample_name;//设备名称 +QString equipmentId;//设备id QString model;//型号规格 -QString help_instruction;//辅助字段 -QString manufacture_no;//出厂编号 +QString equipment_no;//出厂编号 QString manufacturer;//生产厂家 -QString customer_name;//委托单位 -QString based_documents;//依据技术文件 -QDate trace_date;//检定日期 -QString temperature;//环境温度 -QString humidity;//环境湿度 -QString measure_address;//检定地点 +QString equipment_name;//设备名称 +QString uncertainty;//不确定度 QDateTime measure_valid_date;//检定有效期 -QString NAME;//检定员 -QString conclusion;//结论 -QString restriction_instruction;//限用说明 }; -//检定数据管理-检定结果信息 待修改 查询的不对 2024年3月20日11:55:34 +//检定数据管理-检定基本信息 +class VerificationBasicDataDetails +{ +public: + QString id; + QString device_model_id;//受检设备规格型号表id + QString device_type;//设备分类(eqptDeviceType字典code) + QString belong_standard_equipment;//检校标准装置(字典code) + QString help_field_instruction;//辅助字段说明 + QString item_category_id;//设备检定项分类表id + QString item_category_name;//设备检定项分类名字 + QString data_sync;//检定项数据是否同步(1/0) + QString sync_time;//自动检定系统最新同步时间 + QString appearance_function_check;//外观及功能性检查(1/0) + QString category;//.设备分类(字典code) + QString equipment_name;//设备名称 + QString model;//型号规格 + QString help_instruction;//辅助说明 + QString item_remark;//检定项备注 + QString customer_name;//委托单位 + QString humidity;//湿度 + QString temperature;//温度 + QString measure_address;//检定地点 + QDateTime measure_valid_date;//检定有效期 + QString conclusion;//结论 + QString restriction_instruction;//限用说明 + QString based_documents;//技术文件 + QDate trace_date;//检定日期 + QString NAME;//检定员 + QDateTime create_time; + QDateTime update_time; + +}; + +//检定数据管理-检定结果信息 未使用 2024年3月21日09:24:38 使用的是QStringList class VerificationResultData { public: @@ -355,8 +380,8 @@ { public: QString id; - QString equipment_name;//设备名称 - QString model;//型号规格 + QString equipmentName;//设备名称 + QString equipmentModel;//型号规格 QString manufacture_no;//出厂编号 QString meter_standard_name;//核查件 QString meter_standard_id;//核查件编号 @@ -390,22 +415,33 @@ QDateTime create_time; QDateTime update_time; }; -//核查数据管理-核查结果信息-核查项多功能校准源数据 -class CheckDataManageResultManageMult -{ -public: - QString id;//序号 - QString check_type;//核查类型 - QString params;//参数 - QString unit;//单位 - QString frequency;//频率 - QString check_point;//核查点 - QDate check_date;//核查日期 - QString urel;//Urel - QString tfer;//tfer - QString dccp;//dccp - QString flit;//flit -}; + + +////核查数据管理-核查结果信息-核查项多功能校准源数据 +//class CheckDataManageResultManageMult +//{ +//public: +// QString id;//序号 +// QString check_type;//核查类型 +// QString params;//参数 +// QString unit;//单位 +// QString frequency;//频率 +// QString check_point;//核查点 +// QDate test_value_one_date;//核查日期1 +// QString test_value_one;//核查读数1（示值） +// QDate test_value_two_date;//核查日期2 +// QString test_value_two;//核查读数2（示值） +// QDate test_value_three_date;//核查日期3 +// QString test_value_three;//核查读数3（示值） +// QDate test_value_four_date;//核查日期4 +// QString test_value_four;//核查读数4（示值） +// QDate test_value_five_date;//核查日期5 +// QString test_value_five;//核查读数5（示值） +// QDate test_value_six_date;//核查日期6 +// QString test_value_six;//核查读数6（本次示值） +// QString dccp;//dccp +// QString flit;//flit +//}; //技术文件 class Technique_File @@ -581,7 +617,7 @@ QString manufacture_no;//出厂编号 QString manufacturer;//生产厂家 }; -// 核查项及核查点--多功能校准源 biz_equipment_standard_check_item_data_calibrator +// 核查项及核查点--多功能校准源 biz_equipment_standard_check_item_data_calibrator 未使用 使用的是QStringList class VerificationItemsMulti { public: @@ -606,6 +642,15 @@ QDateTime create_time;//创建时间 QDateTime update_time;//更新时间 }; +//设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +class StandCheckInfoEquipent +{ +public: + QString id; + QString check_equipment_id;//做核查标准设备id + QString data_id;//核查数据基本信息表id +}; + //核查结果信息数据保存-多功能校准源-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 class StandCheckDataCalibrator { @@ -703,7 +748,16 @@ QString NAME;//名字 QString DEPT_ID;//部门id }; - +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 2024年3月21日10:26:01 +class DeviceMeasureEquipment +{ +public: + QString id; + QString data_id;//检定数据管理基础信息表id + QString equipment_id;//设备台账id + QDateTime create_time; + QDateTime update_time; +}; @@ -722,6 +776,11 @@ //判断核查装置表并查询 参数设备id static QList Search_VerifyTable(QString DeiverId,QStringList *HeadList ); + //判断检定数据管理 结果信息表 + static QList Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList); + + //判断核查数据管理 结果信息表 + static QList Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList); //部门任务 废弃 @@ -773,16 +832,21 @@ static QList getVerMultiCal(QString itemId,QStringList *headList); // 获取检定数据管理 首页 static QList getVerificationData(); - // 检定数据管理-检定基本信息 - static QList getVerificationBasicDataDetails(QString id); - //检定数据管理-检定结果信息 - static QList getVerificationResultData(QString sampleId,QStringList *HeadList); + // 检定数据管理-检定基本信息-标准设备 + static QList getVerificationBasicDataDevice(QString id); + //检定数据管理-基本信息 参数首页数据的id + static VerificationBasicDataDetails getVerificationBasicDataDetails(QString dataId); + //检定数据管理-检定结果信息-多功能校准源 + static QList getVerificationMultiCalResultData(QString sampleId,QStringList *HeadList); //核查数据管理-首页 static QList getCheckData(); - // 核查数据管理-基本信息 - static QList getCheckDataManageBasicInfo(QString id); - //核查数据管理-核查结果信息-核查项多功能校准源数据 - static QList getCheckDataManageResultManageMult(QString equipment_id); + // 核查数据管理-基本信息-核查件 + static QList getCheckDataManageBasicInfoDevice(QString id); + //核查数据管理-基本信息-基本信息 参数设备id + static CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id); + + //核查数据管理-核查结果信息-核查数据 多功能校准源数据 + static QList getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList); //技术文件 static QList getTechnique_File(); //检定程序管理首页查询 @@ -820,6 +884,8 @@ bool AddTaskNumber(); //自动检定-结果保存-基本信息 static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); + //自动检定-结果保存-数据关联-计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 + static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-更新检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); // 核查程序管理首页查询 @@ -838,6 +904,8 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index 8593fd8..16f93ad 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -75,8 +75,8 @@ ui->tableWidget->insertRow(rowCount); ui->tableWidget->setItem(row, 0, new QTableWidgetItem(item.id)); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(item.equipment_name)); - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(item.model)); + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(item.equipmentName)); + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(item.equipmentModel)); ui->tableWidget->setItem(row, 4, new QTableWidgetItem(item.manufacture_no)); ui->tableWidget->setItem(row, 5, new QTableWidgetItem(item.meter_standard_name)); ui->tableWidget->setItem(row, 6, new QTableWidgetItem("缺少")); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 412d7b3..45d7624 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -717,8 +717,9 @@ return DataList; } -//查找设备对应的装置表 传参设备id 核查项目及核查点 -QList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) +<<<<<<< .mine//核查设备对应的装置表 核查项及核查点 传参设备id +=======//查找设备对应的装置表 传参设备id 核查项目及核查点 +>>>>>>> .theirsQList BaseCommonApi::Search_VerifyTable(QString DeiverId,QStringList *HeadList ) { QList DataList; JudgeCalibrationTable CliTable=BaseCommonApi::getJudgeVerifyTable(DeiverId); @@ -731,8 +732,40 @@ } return DataList; } +//判断检定数据管理 结果信息表 +QList Search_CalibrationDataTable(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: //多功能校准源 -//被检设备管理-检定项目及检定点-多功能校准源 +<<<<<<< .mine DataList = BaseCommonApi::getVerificationMultiCalResultData(dataId,HeadList); + break; + } + return DataList; +} +//判断核查数据管理 结果信息表 +QList 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; +} + + + +=======>>>>>>> .theirs//被检设备管理-检定项目及检定点-多功能校准源 QList BaseCommonApi::getVerMultiCal(QString itemId,QStringList *headList) { QList resultData; @@ -784,12 +817,17 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bbdmi.id , bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ," - "bbdmi.manufacturer , bboi.customer_name , dept.FULL_NAME , _user.NAME , bbdmi.trace_date ," - "bbdmi.measure_valid_date , eei.meter_identify , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id"); + bool isSuccess = query.exec("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, " + " bbdmii.belong_standard_equipment, bboi.customer_address,_user.NAME,eei.meter_identify,dept.FULL_NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " + " LEFT JOIN sys_dept dept ON eei.dept_id = dept.ID " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = " + " bbdmi.sample_id) JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " ORDER BY bbdmi.create_time DESC"); if (isSuccess) { while (query.next()) { @@ -800,6 +838,7 @@ verificationData.help_instruction = query.value("help_instruction").toString(); verificationData.manufacture_no = query.value("manufacture_no").toString(); verificationData.manufacturer = query.value("manufacturer").toString(); + verificationData.customer_name = query.value("customer_name").toString(); verificationData.FULL_NAME = query.value("FULL_NAME").toString(); verificationData.NAME = query.value("NAME").toString(); verificationData.trace_date = query.value("trace_date").toDate(); @@ -815,40 +854,28 @@ return result; } -//检定数据管理-检定基本信息 -QList BaseCommonApi::getVerificationBasicDataDetails(QString id) +//检定数据管理-检定基本信息-标准设备 参数：首页数据的id +QList BaseCommonApi::getVerificationBasicDataDevice(QString data_id) { -QList result; +QList result; QSqlQuery query; - query.prepare("SELECT bbdmi.sample_name ,bbdmi.model ,eei.help_instruction ,bbdmi.manufacture_no ,bbdmi.manufacturer ," - " bboi.customer_name, eemtte.based_documents, bbdmi.trace_date , bbdmi.temperature , bbdmi.humidity ," - "bbdmi.measure_address , bbdmi.measure_valid_date , _user.NAME , bbdmi.conclusion , bbdmi.restriction_instruction " - "FROM biz_business_device_measure_info bbdmi LEFT JOIN eqpt_equipment_info eei ON bbdmi.sample_id = eei.id " - " LEFT JOIN biz_business_order_info bboi ON bbdmi.order_id = bboi.id " - " LEFT JOIN biz_business_device_measure_item_info bbdmii ON bbdmi.item_id = bbdmii.id " - " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " - " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id WHERE bbdmi.id = :id "); + query.prepare("SELECT bei.id AS equipmentId, bei.equipment_no, bei.equipment_name, bei.manufacture_no, bei.model, bei.measure_valid_date, " + "bett.uncertainty " + " FROM biz_business_device_measure_equipment bbdme " + " JOIN biz_equipment_info bei ON bei.id = bbdme.equipment_id " + " Left JOIN biz_equipment_technical_target bett ON bei.equipment_no = bett.equipment_no " + " WHERE bbdme.data_id = :data_id"); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - VerificationBasicDataDetails dataDetails; - dataDetails.sample_name = query.value("sample_name").toString(); + VerificationBasicDataDevice dataDetails; + dataDetails.equipmentId = query.value("equipmentId").toString(); + dataDetails.equipment_no = query.value("equipment_no").toString(); + dataDetails.equipment_name = query.value("equipment_name").toString(); dataDetails.model = query.value("model").toString(); - dataDetails.help_instruction = query.value("help_instruction").toString(); - dataDetails.manufacture_no = query.value("manufacture_no").toString(); - dataDetails.manufacturer = query.value("manufacturer").toString(); - dataDetails.customer_name = query.value("customer_name").toString(); - dataDetails.trace_date = query.value("trace_date").toDate(); - dataDetails.temperature = query.value("temperature").toString(); - dataDetails.humidity = query.value("humidity").toString(); - dataDetails.measure_address = query.value("measure_address").toString(); dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); - dataDetails.based_documents = query.value("based_documents").toString(); - dataDetails.NAME = query.value("NAME").toString(); - dataDetails.conclusion = query.value("conclusion").toString(); - dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); - + dataDetails.uncertainty = query.value("uncertainty").toString(); result.append(dataDetails); } } else { @@ -857,22 +884,55 @@ return result; } -//检定数据管理-检定结果信息 -QList BaseCommonApi::getVerificationResultData(QString sampleId,QStringList *HeadList) +//检定数据管理-检定基本信息 +VerificationBasicDataDetails BaseCommonApi::getVerificationBasicDataDetails(QString item_id) { - sampleId="1716997603953311746"; + VerificationBasicDataDetails result; + QSqlQuery query; + query.prepare("SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, bboi.order_no,,eemtte.based_documents,_user.NAME" + " FROM biz_business_device_measure_info bbdmi " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id " + " JOIN eqpt_equipment_model_info eemi ON eemi.id = bbdmii.device_model_id " + " JOIN biz_business_order_sample_relation bbosr ON (bbosr.order_id = bbdmi.order_id AND bbosr.sample_id = bbdmi.sample_id) " + " JOIN biz_business_order_info bboi ON bbosr.order_id = bboi.id " + " LEFT JOIN eqpt_equipment_model_technical_target eemtte ON bbdmii.device_model_id = eemtte.model_id " + " LEFT JOIN sys_user _user ON bbdmi.create_user_id = _user.id " + " WHERE bbdmi.item_id = :item_id " + " ORDER BY bbdmi.update_time DESC" + " LIMIT 1"); + // 将参数绑定到占位符 + query.bindValue(":item_id", item_id); + if (query.exec()) { + while (query.next()) { + VerificationBasicDataDetails dataDetails; + dataDetails.customer_name = query.value("customer_name").toString(); + dataDetails.humidity = query.value("humidity").toString(); + dataDetails.temperature = query.value("temperature").toString(); +// dataDetails.model = query.value("model").toString(); + dataDetails.measure_address = query.value("measure_address").toString(); + dataDetails.measure_valid_date = query.value("measure_valid_date").toDateTime(); + dataDetails.conclusion = query.value("conclusion").toString(); + dataDetails.restriction_instruction = query.value("restriction_instruction").toString(); + dataDetails.based_documents = query.value("based_documents").toString(); + dataDetails.trace_date = query.value("trace_date").toDate(); + dataDetails.NAME = query.value("NAME").toString(); + result = dataDetails; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} +//检定数据管理-检定结果信息 SaveDeviceMeasureCalibrator 多功能校准源结果数据表 +QList BaseCommonApi::getVerificationMultiCalResultData(QString dataId,QStringList *HeadList) +{ QList resultData; QStringList result; QSqlQuery query; - query.prepare("SELECT bbdmidc.id ,bbdmidc.params ,bbdmidc.capacity ,bbdmidc.unit ," - " bbdmidc.frequency , bbdmidc.range_range , bbdmidc.standard_value , bbdmidc.resolution , bbdmidc.maximum_error , " - " bbdmidc.error_param_a , bbdmidc.error_param_b ,bbdmi.other_outcome " - " FROM biz_business_device_measure_item_data_calibrator bbdmidc " - " LEFT JOIN biz_business_device_measure_info bbdmi ON bbdmi.item_id = bbdmidc.item_id " - "WHERE bbdmidc.item_id = (SELECT CONVERT(item_id USING utf8mb4) COLLATE utf8mb4_0900_ai_ci FROM biz_business_device_measure_info bbdmi " - " WHERE sample_id = :sampleId )"); + query.prepare("SELECT * FROM biz_business_device_measure_data_calibrator WHERE data_id = :dataId "); // 将参数绑定到占位符 - query.bindValue(":sampleId", sampleId); + query.bindValue(":dataId", dataId); if (query.exec()) { while (query.next()) { result.clear(); @@ -894,7 +954,7 @@ } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - *HeadList<<"序号"<<"参数"<<"量"<<"单位"<<"频率" + *HeadList<<"id"<<"参数"<<"量"<<"单位"<<"频率" <<"量程"<<"标准值"<<"分辨力"<<"最大允许误差"<<"误差参数a" <<"误差参数b"<<"合格率"; @@ -906,19 +966,21 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id , bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.meter_standard_name ,bei.meter_standard_id ," - " besci.create_user_name , besci.check_date , bei.dept_name,blrd.biz_lab_code " - " FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id" - " LEFT JOIN biz_lab_rel_dept blrd ON blrd.dept_id = bei.dept_id"); + bool isSuccess = query.exec("SELECT besci.*, besi.standard_name AS standardEquipmentName, beit.equipment_name AS equipmentName, beit.model AS equipmentModel, " + " bescic.category_name AS itemCategoryName, bescic.belong_standard_equipment AS belongStandardEquipment,beit.manufacture_no,besci.create_user_name " + " FROM biz_equipment_standard_check_info besci " + " JOIN biz_equipment_standard_info besi ON besci.standard_equipment_id = besi.id " + " JOIN biz_equipment_info beit ON besci.equipment_id = beit.id " + " LEFT JOIN biz_equipment_standard_check_item_category bescic ON bescic.id = besci.item_category_id "); if (isSuccess) { while (query.next()) { CheckData dataManage; dataManage.id = query.value("id").toString(); - dataManage.equipment_name = query.value("equipment_name").toString(); - dataManage.model = query.value("model").toString(); + dataManage.equipmentName = query.value("equipmentName").toString(); + dataManage.equipmentModel = query.value("equipmentModel").toString(); dataManage.manufacture_no = query.value("manufacture_no").toString(); - dataManage.meter_standard_name = query.value("meter_standard_name").toString(); - dataManage.meter_standard_id = query.value("meter_standard_id").toString(); +// dataManage.meter_standard_name = query.value("meter_standard_name").toString(); +// dataManage.meter_standard_id = query.value("meter_standard_id").toString(); dataManage.create_user_name = query.value("create_user_name").toString(); dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); @@ -931,19 +993,18 @@ return result; } -//核查数据管理-核查基本信息 -QList BaseCommonApi::getCheckDataManageBasicInfo(QString id) + +//核查数据管理-核查基本信息-核查件 参数为 首页id +QList BaseCommonApi::getCheckDataManageBasicInfoDevice(QString data_id) { QList result; QSqlQuery query; - query.prepare("SELECT bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer ,besci.temperature ,besci.humidity ,besci.check_date ," - " besci.check_address , besci.create_user_name , besci.conclusion " - "FROM biz_equipment_info bei LEFT JOIN biz_equipment_standard_check_info besci ON besci.equipment_id = bei.id " - " LEFT JOIN biz_equipment_standard_check_info_equipment bescie ON bei.id = bescie.check_equipment_id" - " WHERE bei.id = :id "); + query.prepare("SELECT bei.* FROM biz_equipment_standard_check_info_equipment bescie " + " JOIN biz_equipment_info bei ON bei.id = bescie.check_equipment_id " + " WHERE bescie.data_id = :data_id "); // 将参数绑定到占位符 - query.bindValue(":id", id); + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { CheckDataManageBasicInfo basicInfo; @@ -951,13 +1012,6 @@ basicInfo.model = query.value("model").toString(); basicInfo.manufacture_no = query.value("manufacture_no").toString(); basicInfo.manufacturer = query.value("manufacturer").toString(); - basicInfo.temperature = query.value("temperature").toString(); - basicInfo.humidity = query.value("humidity").toString(); - basicInfo.check_date = query.value("check_date").toDate(); - basicInfo.check_address = query.value("check_address").toString(); - basicInfo.create_user_name = query.value("create_user_name").toString(); - basicInfo.conclusion = query.value("conclusion").toString(); - result.append(basicInfo); } } else { @@ -966,40 +1020,95 @@ return result; } -//核查数据管理-核查结果信息-核查项多功能校准源数据 待修改2024年3月18日13:05:42 -QList BaseCommonApi::getCheckDataManageResultManageMult(QString equipment_id) -{ -QList result; -QSqlQuery query; - query.prepare("SELECT DISTINCT bescidc.id , bescidc.check_type ,bescidc.params ,bescidc.unit ,bescidc.frequency ,bescidc.check_point ,besci.check_date ,bescidc.urel ," - " bescidc.tfer ,bescidc.dccp ,bescidc.flit " - " FROM biz_equipment_standard_check_item_data_calibrator bescidc " - " LEFT JOIN biz_equipment_standard_check_info besci ON besci.item_category_id = bescidc.item_category_id " - " WHERE bescidc.equipment_id = :equipment_id "); - // 将参数绑定到占位符 1692796512381222914 - query.bindValue(":equipment_id", equipment_id); +//核查数据管理-核查基本信息-基本信息 +CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id) +{ + CheckDataManageBasicInfo result; + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_info WHERE equipment_id = :equipment_id"); + + // 将参数绑定到占位符 + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + CheckDataManageBasicInfo basicInfo; + basicInfo.temperature = query.value("temperature").toString(); + basicInfo.humidity = query.value("humidity").toString(); + basicInfo.check_date = query.value("check_date").toDate(); + basicInfo.check_address = query.value("check_address").toString(); + basicInfo.create_user_name = query.value("create_user_name").toString(); + basicInfo.conclusion = query.value("conclusion").toString(); + result=basicInfo; + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + + return result; +} + + +//核查数据管理-核查结果信息-核查项多功能校准源数据 参数首页数据的id +QList BaseCommonApi::getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList) +{ +QList result; +QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_data_calibrator WHERE data_id = :data_id "); + + query.bindValue(":data_id", data_id); if (query.exec()) { while (query.next()) { - CheckDataManageResultManageMult dataCalibrator; + StandCheckDataCalibrator dataCalibrator; dataCalibrator.id = query.value("id").toString(); + dataCalibrator.data_id = query.value("data_id").toString(); dataCalibrator.check_type = query.value("check_type").toString(); + dataCalibrator.test_type = query.value("test_type").toString(); dataCalibrator.params = query.value("params").toString(); dataCalibrator.unit = query.value("unit").toString(); dataCalibrator.frequency = query.value("frequency").toString(); + dataCalibrator.frequency_unit = query.value("frequency_unit").toString(); dataCalibrator.check_point = query.value("check_point").toString(); - dataCalibrator.check_date = query.value("check_date").toDate(); + + dataCalibrator.test_value_one_date = query.value("test_value_one_date").toDate(); + dataCalibrator.test_value_one = query.value("test_value_one").toString(); + + dataCalibrator.test_value_two_date = query.value("test_value_two_date").toDate(); + dataCalibrator.test_value_two = query.value("test_value_two").toString(); + + dataCalibrator.test_value_three_date = query.value("test_value_three_date").toDate(); + dataCalibrator.test_value_three = query.value("test_value_three").toString(); + + dataCalibrator.test_value_four_date = query.value("test_value_four_date").toDate(); + dataCalibrator.test_value_four = query.value("test_value_four").toString(); + + dataCalibrator.test_value_five_date = query.value("test_value_five_date").toDate(); + dataCalibrator.test_value_five = query.value("test_value_five").toString(); + + dataCalibrator.test_value_six_date = query.value("test_value_six_date").toDate(); + dataCalibrator.test_value_six = query.value("test_value_six").toString(); + + dataCalibrator.average_value = query.value("average_value").toString(); + dataCalibrator.standard_deviation = query.value("standard_deviation").toString(); + dataCalibrator.relative_repeatability = query.value("relative_repeatability").toString(); dataCalibrator.urel = query.value("urel").toString(); - dataCalibrator.tfer = query.value("tfer").toString(); - dataCalibrator.dccp = query.value("dccp").toString(); - dataCalibrator.flit = query.value("flit").toString(); + dataCalibrator.less_than = query.value("less_than").toString(); + dataCalibrator.qualified = query.value("qualified").toString(); + + + dataCalibrator.create_time = query.value("create_time").toDateTime(); + dataCalibrator.update_time = query.value("update_time").toDateTime(); result.append(dataCalibrator); } } else { qDebug() << "Query execution failed: " << query.lastError().text(); } - + *HeadList<<"id"<<"核查数据管理基础信息表id"<<"核查类型"<<"核查点类型"<<"核查项目"<<"单位"<<"频率"<<"频率单位"<<"核查点" + <<"核查读数1日期"<<"核查读数1(示值)"<<"核查读数2日期（稳定性）"<<"核查读数2（示值）" + <<"核查读数3日期（稳定性） "<<"核查读数3（示值）"<<"核查读数4日期（稳定性）"<<"核查读数4（示值）"<<"核查读数5日期（稳定性）" + <<"核查读数5（示值）"<<"核查读数6日期（稳定性）"<<"核查读数6（本次示值）"<<"核查读数平均值(算数平均值)"<<"Sn(x)(标准偏差)" + <<"Sn(x)/核查读数平均值(相对重复性)"<<"UREL"<<"是否小于相对扩展不确定度Urel(0/1)"<<"稳定性考核是否合格"<<"创建时间"<<"更新时间"; return result; } @@ -1352,6 +1461,27 @@ return isSuccess; } +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 +bool BaseCommonApi::InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:id,:data_id,:equipment_id,:create_time,:update_time)"); + QString createTime = deviceMeasure.create_time.toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":id", deviceMeasure.id); + query.bindValue(":data_id", deviceMeasure.data_id); + query.bindValue(":equipment_id", deviceMeasure.equipment_id); + query.bindValue(":create_time", createTime); + query.bindValue(":update_time", createTime); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) @@ -1600,8 +1730,6 @@ } return isSuccess; } -//自动核查-结果保存- - //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 bool BaseCommonApi::InsertStandardCheckDatePistonGauge(StandardCheckDatePistonGauge gauge) { @@ -1762,6 +1890,27 @@ } return result; } +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +bool BaseCommonApi::InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment) +{ + QSqlQuery query; + query.prepare("INSERT INTO biz_equipment_standard_check_info_equipment " + " (id,check_equipment_id,data_id) " + " VALUES " + " (:id,:check_equipment_id,:data_id)"); + query.bindValue(":id",equiment.id); + query.bindValue(":data_no",equiment.check_equipment_id); + query.bindValue(":check_date",equiment.data_id); + bool isSuccess = query.exec(); + if (!isSuccess) { + qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); + } + + return isSuccess; +} + + + //自动核查--结果保存-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 bool BaseCommonApi::InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d3945d2..a8a8755 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -176,31 +176,30 @@ class CatDeviceInfor { public: - QString equipment_name; - QString model; - QString manufacture_no; - QString measure_valid_date; - QString product_country; - QString manufacturer; - QString produce_date; - QString purchase_date; - QString unit_price; - QString usage_status; - QString quality_status; - QString dept_name; - QString director_name; - QString supplier_name; - QString location; - QString type; - QString standard_type; - QString category; - QString level; - QString measure_cycle; - QString unpack_record_name; - QString remark; - + QString equipment_name; //设备名称 + QString model;//规格型号 + QString manufacture_no;//出厂编号 + QString measure_valid_date;//检定有效期 + QString product_country;//生产国家 + QString manufacturer;//生产厂家 + QString produce_date;//生产日期 + QString purchase_date;//购进日期 + QString unit_price;//设备单价 + QString usage_status;//使用状态 + QString quality_status;//质量状况 + QString dept_name;//所属部门 + QString director_name;//负责人 + QString supplier_name;//设备供方 + QString location;//位置信息 + QString type;//设备类型 + QString standard_type;//标准类型 + QString category;//设备分类 + QString level;//重要等级 + QString measure_cycle;//检定周期 + QString unpack_record_name;//对应开箱记录 + QString remark;//备注 }; -//标准设备管理-核查项目及核查点-直流稳压电源检定装置 +//标准设备管理-核查项目及核查点-直流稳压电源检定装置 待修改 2024年3月21日09:18:12 class CheckDCPower { public: @@ -312,27 +311,53 @@ QString meter_identify;//计量标识 QString restriction_instruction;//限用说明 }; -//检定数据管理-检定基本信息 -class VerificationBasicDataDetails +//检定数据管理-检定基本信息-标准设备 +class VerificationBasicDataDevice { public: -QString sample_name;//设备名称 +QString equipmentId;//设备id QString model;//型号规格 -QString help_instruction;//辅助字段 -QString manufacture_no;//出厂编号 +QString equipment_no;//出厂编号 QString manufacturer;//生产厂家 -QString customer_name;//委托单位 -QString based_documents;//依据技术文件 -QDate trace_date;//检定日期 -QString temperature;//环境温度 -QString humidity;//环境湿度 -QString measure_address;//检定地点 +QString equipment_name;//设备名称 +QString uncertainty;//不确定度 QDateTime measure_valid_date;//检定有效期 -QString NAME;//检定员 -QString conclusion;//结论 -QString restriction_instruction;//限用说明 }; -//检定数据管理-检定结果信息 待修改 查询的不对 2024年3月20日11:55:34 +//检定数据管理-检定基本信息 +class VerificationBasicDataDetails +{ +public: + QString id; + QString device_model_id;//受检设备规格型号表id + QString device_type;//设备分类(eqptDeviceType字典code) + QString belong_standard_equipment;//检校标准装置(字典code) + QString help_field_instruction;//辅助字段说明 + QString item_category_id;//设备检定项分类表id + QString item_category_name;//设备检定项分类名字 + QString data_sync;//检定项数据是否同步(1/0) + QString sync_time;//自动检定系统最新同步时间 + QString appearance_function_check;//外观及功能性检查(1/0) + QString category;//.设备分类(字典code) + QString equipment_name;//设备名称 + QString model;//型号规格 + QString help_instruction;//辅助说明 + QString item_remark;//检定项备注 + QString customer_name;//委托单位 + QString humidity;//湿度 + QString temperature;//温度 + QString measure_address;//检定地点 + QDateTime measure_valid_date;//检定有效期 + QString conclusion;//结论 + QString restriction_instruction;//限用说明 + QString based_documents;//技术文件 + QDate trace_date;//检定日期 + QString NAME;//检定员 + QDateTime create_time; + QDateTime update_time; + +}; + +//检定数据管理-检定结果信息 未使用 2024年3月21日09:24:38 使用的是QStringList class VerificationResultData { public: @@ -355,8 +380,8 @@ { public: QString id; - QString equipment_name;//设备名称 - QString model;//型号规格 + QString equipmentName;//设备名称 + QString equipmentModel;//型号规格 QString manufacture_no;//出厂编号 QString meter_standard_name;//核查件 QString meter_standard_id;//核查件编号 @@ -390,22 +415,33 @@ QDateTime create_time; QDateTime update_time; }; -//核查数据管理-核查结果信息-核查项多功能校准源数据 -class CheckDataManageResultManageMult -{ -public: - QString id;//序号 - QString check_type;//核查类型 - QString params;//参数 - QString unit;//单位 - QString frequency;//频率 - QString check_point;//核查点 - QDate check_date;//核查日期 - QString urel;//Urel - QString tfer;//tfer - QString dccp;//dccp - QString flit;//flit -}; + + +////核查数据管理-核查结果信息-核查项多功能校准源数据 +//class CheckDataManageResultManageMult +//{ +//public: +// QString id;//序号 +// QString check_type;//核查类型 +// QString params;//参数 +// QString unit;//单位 +// QString frequency;//频率 +// QString check_point;//核查点 +// QDate test_value_one_date;//核查日期1 +// QString test_value_one;//核查读数1（示值） +// QDate test_value_two_date;//核查日期2 +// QString test_value_two;//核查读数2（示值） +// QDate test_value_three_date;//核查日期3 +// QString test_value_three;//核查读数3（示值） +// QDate test_value_four_date;//核查日期4 +// QString test_value_four;//核查读数4（示值） +// QDate test_value_five_date;//核查日期5 +// QString test_value_five;//核查读数5（示值） +// QDate test_value_six_date;//核查日期6 +// QString test_value_six;//核查读数6（本次示值） +// QString dccp;//dccp +// QString flit;//flit +//}; //技术文件 class Technique_File @@ -581,7 +617,7 @@ QString manufacture_no;//出厂编号 QString manufacturer;//生产厂家 }; -// 核查项及核查点--多功能校准源 biz_equipment_standard_check_item_data_calibrator +// 核查项及核查点--多功能校准源 biz_equipment_standard_check_item_data_calibrator 未使用 使用的是QStringList class VerificationItemsMulti { public: @@ -606,6 +642,15 @@ QDateTime create_time;//创建时间 QDateTime update_time;//更新时间 }; +//设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 +class StandCheckInfoEquipent +{ +public: + QString id; + QString check_equipment_id;//做核查标准设备id + QString data_id;//核查数据基本信息表id +}; + //核查结果信息数据保存-多功能校准源-设备与装置-标准装置管理-核查数据管理多功能校准源数据表 class StandCheckDataCalibrator { @@ -703,7 +748,16 @@ QString NAME;//名字 QString DEPT_ID;//部门id }; - +//计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 2024年3月21日10:26:01 +class DeviceMeasureEquipment +{ +public: + QString id; + QString data_id;//检定数据管理基础信息表id + QString equipment_id;//设备台账id + QDateTime create_time; + QDateTime update_time; +}; @@ -722,6 +776,11 @@ //判断核查装置表并查询 参数设备id static QList Search_VerifyTable(QString DeiverId,QStringList *HeadList ); + //判断检定数据管理 结果信息表 + static QList Search_CalibrationDataTable(QString DeiverId,QString dataId,QStringList *HeadList); + + //判断核查数据管理 结果信息表 + static QList Search_VerifyDataTable(QString DeiverId,QString dataId,QStringList *HeadList); //部门任务 废弃 @@ -773,16 +832,21 @@ static QList getVerMultiCal(QString itemId,QStringList *headList); // 获取检定数据管理 首页 static QList getVerificationData(); - // 检定数据管理-检定基本信息 - static QList getVerificationBasicDataDetails(QString id); - //检定数据管理-检定结果信息 - static QList getVerificationResultData(QString sampleId,QStringList *HeadList); + // 检定数据管理-检定基本信息-标准设备 + static QList getVerificationBasicDataDevice(QString id); + //检定数据管理-基本信息 参数首页数据的id + static VerificationBasicDataDetails getVerificationBasicDataDetails(QString dataId); + //检定数据管理-检定结果信息-多功能校准源 + static QList getVerificationMultiCalResultData(QString sampleId,QStringList *HeadList); //核查数据管理-首页 static QList getCheckData(); - // 核查数据管理-基本信息 - static QList getCheckDataManageBasicInfo(QString id); - //核查数据管理-核查结果信息-核查项多功能校准源数据 - static QList getCheckDataManageResultManageMult(QString equipment_id); + // 核查数据管理-基本信息-核查件 + static QList getCheckDataManageBasicInfoDevice(QString id); + //核查数据管理-基本信息-基本信息 参数设备id + static CheckDataManageBasicInfo getCheckDataManageBasicInfo(QString equipment_id); + + //核查数据管理-核查结果信息-核查数据 多功能校准源数据 + static QList getCheckDataManageResultManageMult(QString data_id,QStringList *HeadList); //技术文件 static QList getTechnique_File(); //检定程序管理首页查询 @@ -820,6 +884,8 @@ bool AddTaskNumber(); //自动检定-结果保存-基本信息 static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); + //自动检定-结果保存-数据关联-计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备 + static bool InsertDeviceMeasureEquipment(DeviceMeasureEquipment deviceMeasure); //自动检定-结果保存-更新检定结果信息-多功能校准源检定装置 static bool InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator); // 核查程序管理首页查询 @@ -838,6 +904,8 @@ static bool UpdateCheckProgramManage(CheckProgramManage check); //删除核查程序 参数核查程序的id static bool DeleteCheckProgramManage(QString id); +// 设备与装置-标准装置管理-核查数据基本信息关联的核查标准设备，即给设备做核查的设备 + static bool InsertStandCheckInfoEquipent(StandCheckInfoEquipent equiment); //自动核查--结果保存-设备与装置-标准装置管理-多功能校准源 static bool InsertStandCheckDataCalibrator(StandCheckDataCalibrator calibrator); //自动核查-结果保存-设备与装置-标准装置管理-核查数据管理0.02级活塞式压力计数据表 diff --git a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp index 8593fd8..16f93ad 100644 --- a/softwareDirectory/AutoVerScheme/inspectdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/inspectdataitem.cpp @@ -75,8 +75,8 @@ ui->tableWidget->insertRow(rowCount); ui->tableWidget->setItem(row, 0, new QTableWidgetItem(item.id)); ui->tableWidget->setItem(row, 1, new QTableWidgetItem(QString::number(row+1))); - ui->tableWidget->setItem(row, 2, new QTableWidgetItem(item.equipment_name)); - ui->tableWidget->setItem(row, 3, new QTableWidgetItem(item.model)); + ui->tableWidget->setItem(row, 2, new QTableWidgetItem(item.equipmentName)); + ui->tableWidget->setItem(row, 3, new QTableWidgetItem(item.equipmentModel)); ui->tableWidget->setItem(row, 4, new QTableWidgetItem(item.manufacture_no)); ui->tableWidget->setItem(row, 5, new QTableWidgetItem(item.meter_standard_name)); ui->tableWidget->setItem(row, 6, new QTableWidgetItem("缺少")); diff --git a/softwareDirectory/AutoVerScheme/testdataitem.cpp b/softwareDirectory/AutoVerScheme/testdataitem.cpp index 85fd2d0..89e1321 100644 --- a/softwareDirectory/AutoVerScheme/testdataitem.cpp +++ b/softwareDirectory/AutoVerScheme/testdataitem.cpp @@ -186,7 +186,7 @@ // ==================================================================================== QStringList headlist; - QList Data = dbManager.getVerificationResultData(id,&headlist); + QList Data = dbManager.Search_VerifyDataTable(id,id,&headlist); //参数待修改 ui->tableWidgetItem->setRowCount(0);