diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 7a130d4..e55c059 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -737,44 +737,29 @@ return result; } -//获取检定程序管理数据 -QList BaseCommonApi::getVerificationProgramInfo() + +//检定程序管理-查询 +QList BaseCommonApi::getVerificationProgramInfo(QString id) { 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(); - 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); + query.prepare("SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path ,zvpi.tested_device_id ,zvpi.standard_device_id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer " + " FROM zd_verification_program_info zvpi " + " LEFT JOIN eqpt_equipment_info eei ON eei.id = zvpi.tested_device_id WHERE zvpi.id = :id " + "UNION ALL " + " SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path,zvpi.tested_device_id ,zvpi.standard_device_id ,bei.equipment_name ,bei.model ,NULL ,bei.manufacture_no ,bei.manufacturer " + " FROM zd_verification_program_info zvpi " + " LEFT JOIN biz_equipment_info bei ON bei.id = zvpi.standard_device_id " + " WHERE zvpi.id = :id "); + query.bindValue(":id", id); if (query.exec()) { while (query.next()) { - VerificationProgramConfig programInfo; + VerificationProgramInfo programInfo; programInfo.id = query.value("id").toString(); - programInfo.verification_id = query.value("verification_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.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(); @@ -852,14 +837,17 @@ bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, remark) " - " VALUES (':id', ':program_name',':create_name', ':create_time', ':remark');"); + query.prepare("INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, remark,img_path,tested_device_id,standard_device_id)" + " VALUES (':id', ':program_name',':create_name', ':create_time', ':remark',':img_path',':tested_device_id',':standard_device_id');"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); query.bindValue(":create_name", verInfo.create_name); query.bindValue(":create_time", verInfo.create_time); query.bindValue(":remark", verInfo.remark); + query.bindValue(":img_path", verInfo.img_path); + query.bindValue(":tested_device_id", verInfo.tested_device_id); + query.bindValue(":standard_device_id", verInfo.standard_device_id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -868,26 +856,7 @@ return isSuccess; } -//新增检定配置 -bool BaseCommonApi::InsertVerificationProgramConfig(VerificationProgramConfig programConfig) -{ - QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_details (id,verification_id,img_path,tested_device_id,standard_device_id) " - " VALUES (':id',':verification_id',':img_path',':tested_device_id',':standard_device_id')"); - query.bindValue(":id", programConfig.id); - query.bindValue(":verification_id", programConfig.verification_id); - query.bindValue(":img_path", programConfig.img_path); - query.bindValue(":tested_device_id", programConfig.tested_device_id); - query.bindValue(":standard_device_id", programConfig.standard_device_id); - - bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } - - return isSuccess; -} //新增通讯接口 bool BaseCommonApi::InsertVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace) { @@ -915,11 +884,15 @@ QSqlQuery query; query.prepare("UPDATE zd_verification_program_info " " SET program_name = :program_name,create_name = :create_name, " - " create_time = :create_time, remark = :remark WHERE id = :id;"); + " create_time = :create_time, remark = :remark,img_path = :img_path,tested_device_id = :tested_device_id,standard_device_id = :standard_device_id " + "WHERE id = :id;"); query.bindValue(":program_name", verInfo.program_name); query.bindValue(":create_name", verInfo.create_name); query.bindValue(":create_time", verInfo.create_time); query.bindValue(":remark", verInfo.remark); + query.bindValue(":img_path", verInfo.img_path); + query.bindValue(":tested_device_id", verInfo.tested_device_id); + query.bindValue(":standard_device_id", verInfo.standard_device_id); query.bindValue(":id", verInfo.id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -927,23 +900,6 @@ } return isSuccess; } -//更新检定配置 -bool BaseCommonApi::UpdateVerificationProgramConfig(VerificationProgramConfig programConfig) -{ -QSqlQuery query; - query.prepare("UPDATE zd_verification_program_details " - " SET img_path = :img_path,tested_device_id = :tested_device_id,standard_device_id = :standard_device_id " - " WHERE verification_id = :verification_id;"); - query.bindValue(":img_path", programConfig.img_path); - query.bindValue(":tested_device_id", programConfig.tested_device_id); - query.bindValue(":standard_device_id", programConfig.standard_device_id); - query.bindValue(":verification_id", programConfig.verification_id); - bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); - } - return isSuccess; -} //更新通讯接口 bool BaseCommonApi::UpdateVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace) { @@ -974,16 +930,6 @@ qDebug() << "删除失败: " << query.lastError().text(); return false; } - - //删除检定程序详情 - query.prepare("DELETE FROM zd_verification_program_details WHERE verification_id = :verification_id"); - query.bindValue(":verification_id", id); - - if (!query.exec()) { - qDebug() << "删除失败 " << query.lastError().text(); - return false; - } - return true; } //新增指令库 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 7a130d4..e55c059 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -737,44 +737,29 @@ return result; } -//获取检定程序管理数据 -QList BaseCommonApi::getVerificationProgramInfo() + +//检定程序管理-查询 +QList BaseCommonApi::getVerificationProgramInfo(QString id) { 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(); - 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); + query.prepare("SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path ,zvpi.tested_device_id ,zvpi.standard_device_id ,eei.equipment_name ,eei.model ,eei.help_instruction ,eei.manufacture_no ,eei.manufacturer " + " FROM zd_verification_program_info zvpi " + " LEFT JOIN eqpt_equipment_info eei ON eei.id = zvpi.tested_device_id WHERE zvpi.id = :id " + "UNION ALL " + " SELECT zvpi.id,zvpi.program_name ,zvpi.create_name ,zvpi.create_time ,zvpi.remark ,zvpi.img_path,zvpi.tested_device_id ,zvpi.standard_device_id ,bei.equipment_name ,bei.model ,NULL ,bei.manufacture_no ,bei.manufacturer " + " FROM zd_verification_program_info zvpi " + " LEFT JOIN biz_equipment_info bei ON bei.id = zvpi.standard_device_id " + " WHERE zvpi.id = :id "); + query.bindValue(":id", id); if (query.exec()) { while (query.next()) { - VerificationProgramConfig programInfo; + VerificationProgramInfo programInfo; programInfo.id = query.value("id").toString(); - programInfo.verification_id = query.value("verification_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.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(); @@ -852,14 +837,17 @@ bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, remark) " - " VALUES (':id', ':program_name',':create_name', ':create_time', ':remark');"); + query.prepare("INSERT INTO zd_verification_program_info (id,program_name,create_name,create_time, remark,img_path,tested_device_id,standard_device_id)" + " VALUES (':id', ':program_name',':create_name', ':create_time', ':remark',':img_path',':tested_device_id',':standard_device_id');"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); query.bindValue(":create_name", verInfo.create_name); query.bindValue(":create_time", verInfo.create_time); query.bindValue(":remark", verInfo.remark); + query.bindValue(":img_path", verInfo.img_path); + query.bindValue(":tested_device_id", verInfo.tested_device_id); + query.bindValue(":standard_device_id", verInfo.standard_device_id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -868,26 +856,7 @@ return isSuccess; } -//新增检定配置 -bool BaseCommonApi::InsertVerificationProgramConfig(VerificationProgramConfig programConfig) -{ - QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_details (id,verification_id,img_path,tested_device_id,standard_device_id) " - " VALUES (':id',':verification_id',':img_path',':tested_device_id',':standard_device_id')"); - query.bindValue(":id", programConfig.id); - query.bindValue(":verification_id", programConfig.verification_id); - query.bindValue(":img_path", programConfig.img_path); - query.bindValue(":tested_device_id", programConfig.tested_device_id); - query.bindValue(":standard_device_id", programConfig.standard_device_id); - - bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } - - return isSuccess; -} //新增通讯接口 bool BaseCommonApi::InsertVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace) { @@ -915,11 +884,15 @@ QSqlQuery query; query.prepare("UPDATE zd_verification_program_info " " SET program_name = :program_name,create_name = :create_name, " - " create_time = :create_time, remark = :remark WHERE id = :id;"); + " create_time = :create_time, remark = :remark,img_path = :img_path,tested_device_id = :tested_device_id,standard_device_id = :standard_device_id " + "WHERE id = :id;"); query.bindValue(":program_name", verInfo.program_name); query.bindValue(":create_name", verInfo.create_name); query.bindValue(":create_time", verInfo.create_time); query.bindValue(":remark", verInfo.remark); + query.bindValue(":img_path", verInfo.img_path); + query.bindValue(":tested_device_id", verInfo.tested_device_id); + query.bindValue(":standard_device_id", verInfo.standard_device_id); query.bindValue(":id", verInfo.id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -927,23 +900,6 @@ } return isSuccess; } -//更新检定配置 -bool BaseCommonApi::UpdateVerificationProgramConfig(VerificationProgramConfig programConfig) -{ -QSqlQuery query; - query.prepare("UPDATE zd_verification_program_details " - " SET img_path = :img_path,tested_device_id = :tested_device_id,standard_device_id = :standard_device_id " - " WHERE verification_id = :verification_id;"); - query.bindValue(":img_path", programConfig.img_path); - query.bindValue(":tested_device_id", programConfig.tested_device_id); - query.bindValue(":standard_device_id", programConfig.standard_device_id); - query.bindValue(":verification_id", programConfig.verification_id); - bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); - } - return isSuccess; -} //更新通讯接口 bool BaseCommonApi::UpdateVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace) { @@ -974,16 +930,6 @@ qDebug() << "删除失败: " << query.lastError().text(); return false; } - - //删除检定程序详情 - query.prepare("DELETE FROM zd_verification_program_details WHERE verification_id = :verification_id"); - query.bindValue(":verification_id", id); - - if (!query.exec()) { - qDebug() << "删除失败 " << query.lastError().text(); - return false; - } - return true; } //新增指令库 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index d9b2511..cccbbc6 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -381,24 +381,34 @@ QString create_name; QDateTime create_time; QString remark; -}; - - -//检定程序管理-检定配置查询 -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 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 { @@ -485,9 +495,7 @@ //技术文件 static QList getTechnique_File(); //检定程序管理 - static QList getVerificationProgramInfo(); - //查询已选择的设备 - static QList getVerificationProgramConfig(QString verification_id); + static QList getVerificationProgramInfo(QString id); //查询设备通信接口 static QList getVerificationProgramConfigInterface(QString deviceId); //新建检定程序 @@ -501,14 +509,10 @@ //更新指令库 static bool UpdateInstructionLib(InstructionLib instructionLib); - //新增检定配置 - static bool InsertVerificationProgramConfig(VerificationProgramConfig programConfig); //新增通讯接口 static bool InsertVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace); //更新检定程序 static bool UpdateVerificationProgramInfo(VerificationProgramInfo verInfo); - //更新检定配置 - static bool UpdateVerificationProgramConfig(VerificationProgramConfig programConfig); //更新通讯接口 static bool UpdateVerificationProgramConfigInterface(VerificationProgramConfigInterface configInterdace); //删除检定程序