diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 2d38212..4b1f088 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -24,7 +24,7 @@ Dept.manufacturer = query.value("manufacturer").toString(); Dept.customer_name = query.value("customer_name").toString(); Dept.FULL_NAME = query.value("FULL_NAME").toString(); - Dept.require_over_time = query.value("require_over_time").toString(); + Dept.require_over_time = query.value("require_over_time").toDateTime(); Dept.is_urgent = query.value("is_urgent").toString(); result.append(Dept); } @@ -57,7 +57,7 @@ task.manufacturer = query.value("manufacturer").toString(); task.customer_name = query.value("customer_name").toString(); task.FULL_NAME = query.value("FULL_NAME").toString(); - task.require_over_time = query.value("require_over_time").toString(); + task.require_over_time = query.value("require_over_time").toDateTime(); task.is_urgent = query.value("is_urgent").toString(); result.append(task); } @@ -90,7 +90,7 @@ task.manufacturer = query.value("manufacturer").toString(); task.appendix_descn = query.value("appendix_descn").toString(); task.special_require = query.value("special_require").toString(); - task.measure_complete_time = query.value("measure_complete_time").toString(); + task.measure_complete_time = query.value("measure_complete_time").toDateTime(); task.conclusion = query.value("conclusion").toString(); task.limit_instruction = query.value("limit_instruction").toString(); result.append(task); @@ -365,8 +365,9 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.product_country ,eei.manufacturer ,eei.product_date ,eei.purchase_date ,eei.unit_price ,eei.usage_status ,eei.quality_condition ,sys_dept.FULL_NAME ," - "eei.category , eei.check_cycle ,eei.level , eei.remark from eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :id "); + bool isSuccess = query.exec("SELECT eei.id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer ,bboi.customer_name ,sys_dept.FULL_NAME ,eei.meter_identify ,eei.check_cycle ,eei.certificate_valid from eqpt_equipment_info eei " + " LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id " + " LEFT JOIN biz_business_order_info bboi ON bboi.customer_id = eei.company_id"); if (isSuccess) { while (query.next()) { TestedDevice testedDevice; @@ -377,6 +378,7 @@ testedDevice.manufacture_no = query.value("manufacture_no").toString(); testedDevice.manufacturer = query.value("manufacturer").toString(); testedDevice.FULL_NAME = query.value("FULL_NAME").toString(); + testedDevice.customer_name = query.value("customer_name").toString(); testedDevice.meter_identify = query.value("meter_identify").toString(); testedDevice.check_cycle = query.value("check_cycle").toString(); testedDevice.certificate_valid = query.value("certificate_valid").toString(); @@ -428,7 +430,7 @@ return result; } -//判断 哪个 装置表 +//判断 哪个 装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) { QList result; @@ -509,8 +511,8 @@ verificationData.manufacturer = query.value("manufacturer").toString(); verificationData.FULL_NAME = query.value("FULL_NAME").toString(); verificationData.NAME = query.value("NAME").toString(); - verificationData.trace_date = query.value("trace_date").toString(); - verificationData.measure_valid_date = query.value("measure_valid_date").toString(); + verificationData.trace_date = query.value("trace_date").toDate(); + verificationData.measure_valid_date = query.value("measure_valid_date").toDateTime(); verificationData.meter_identify = query.value("meter_identify").toString(); verificationData.restriction_instruction = query.value("restriction_instruction").toString(); @@ -546,11 +548,11 @@ 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").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").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(); @@ -621,7 +623,7 @@ 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").toString(); + dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); result.append(dataManage); @@ -654,7 +656,7 @@ 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").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(); @@ -689,7 +691,7 @@ dataCalibrator.unit = query.value("unit").toString(); dataCalibrator.frequency = query.value("frequency").toString(); dataCalibrator.check_point = query.value("check_point").toString(); - dataCalibrator.check_date = query.value("check_date").toString(); + dataCalibrator.check_date = query.value("check_date").toDate(); dataCalibrator.urel = query.value("urel").toString(); dataCalibrator.tfer = query.value("tfer").toString(); dataCalibrator.dccp = query.value("dccp").toString(); @@ -718,7 +720,7 @@ file.file_distribute_no = query.value("file_distribute_no").toString(); file.file_name = query.value("file_name").toString(); file.version_no = query.value("version_no").toString(); - file.active_date = query.value("active_date").toString(); + file.active_date = query.value("active_date").toDateTime(); file.remark = query.value("remark").toString(); result.append(file); @@ -730,3 +732,85 @@ return result; } +//获取检定程序管理数据 +QList BaseCommonApi::getVerificationProgramInfo() +{ + QList result; + QSqlQuery query; + bool isSuccess = query.exec("SELECT id,program_name ,create_name,create_time ,remark ,comm_id FROM zd_verification_program_info"); + if (isSuccess) { + while (query.next()) { + VerificationProgramInfo programInfo; + programInfo.id = query.value("id").toString(); + programInfo.program_name = query.value("program_name").toString(); + programInfo.create_name = query.value("create_name").toString(); + programInfo.create_time = query.value("create_time").toDateTime(); + programInfo.remark = query.value("remark").toString(); + programInfo.comm_id = query.value("comm_id").toString(); + + result.append(programInfo); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//检定程序管理-检定配置查询 +QList BaseCommonApi::getVerificationProgramConfig(QString verification_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT zvpd.id,zvpd.verification_id ,zvpd.img_path ,zvpd.tested_device_id ,zvpd.standard_device_id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer " + "FROM zd_verification_program_details zvpd LEFT JOIN eqpt_equipment_info eei ON eei.id = zvpd.tested_device_id " + " WHERE zvpd.verification_id = ' :verification_id ' UNION ALL " + " SELECT zvpd.id,zvpd.verification_id ,zvpd.img_path ,zvpd.tested_device_id ,zvpd.standard_device_id ,bei.equipment_name ,bei.model , NULL ,bei.manufacture_no ,bei.manufacturer " + " FROM zd_verification_program_details zvpd LEFT JOIN biz_equipment_info bei ON bei.id = zvpd.standard_device_id " + " WHERE zvpd.verification_id = ' :verification_id '"); + query.bindValue(":verification_id", verification_id); + if (query.exec()) { + while (query.next()) { + VerificationProgramConfig programInfo; + programInfo.id = query.value("id").toString(); + programInfo.verification_id = query.value("verification_id").toString(); + programInfo.img_path = query.value("img_path").toString(); + programInfo.tested_device_id = query.value("tested_device_id").toString(); + programInfo.standard_device_id = query.value("standard_device_id").toString(); + programInfo.equipment_name = query.value("equipment_name").toString(); + programInfo.model = query.value("model").toString(); + programInfo.help_instruction = query.value("help_instruction").toString(); + programInfo.manufacture_no = query.value("manufacture_no").toString(); + programInfo.manufacturer = query.value("manufacturer").toString(); + + result.append(programInfo); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询设备通信接口 +QList getVerificationProgramConfigInterface(QString deviceId) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT id,device_id ,communication_type ,serial_port ,visa ,create_time ,update_time " + "FROM zd_communication_setting WHERE device_id = ' :deviceId '"); + query.bindValue(":deviceId", deviceId); + if (query.exec()) { + while (query.next()) { + VerificationProgramConfigInterface configInterface; + configInterface.id = query.value("id").toString(); + configInterface.device_id = query.value("device_id").toString(); + configInterface.communication_type = query.value("communication_type").toString(); + configInterface.serial_port = query.value("serial_port").toString(); + configInterface.visa = query.value("visa").toString(); + configInterface.create_time = query.value("create_time").toDateTime(); + configInterface.update_time = query.value("update_time").toDateTime(); + + result.append(configInterface); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 2d38212..4b1f088 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -24,7 +24,7 @@ Dept.manufacturer = query.value("manufacturer").toString(); Dept.customer_name = query.value("customer_name").toString(); Dept.FULL_NAME = query.value("FULL_NAME").toString(); - Dept.require_over_time = query.value("require_over_time").toString(); + Dept.require_over_time = query.value("require_over_time").toDateTime(); Dept.is_urgent = query.value("is_urgent").toString(); result.append(Dept); } @@ -57,7 +57,7 @@ task.manufacturer = query.value("manufacturer").toString(); task.customer_name = query.value("customer_name").toString(); task.FULL_NAME = query.value("FULL_NAME").toString(); - task.require_over_time = query.value("require_over_time").toString(); + task.require_over_time = query.value("require_over_time").toDateTime(); task.is_urgent = query.value("is_urgent").toString(); result.append(task); } @@ -90,7 +90,7 @@ task.manufacturer = query.value("manufacturer").toString(); task.appendix_descn = query.value("appendix_descn").toString(); task.special_require = query.value("special_require").toString(); - task.measure_complete_time = query.value("measure_complete_time").toString(); + task.measure_complete_time = query.value("measure_complete_time").toDateTime(); task.conclusion = query.value("conclusion").toString(); task.limit_instruction = query.value("limit_instruction").toString(); result.append(task); @@ -365,8 +365,9 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.product_country ,eei.manufacturer ,eei.product_date ,eei.purchase_date ,eei.unit_price ,eei.usage_status ,eei.quality_condition ,sys_dept.FULL_NAME ," - "eei.category , eei.check_cycle ,eei.level , eei.remark from eqpt_equipment_info eei LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id WHERE eei.id = :id "); + bool isSuccess = query.exec("SELECT eei.id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer ,bboi.customer_name ,sys_dept.FULL_NAME ,eei.meter_identify ,eei.check_cycle ,eei.certificate_valid from eqpt_equipment_info eei " + " LEFT JOIN sys_dept ON sys_dept.ID = eei.dept_id " + " LEFT JOIN biz_business_order_info bboi ON bboi.customer_id = eei.company_id"); if (isSuccess) { while (query.next()) { TestedDevice testedDevice; @@ -377,6 +378,7 @@ testedDevice.manufacture_no = query.value("manufacture_no").toString(); testedDevice.manufacturer = query.value("manufacturer").toString(); testedDevice.FULL_NAME = query.value("FULL_NAME").toString(); + testedDevice.customer_name = query.value("customer_name").toString(); testedDevice.meter_identify = query.value("meter_identify").toString(); testedDevice.check_cycle = query.value("check_cycle").toString(); testedDevice.certificate_valid = query.value("certificate_valid").toString(); @@ -428,7 +430,7 @@ return result; } -//判断 哪个 装置表 +//判断 哪个 装置表 传参 设备id QList BaseCommonApi::getJudgeCalibrationTable(QString id) { QList result; @@ -509,8 +511,8 @@ verificationData.manufacturer = query.value("manufacturer").toString(); verificationData.FULL_NAME = query.value("FULL_NAME").toString(); verificationData.NAME = query.value("NAME").toString(); - verificationData.trace_date = query.value("trace_date").toString(); - verificationData.measure_valid_date = query.value("measure_valid_date").toString(); + verificationData.trace_date = query.value("trace_date").toDate(); + verificationData.measure_valid_date = query.value("measure_valid_date").toDateTime(); verificationData.meter_identify = query.value("meter_identify").toString(); verificationData.restriction_instruction = query.value("restriction_instruction").toString(); @@ -546,11 +548,11 @@ 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").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").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(); @@ -621,7 +623,7 @@ 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").toString(); + dataManage.check_date = query.value("check_date").toDate(); dataManage.dept_name = query.value("dept_name").toString(); result.append(dataManage); @@ -654,7 +656,7 @@ 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").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(); @@ -689,7 +691,7 @@ dataCalibrator.unit = query.value("unit").toString(); dataCalibrator.frequency = query.value("frequency").toString(); dataCalibrator.check_point = query.value("check_point").toString(); - dataCalibrator.check_date = query.value("check_date").toString(); + dataCalibrator.check_date = query.value("check_date").toDate(); dataCalibrator.urel = query.value("urel").toString(); dataCalibrator.tfer = query.value("tfer").toString(); dataCalibrator.dccp = query.value("dccp").toString(); @@ -718,7 +720,7 @@ file.file_distribute_no = query.value("file_distribute_no").toString(); file.file_name = query.value("file_name").toString(); file.version_no = query.value("version_no").toString(); - file.active_date = query.value("active_date").toString(); + file.active_date = query.value("active_date").toDateTime(); file.remark = query.value("remark").toString(); result.append(file); @@ -730,3 +732,85 @@ return result; } +//获取检定程序管理数据 +QList BaseCommonApi::getVerificationProgramInfo() +{ + QList result; + QSqlQuery query; + bool isSuccess = query.exec("SELECT id,program_name ,create_name,create_time ,remark ,comm_id FROM zd_verification_program_info"); + if (isSuccess) { + while (query.next()) { + VerificationProgramInfo programInfo; + programInfo.id = query.value("id").toString(); + programInfo.program_name = query.value("program_name").toString(); + programInfo.create_name = query.value("create_name").toString(); + programInfo.create_time = query.value("create_time").toDateTime(); + programInfo.remark = query.value("remark").toString(); + programInfo.comm_id = query.value("comm_id").toString(); + + result.append(programInfo); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//检定程序管理-检定配置查询 +QList BaseCommonApi::getVerificationProgramConfig(QString verification_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT zvpd.id,zvpd.verification_id ,zvpd.img_path ,zvpd.tested_device_id ,zvpd.standard_device_id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer " + "FROM zd_verification_program_details zvpd LEFT JOIN eqpt_equipment_info eei ON eei.id = zvpd.tested_device_id " + " WHERE zvpd.verification_id = ' :verification_id ' UNION ALL " + " SELECT zvpd.id,zvpd.verification_id ,zvpd.img_path ,zvpd.tested_device_id ,zvpd.standard_device_id ,bei.equipment_name ,bei.model , NULL ,bei.manufacture_no ,bei.manufacturer " + " FROM zd_verification_program_details zvpd LEFT JOIN biz_equipment_info bei ON bei.id = zvpd.standard_device_id " + " WHERE zvpd.verification_id = ' :verification_id '"); + query.bindValue(":verification_id", verification_id); + if (query.exec()) { + while (query.next()) { + VerificationProgramConfig programInfo; + programInfo.id = query.value("id").toString(); + programInfo.verification_id = query.value("verification_id").toString(); + programInfo.img_path = query.value("img_path").toString(); + programInfo.tested_device_id = query.value("tested_device_id").toString(); + programInfo.standard_device_id = query.value("standard_device_id").toString(); + programInfo.equipment_name = query.value("equipment_name").toString(); + programInfo.model = query.value("model").toString(); + programInfo.help_instruction = query.value("help_instruction").toString(); + programInfo.manufacture_no = query.value("manufacture_no").toString(); + programInfo.manufacturer = query.value("manufacturer").toString(); + + result.append(programInfo); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询设备通信接口 +QList getVerificationProgramConfigInterface(QString deviceId) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT id,device_id ,communication_type ,serial_port ,visa ,create_time ,update_time " + "FROM zd_communication_setting WHERE device_id = ' :deviceId '"); + query.bindValue(":deviceId", deviceId); + if (query.exec()) { + while (query.next()) { + VerificationProgramConfigInterface configInterface; + configInterface.id = query.value("id").toString(); + configInterface.device_id = query.value("device_id").toString(); + configInterface.communication_type = query.value("communication_type").toString(); + configInterface.serial_port = query.value("serial_port").toString(); + configInterface.visa = query.value("visa").toString(); + configInterface.create_time = query.value("create_time").toDateTime(); + configInterface.update_time = query.value("update_time").toDateTime(); + + result.append(configInterface); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 658fdb9..7fcdfa5 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -21,7 +21,7 @@ QString manufacturer; QString customer_name; QString FULL_NAME; - QString require_over_time; + QDateTime require_over_time; QString is_urgent; }; //我的任务 @@ -36,7 +36,7 @@ QString manufacturer; QString customer_name; QString FULL_NAME; - QString require_over_time; + QDateTime require_over_time; QString is_urgent; }; //创建任务单-首页 @@ -47,7 +47,7 @@ QString order_no; QString customer_name; QString DEPT_FULL_NAME; - QString require_over_time; + QDateTime require_over_time; QString deliverer; QString is_urgent; }; @@ -63,7 +63,7 @@ QString deliverer; QString deliverer_tel; QString undertaker_name; - QString undertake_time; + QDateTime undertake_time; QString is_urgent; QString receive_illustrate; }; @@ -78,7 +78,7 @@ QString manufacturer; QString appendix_descn; QString special_require; - QString measure_complete_time; + QDateTime measure_complete_time; QString conclusion; QString limit_instruction; }; @@ -106,7 +106,7 @@ QString deliverer; //送检人 QString deliverer_tel; //电话 QString undertaker_name; //承接人 - QString undertake_time; //承接时间 + QDateTime undertake_time; //承接时间 QString is_urgent; //是否加急 QString receive_illustrate; //接收说明 QString customer_id;//委托人id @@ -120,7 +120,7 @@ QString sample_id; //被检设备的id QString sample_name; //设备名称 QString sample_model; // 型号规格 - QString measure_complete_time; //检定完成时间 + QDateTime measure_complete_time; //检定完成时间 }; //创建任务单编辑 class UpdateTask @@ -131,7 +131,7 @@ QString require_over_time; QString deliverer; QString deliverer_tel; - QString undertake_time; + QDateTime undertake_time; QString is_urgent; QString receive_illustrate; QString customer_id; @@ -205,6 +205,7 @@ QString manufacture_no; QString manufacturer; QString FULL_NAME; + QString customer_name; QString meter_identify; QString check_cycle; QString certificate_valid; @@ -269,8 +270,8 @@ QString customer_name; QString FULL_NAME; QString NAME; -QString trace_date; -QString measure_valid_date; +QDate trace_date; +QDateTime measure_valid_date; QString meter_identify; QString restriction_instruction; }; @@ -285,11 +286,11 @@ QString manufacturer; QString customer_name; QString based_documents; -QString trace_date; +QDate trace_date; QString temperature; QString humidity; QString measure_address; -QString measure_valid_date; +QDateTime measure_valid_date; QString NAME; QString conclusion; QString restriction_instruction; @@ -323,7 +324,7 @@ QString meter_standard_name; QString meter_standard_id; QString create_user_name; - QString check_date; + QDate check_date; QString dept_name; }; //核查数据管理-核查基本信息 @@ -336,7 +337,7 @@ QString manufacturer; QString temperature; QString humidity; - QString check_date; + QDate check_date; QString check_address; QString create_user_name; QString conclusion; @@ -351,7 +352,7 @@ QString unit; QString frequency; QString check_point; - QString check_date; + QDate check_date; QString urel; QString tfer; QString dccp; @@ -365,11 +366,51 @@ QString file_distribute_no; QString file_name; QString version_no; - QString active_date; + QDateTime active_date; QString remark; }; +//-------------------------- +//检定程序管理 +class VerificationProgramInfo +{ +public: + QString id; + QString program_name; + QString create_name; + QDateTime create_time; + QString remark; + QString comm_id; +}; +//检定程序管理-检定配置查询 +class VerificationProgramConfig +{ +public: + QString id; + QString verification_id; //检定程序id + QString img_path; //连接图片地址 + QString tested_device_id; //被检设备id + QString standard_device_id; //标准设备id + QString equipment_name;//设备名称 + QString model; //型号规格 + QString help_instruction; //辅助字段 + QString manufacture_no; //出厂编号 + QString manufacturer; //生产厂家 +}; +//检定程序管理-检定配置设备接口查询 +class VerificationProgramConfigInterface +{ +public: + QString id; + QString device_id;//设备id + QString communication_type;//通讯类型 + QString serial_port;//串口 + QString visa;//visa + QDateTime create_time; + QDateTime update_time; +}; + class BaseCommonApi @@ -408,7 +449,7 @@ static QList getTestedDevice(); // 被检设备管理查看设备信息 static QList getTestedCatDevice(QString id); - //判断 哪个 装置表 + //判断 哪个 装置表 传参 设备id 返回itemId static QList getJudgeCalibrationTable(QString id); //被检设备管理-检定项目及检定点-多功能校准源 static QList getVerMultiCal(QString itemId); @@ -426,6 +467,14 @@ static QList getCheckDataManageResultManageMult(QString equipment_id); //技术文件 static QList getTechnique_File(); + //检定程序管理 + static QList getVerificationProgramInfo(); + //查询已选择的设备 + static QList getVerificationProgramConfig(QString verification_id); + //查询设备通信接口 + static QList getVerificationProgramConfigInterface(QString deviceId); + + };