diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 1bc5850..b8846b2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -1681,38 +1681,9 @@ } return result; } -//查询指令库 -QList BaseCommonApi::getInstructionLib(QString device_id) -{ - QList result; - QSqlQuery query; - query.prepare("SELECT id,device_id,device_name,instruct_config,instruct_read,type,belong_vername,belong_checkname,create_time,update_time FROM zd_instruction_library WHERE device_id = :device_id "); - query.bindValue(":device_id", device_id); - if (query.exec()) { - while (query.next()) { - InstructionLib instruction; - instruction.id = query.value("id").toString(); - instruction.device_id = query.value("device_id").toString(); - instruction.device_name = query.value("device_name").toString(); - instruction.instruct_config = query.value("instruct_config").toString(); - instruction.instruct_read = query.value("instruct_read").toString(); - instruction.type = query.value("type").toString(); - instruction.belong_vername = query.value("belong_vername").toString(); - instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.create_time = query.value("create_time").toDateTime(); - instruction.update_time = query.value("update_time").toDateTime(); - - result.append(instruction); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -} - -//新建检定程序 2024年3月29日17:36:38 根据新原型修改完毕 +//新建检定程序 bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; @@ -1721,8 +1692,7 @@ "equipment_item_category,equipment_name,model,help_instruction)" " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, " ":standard_device_id,:update_time,:belong_standard_equipment,:equipment_item_category," - ":equipment_name,:model," - ":help_instruction);"); + ":equipment_name,:model,:help_instruction);"); QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); @@ -1844,13 +1814,75 @@ } return true; } + +//查询指令库 参数 检定程序id +QList BaseCommonApi::getInstructionLib(QString verification_program_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); + query.bindValue(":verification_program_id", verification_program_id); + if (query.exec()) { + while (query.next()) { + InstructionLib instruction; + instruction.id = query.value("id").toString(); + instruction.device_id = query.value("device_id").toString(); + instruction.device_name = query.value("device_name").toString(); + instruction.instruct_config = query.value("instruct_config").toString(); + instruction.instruct_read = query.value("instruct_read").toString(); + instruction.type = query.value("type").toString(); + instruction.belong_vername = query.value("belong_vername").toString(); + instruction.belong_checkname = query.value("belong_checkname").toString(); + instruction.create_time = query.value("create_time").toDateTime(); + instruction.update_time = query.value("update_time").toDateTime(); + instruction.param = query.value("param").toString(); + result.append(instruction); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询检定项用于在新增指令时筛选 例如DCV ACI 如果equipment_item_category_id为空查询所有 +QList BaseCommonApi::getParams(QString belong_standard_equipment_id,QString equipment_item_category_id) +{ + QList result; + QSqlQuery query; + switch (belong_standard_equipment_id.toInt()) { + case 1: + if(equipment_item_category_id.isNull() || equipment_item_category_id.isEmpty()) + { + query.prepare("SELECT DISTINCT bbdmidc.params FROM biz_business_device_measure_item_data_calibrator bbdmidc " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id= bbdmidc.item_id "); + }else { + query.prepare("SELECT DISTINCT bbdmidc.params FROM biz_business_device_measure_item_data_calibrator bbdmidc " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id= bbdmidc.item_id " + " WHERE bbdmii.item_category_id = :equipment_item_category_id "); + } + break; + } + query.bindValue(":equipment_item_category_id", equipment_item_category_id); + if (query.exec()) { + while (query.next()) { + Params param; + param.param = query.value("params").toString(); + result.append(param); + } + }else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + //新增指令库 bool BaseCommonApi::InsertInstructionLib(InstructionLib instructionLib) { QSqlQuery query; - query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read,type,belong_vername,belong_checkname,create_time,update_time) " - " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername,:belong_checkname,:create_time,:update_time)"); - + query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," + "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," + ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); query.bindValue(":device_name", instructionLib.device_name); @@ -1859,10 +1891,12 @@ query.bindValue(":type", instructionLib.type); query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); - query.bindValue(":create_time", instructionLib.create_time); - query.bindValue(":update_time", instructionLib.update_time); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); - qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); +// qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); } @@ -1870,13 +1904,12 @@ return isSuccess; } //删除指令库 -bool BaseCommonApi::DeleteInstructionLib(QString device_id) +bool BaseCommonApi::DeleteInstructionLib(QString id) { QSqlQuery query; //删除检定程序 - query.prepare("DELETE FROM zd_instruction_library WHERE device_id = :device_id "); - query.bindValue(":device_id", device_id); - + query.prepare("DELETE FROM zd_instruction_library WHERE id = :id "); + query.bindValue(":id", id); if (!query.exec()) { qDebug() << "删除失败: " << query.lastError().text(); return false; @@ -1890,9 +1923,9 @@ query.prepare("UPDATE zd_instruction_library SET device_id=:device_id," "device_name = :device_name,instruct_config = :instruct_config,instruct_read = :instruct_read," " type = :type,belong_vername = :belong_vername,belong_checkname = :belong_checkname," - "update_time = :update_time WHERE id = :id"); + "update_time = :update_time,verification_program_id=:verification_program_id,param=:param WHERE id = :id"); - QString formattedUpdateDateTime = instructionLib.update_time.toString("yyyy-MM-dd HH:mm:ss"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":device_id", instructionLib.device_id); query.bindValue(":device_name", instructionLib.device_name); query.bindValue(":instruct_config", instructionLib.instruct_config); @@ -1900,7 +1933,9 @@ query.bindValue(":type", instructionLib.type); query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); - query.bindValue(":update_time", formattedUpdateDateTime); + query.bindValue(":update_time", currentDateTime); + query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -1927,14 +1962,15 @@ { QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.*, eemi.category AS deviceType, eemi.equipment_name AS deviceName," - " eemi.model AS model, eemi.help_instruction AS helpInstruction, eemi.instructions_file AS instructionsFile," - " eemi.check_cycle AS checkCycle, eemi.id AS eqptDeviceModelId, eemi.category AS eqptDeviceType " - " FROM eqpt_equipment_model_info eemi " - " LEFT JOIN biz_business_device_measure_item_info bbdmii ON eemi.id = bbdmii.device_model_id " - " JOIN eqpt_equipment_info eei ON eei.model_id = eemi.id " - " WHERE eei.id =:deviceId " - " ORDER BY eemi.create_time DESC"); + query.prepare( + " SELECT bbdmii.*, eemi.category AS deviceType, eemi.equipment_name AS deviceName, " + " eemi.model AS model, eemi.help_instruction AS helpInstruction, eemi.instructions_file AS instructionsFile, " + " eemi.check_cycle AS checkCycle, eemi.id AS eqptDeviceModelId, eemi.category AS eqptDeviceType " + " FROM eqpt_equipment_model_info eemi " + " LEFT JOIN biz_business_device_measure_item_info bbdmii ON eemi.id = bbdmii.device_model_id " + " JOIN eqpt_equipment_info eei ON eei.model_id = eemi.id " + " WHERE eei.id = :deviceId " + " ORDER BY eemi.create_time DESC "); query.bindValue(":deviceId",deviceId); if (query.exec()) { while (query.next()) { @@ -1955,6 +1991,7 @@ catory.eqptDeviceType = query.value("eqptDeviceType").toString(); result.append(catory); } + qDebug() << query.lastQuery(); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } @@ -1969,7 +2006,7 @@ QList result; catory = BaseCommonApi::getDeviceMeasureEquipmentCatory(deviceId); QString equipment_item_category = catory[0].item_category_id; - query.prepare("SELECT * from zd_verification_program_info zvpi WHERE zvpi.equipment_item_category =:equipment_item_category"); + query.prepare("SELECT * from zd_verification_program_info zvpi WHERE zvpi.equipment_item_category = :equipment_item_category"); query.bindValue(":equipment_item_category",equipment_item_category); if (query.exec()) { while (query.next()) { @@ -1990,6 +2027,7 @@ info.help_instruction = query.value("help_instruction").toString(); result.append(info); } + } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 1bc5850..b8846b2 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -1681,38 +1681,9 @@ } return result; } -//查询指令库 -QList BaseCommonApi::getInstructionLib(QString device_id) -{ - QList result; - QSqlQuery query; - query.prepare("SELECT id,device_id,device_name,instruct_config,instruct_read,type,belong_vername,belong_checkname,create_time,update_time FROM zd_instruction_library WHERE device_id = :device_id "); - query.bindValue(":device_id", device_id); - if (query.exec()) { - while (query.next()) { - InstructionLib instruction; - instruction.id = query.value("id").toString(); - instruction.device_id = query.value("device_id").toString(); - instruction.device_name = query.value("device_name").toString(); - instruction.instruct_config = query.value("instruct_config").toString(); - instruction.instruct_read = query.value("instruct_read").toString(); - instruction.type = query.value("type").toString(); - instruction.belong_vername = query.value("belong_vername").toString(); - instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.create_time = query.value("create_time").toDateTime(); - instruction.update_time = query.value("update_time").toDateTime(); - - result.append(instruction); - } - } else { - qDebug() << "Query execution failed: " << query.lastError().text(); - } - return result; -} - -//新建检定程序 2024年3月29日17:36:38 根据新原型修改完毕 +//新建检定程序 bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; @@ -1721,8 +1692,7 @@ "equipment_item_category,equipment_name,model,help_instruction)" " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, " ":standard_device_id,:update_time,:belong_standard_equipment,:equipment_item_category," - ":equipment_name,:model," - ":help_instruction);"); + ":equipment_name,:model,:help_instruction);"); QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); @@ -1844,13 +1814,75 @@ } return true; } + +//查询指令库 参数 检定程序id +QList BaseCommonApi::getInstructionLib(QString verification_program_id) +{ + QList result; + QSqlQuery query; + query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); + query.bindValue(":verification_program_id", verification_program_id); + if (query.exec()) { + while (query.next()) { + InstructionLib instruction; + instruction.id = query.value("id").toString(); + instruction.device_id = query.value("device_id").toString(); + instruction.device_name = query.value("device_name").toString(); + instruction.instruct_config = query.value("instruct_config").toString(); + instruction.instruct_read = query.value("instruct_read").toString(); + instruction.type = query.value("type").toString(); + instruction.belong_vername = query.value("belong_vername").toString(); + instruction.belong_checkname = query.value("belong_checkname").toString(); + instruction.create_time = query.value("create_time").toDateTime(); + instruction.update_time = query.value("update_time").toDateTime(); + instruction.param = query.value("param").toString(); + result.append(instruction); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} +//查询检定项用于在新增指令时筛选 例如DCV ACI 如果equipment_item_category_id为空查询所有 +QList BaseCommonApi::getParams(QString belong_standard_equipment_id,QString equipment_item_category_id) +{ + QList result; + QSqlQuery query; + switch (belong_standard_equipment_id.toInt()) { + case 1: + if(equipment_item_category_id.isNull() || equipment_item_category_id.isEmpty()) + { + query.prepare("SELECT DISTINCT bbdmidc.params FROM biz_business_device_measure_item_data_calibrator bbdmidc " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id= bbdmidc.item_id "); + }else { + query.prepare("SELECT DISTINCT bbdmidc.params FROM biz_business_device_measure_item_data_calibrator bbdmidc " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id= bbdmidc.item_id " + " WHERE bbdmii.item_category_id = :equipment_item_category_id "); + } + break; + } + query.bindValue(":equipment_item_category_id", equipment_item_category_id); + if (query.exec()) { + while (query.next()) { + Params param; + param.param = query.value("params").toString(); + result.append(param); + } + }else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + //新增指令库 bool BaseCommonApi::InsertInstructionLib(InstructionLib instructionLib) { QSqlQuery query; - query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read,type,belong_vername,belong_checkname,create_time,update_time) " - " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername,:belong_checkname,:create_time,:update_time)"); - + query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," + "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," + ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); query.bindValue(":device_name", instructionLib.device_name); @@ -1859,10 +1891,12 @@ query.bindValue(":type", instructionLib.type); query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); - query.bindValue(":create_time", instructionLib.create_time); - query.bindValue(":update_time", instructionLib.update_time); + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); + query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); - qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); +// qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); } @@ -1870,13 +1904,12 @@ return isSuccess; } //删除指令库 -bool BaseCommonApi::DeleteInstructionLib(QString device_id) +bool BaseCommonApi::DeleteInstructionLib(QString id) { QSqlQuery query; //删除检定程序 - query.prepare("DELETE FROM zd_instruction_library WHERE device_id = :device_id "); - query.bindValue(":device_id", device_id); - + query.prepare("DELETE FROM zd_instruction_library WHERE id = :id "); + query.bindValue(":id", id); if (!query.exec()) { qDebug() << "删除失败: " << query.lastError().text(); return false; @@ -1890,9 +1923,9 @@ query.prepare("UPDATE zd_instruction_library SET device_id=:device_id," "device_name = :device_name,instruct_config = :instruct_config,instruct_read = :instruct_read," " type = :type,belong_vername = :belong_vername,belong_checkname = :belong_checkname," - "update_time = :update_time WHERE id = :id"); + "update_time = :update_time,verification_program_id=:verification_program_id,param=:param WHERE id = :id"); - QString formattedUpdateDateTime = instructionLib.update_time.toString("yyyy-MM-dd HH:mm:ss"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":device_id", instructionLib.device_id); query.bindValue(":device_name", instructionLib.device_name); query.bindValue(":instruct_config", instructionLib.instruct_config); @@ -1900,7 +1933,9 @@ query.bindValue(":type", instructionLib.type); query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); - query.bindValue(":update_time", formattedUpdateDateTime); + query.bindValue(":update_time", currentDateTime); + query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { @@ -1927,14 +1962,15 @@ { QList result; QSqlQuery query; - query.prepare("SELECT bbdmii.*, eemi.category AS deviceType, eemi.equipment_name AS deviceName," - " eemi.model AS model, eemi.help_instruction AS helpInstruction, eemi.instructions_file AS instructionsFile," - " eemi.check_cycle AS checkCycle, eemi.id AS eqptDeviceModelId, eemi.category AS eqptDeviceType " - " FROM eqpt_equipment_model_info eemi " - " LEFT JOIN biz_business_device_measure_item_info bbdmii ON eemi.id = bbdmii.device_model_id " - " JOIN eqpt_equipment_info eei ON eei.model_id = eemi.id " - " WHERE eei.id =:deviceId " - " ORDER BY eemi.create_time DESC"); + query.prepare( + " SELECT bbdmii.*, eemi.category AS deviceType, eemi.equipment_name AS deviceName, " + " eemi.model AS model, eemi.help_instruction AS helpInstruction, eemi.instructions_file AS instructionsFile, " + " eemi.check_cycle AS checkCycle, eemi.id AS eqptDeviceModelId, eemi.category AS eqptDeviceType " + " FROM eqpt_equipment_model_info eemi " + " LEFT JOIN biz_business_device_measure_item_info bbdmii ON eemi.id = bbdmii.device_model_id " + " JOIN eqpt_equipment_info eei ON eei.model_id = eemi.id " + " WHERE eei.id = :deviceId " + " ORDER BY eemi.create_time DESC "); query.bindValue(":deviceId",deviceId); if (query.exec()) { while (query.next()) { @@ -1955,6 +1991,7 @@ catory.eqptDeviceType = query.value("eqptDeviceType").toString(); result.append(catory); } + qDebug() << query.lastQuery(); } else { qDebug() << "Query execution failed: " << query.lastError().text(); } @@ -1969,7 +2006,7 @@ QList result; catory = BaseCommonApi::getDeviceMeasureEquipmentCatory(deviceId); QString equipment_item_category = catory[0].item_category_id; - query.prepare("SELECT * from zd_verification_program_info zvpi WHERE zvpi.equipment_item_category =:equipment_item_category"); + query.prepare("SELECT * from zd_verification_program_info zvpi WHERE zvpi.equipment_item_category = :equipment_item_category"); query.bindValue(":equipment_item_category",equipment_item_category); if (query.exec()) { while (query.next()) { @@ -1990,6 +2027,7 @@ info.help_instruction = query.value("help_instruction").toString(); result.append(info); } + } else { qDebug() << "Query execution failed: " << query.lastError().text(); } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 071409c..da7ce3c 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -499,6 +499,12 @@ // QString manufacture_no; //出厂编号 // QString manufacturer; //生产厂家 //}; +//装置下的检定项目 +class Params +{ +public: + QString param; +}; //检定程序管理-检定配置设备通信接口查询 class VerificationProgramConfigInterface @@ -517,13 +523,15 @@ { public: QString id; - QString device_id;//设备id - QString device_name;//指令名称 + QString verification_program_id; //检定程序id + QString param;//检定|核查项目 + QString device_id;//设备id 可选 + QString device_name;//被检设备名称 可选 QString instruct_config;//配置指令 QString instruct_read;//读数指令 - QString type;//区分被检和标准设备 0 & 1 - QString belong_vername; //检定项名称 - QString belong_checkname; //核查项名称 + QString type;//区分被检即检定程序和标准设备 0 & 1 + QString belong_vername; //检定项名称 字典 + QString belong_checkname; //核查项名称 字典 QDateTime create_time; QDateTime update_time; }; @@ -1002,18 +1010,20 @@ static QList getVerificationProgramInfoMain(); //查询检定项分类 static QList getitemCategoryList(QString item); + //检定程序中设置指令时选择检定项目 + static QList getParams(QString belong_standard_equipment_id,QString equipment_item_category_id); //检定程序管理 编辑 static VerificationProgramInfo getVerificationProgramInfo(QString id); //查询设备通信接口 static QList getVerificationProgramConfigInterface(QString deviceId); //新建检定程序 static bool InsertVerificationProgramInfo(VerificationProgramInfo verInfo); - //查询指令库 - static QList getInstructionLib(QString device_id); + //查询指令库 参数 检定程序id + static QList getInstructionLib(QString verification_program_id); //新增指令库 static bool InsertInstructionLib(InstructionLib instructionLib); - //删除指令库 - static bool DeleteInstructionLib(QString device_id); + //删除指令库 参数 指令表的id + static bool DeleteInstructionLib(QString id); //更新指令库 static bool UpdateInstructionLib(InstructionLib instructionLib);