diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index f882df6..9501d62 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -1562,7 +1562,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,program_name ,create_name ,create_time ,remark FROM zd_verification_program_info"); + bool isSuccess = query.exec("SELECT * FROM zd_verification_program_info"); if (isSuccess) { while (query.next()) { VerificationProgramInfo programInfo; @@ -1571,6 +1571,11 @@ programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); + programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.equipment_item_category = query.value("equipment_item_category").toString(); + programInfo.equipment_name = query.value("equipment_name").toString(); + programInfo.model = query.value("model").toString(); + programInfo.help_instruction = query.value("help_instruction").toString(); result.append(programInfo); } } else { @@ -1585,8 +1590,7 @@ { VerificationProgramInfo result; QSqlQuery query; - query.prepare("SELECT id,program_name,create_name,create_time,remark,img_path,tested_device_id," - "standard_device_id,update_time FROM zd_verification_program_info WHERE id = :id "); + query.prepare("SELECT * FROM zd_verification_program_info WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { @@ -1600,6 +1604,11 @@ programInfo.tested_device_id = query.value("tested_device_id").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.update_time = query.value("update_time").toDateTime(); + programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.equipment_item_category = query.value("equipment_item_category").toString(); + programInfo.equipment_name = query.value("equipment_name").toString(); + programInfo.model = query.value("model").toString(); + programInfo.help_instruction = query.value("help_instruction").toString(); result = programInfo; } } else { @@ -1607,6 +1616,11 @@ } return result; } + + + + + //查询设备通信接口 QList BaseCommonApi::getVerificationProgramConfigInterface(QString deviceId) { @@ -1664,13 +1678,17 @@ -//新建检定程序 增加更新时间 2024年3月18日13:28:13 修改完毕2024年3月20日14:49:00 +//新建检定程序 2024年3月29日17:36:38 根据新原型修改完毕 bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_info (id, program_name, create_name, create_time, remark, img_path, tested_device_id, standard_device_id,update_time)" - - " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, :standard_device_id,:update_time);"); + query.prepare(" INSERT INTO zd_verification_program_info (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)" + " 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);"); QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); @@ -1681,7 +1699,11 @@ query.bindValue(":tested_device_id", verInfo.tested_device_id); query.bindValue(":standard_device_id", verInfo.standard_device_id); query.bindValue(":update_time",formattedDateTime); - + query.bindValue(":belong_standard_equipment",verInfo.belong_standard_equipment); + query.bindValue(":equipment_item_category",verInfo.equipment_item_category); + query.bindValue(":equipment_name",verInfo.equipment_name); + query.bindValue(":model",verInfo.model); + query.bindValue(":help_instruction",verInfo.help_instruction); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -1713,7 +1735,7 @@ return isSuccess; } -//更新检定程序 更新时间 2024年3月18日13:28:34 增加更新 修改完成 2024年3月20日14:50:45 +//更新检定程序 bool BaseCommonApi::UpdateVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; @@ -1725,7 +1747,12 @@ "img_path = :img_path," "tested_device_id = :tested_device_id," "standard_device_id = :standard_device_id ," - "update_time = :update_time " + "update_time = :update_time, " + "belong_standard_equipment = :belong_standard_equipment," + "equipment_item_category = :equipment_item_category," + "equipment_name = :equipment_name," + "model=:model," + "help_instruction=:help_instruction " " WHERE id = :id;"); QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); @@ -1737,6 +1764,11 @@ 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(":belong_standard_equipment", verInfo.belong_standard_equipment); + query.bindValue(":equipment_item_category", verInfo.equipment_item_category); + query.bindValue(":equipment_name", verInfo.equipment_name); + query.bindValue(":model", verInfo.model); + query.bindValue(":help_instruction", verInfo.help_instruction); query.bindValue(":id", verInfo.id); bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) +{ + 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.bindValue(":deviceId",deviceId); + if (query.exec()) { + while (query.next()) { + DeviceMeasureEquipmentCatory catory; + catory.id = query.value("id").toString(); + catory.device_model_id = query.value("device_model_id").toString(); + catory.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + catory.help_field_instruction = query.value("help_field_instruction").toString(); + catory.item_category_id = query.value("item_category_id").toString(); + catory.item_category_name = query.value("item_category_name").toString(); + catory.deviceType = query.value("deviceType").toString(); + catory.deviceName = query.value("deviceName").toString(); + catory.model = query.value("model").toString(); + catory.helpInstruction = query.value("helpInstruction").toString(); + catory.instructionsFile = query.value("instructionsFile").toString(); + catory.checkCycle = query.value("checkCycle").toString(); + catory.eqptDeviceModelId = query.value("eqptDeviceModelId").toString(); + catory.eqptDeviceType = query.value("eqptDeviceType").toString(); + result.append(catory); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + +//根据getDeviceMeasureEquipmentCatory返回的item_category_id查询检定程序 +QList BaseCommonApi::getVerificationProgramInfoByDeviceId(QString deviceId) +{ + QList catory; + QSqlQuery query; + 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.bindValue(":equipment_item_category",equipment_item_category); + if (query.exec()) { + while (query.next()) { + VerificationProgramInfo info; + info.id = query.value("id").toString(); + info.program_name = query.value("program_name").toString(); + info.create_name = query.value("create_name").toString(); + info.create_time = query.value("create_time").toDateTime(); + info.remark = query.value("remark").toString(); + info.img_path = query.value("img_path").toString(); + info.tested_device_id = query.value("tested_device_id").toString(); + info.standard_device_id = query.value("standard_device_id").toString(); + info.update_time = query.value("update_time").toDateTime(); + info.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + info.equipment_item_category = query.value("equipment_item_category").toString(); + info.equipment_name = query.value("equipment_name").toString(); + info.model = query.value("model").toString(); + info.help_instruction = query.value("help_instruction").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + + //自动检定-结果保存-biz_business_device_measure_info 基本信息表 bool BaseCommonApi::InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index f882df6..9501d62 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -1562,7 +1562,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT id,program_name ,create_name ,create_time ,remark FROM zd_verification_program_info"); + bool isSuccess = query.exec("SELECT * FROM zd_verification_program_info"); if (isSuccess) { while (query.next()) { VerificationProgramInfo programInfo; @@ -1571,6 +1571,11 @@ programInfo.create_name = query.value("create_name").toString(); programInfo.create_time = query.value("create_time").toDateTime(); programInfo.remark = query.value("remark").toString(); + programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.equipment_item_category = query.value("equipment_item_category").toString(); + programInfo.equipment_name = query.value("equipment_name").toString(); + programInfo.model = query.value("model").toString(); + programInfo.help_instruction = query.value("help_instruction").toString(); result.append(programInfo); } } else { @@ -1585,8 +1590,7 @@ { VerificationProgramInfo result; QSqlQuery query; - query.prepare("SELECT id,program_name,create_name,create_time,remark,img_path,tested_device_id," - "standard_device_id,update_time FROM zd_verification_program_info WHERE id = :id "); + query.prepare("SELECT * FROM zd_verification_program_info WHERE id = :id "); query.bindValue(":id", id); if (query.exec()) { while (query.next()) { @@ -1600,6 +1604,11 @@ programInfo.tested_device_id = query.value("tested_device_id").toString(); programInfo.standard_device_id = query.value("standard_device_id").toString(); programInfo.update_time = query.value("update_time").toDateTime(); + programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + programInfo.equipment_item_category = query.value("equipment_item_category").toString(); + programInfo.equipment_name = query.value("equipment_name").toString(); + programInfo.model = query.value("model").toString(); + programInfo.help_instruction = query.value("help_instruction").toString(); result = programInfo; } } else { @@ -1607,6 +1616,11 @@ } return result; } + + + + + //查询设备通信接口 QList BaseCommonApi::getVerificationProgramConfigInterface(QString deviceId) { @@ -1664,13 +1678,17 @@ -//新建检定程序 增加更新时间 2024年3月18日13:28:13 修改完毕2024年3月20日14:49:00 +//新建检定程序 2024年3月29日17:36:38 根据新原型修改完毕 bool BaseCommonApi::InsertVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; - query.prepare("INSERT INTO zd_verification_program_info (id, program_name, create_name, create_time, remark, img_path, tested_device_id, standard_device_id,update_time)" - - " VALUES (:id, :program_name, :create_name, :create_time, :remark, :img_path, :tested_device_id, :standard_device_id,:update_time);"); + query.prepare(" INSERT INTO zd_verification_program_info (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)" + " 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);"); QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", verInfo.id); query.bindValue(":program_name", verInfo.program_name); @@ -1681,7 +1699,11 @@ query.bindValue(":tested_device_id", verInfo.tested_device_id); query.bindValue(":standard_device_id", verInfo.standard_device_id); query.bindValue(":update_time",formattedDateTime); - + query.bindValue(":belong_standard_equipment",verInfo.belong_standard_equipment); + query.bindValue(":equipment_item_category",verInfo.equipment_item_category); + query.bindValue(":equipment_name",verInfo.equipment_name); + query.bindValue(":model",verInfo.model); + query.bindValue(":help_instruction",verInfo.help_instruction); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -1713,7 +1735,7 @@ return isSuccess; } -//更新检定程序 更新时间 2024年3月18日13:28:34 增加更新 修改完成 2024年3月20日14:50:45 +//更新检定程序 bool BaseCommonApi::UpdateVerificationProgramInfo(VerificationProgramInfo verInfo) { QSqlQuery query; @@ -1725,7 +1747,12 @@ "img_path = :img_path," "tested_device_id = :tested_device_id," "standard_device_id = :standard_device_id ," - "update_time = :update_time " + "update_time = :update_time, " + "belong_standard_equipment = :belong_standard_equipment," + "equipment_item_category = :equipment_item_category," + "equipment_name = :equipment_name," + "model=:model," + "help_instruction=:help_instruction " " WHERE id = :id;"); QString formattedDateTime = verInfo.create_time.toString("yyyy-MM-dd HH:mm:ss"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); @@ -1737,6 +1764,11 @@ 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(":belong_standard_equipment", verInfo.belong_standard_equipment); + query.bindValue(":equipment_item_category", verInfo.equipment_item_category); + query.bindValue(":equipment_name", verInfo.equipment_name); + query.bindValue(":model", verInfo.model); + query.bindValue(":help_instruction", verInfo.help_instruction); query.bindValue(":id", verInfo.id); bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) +{ + 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.bindValue(":deviceId",deviceId); + if (query.exec()) { + while (query.next()) { + DeviceMeasureEquipmentCatory catory; + catory.id = query.value("id").toString(); + catory.device_model_id = query.value("device_model_id").toString(); + catory.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + catory.help_field_instruction = query.value("help_field_instruction").toString(); + catory.item_category_id = query.value("item_category_id").toString(); + catory.item_category_name = query.value("item_category_name").toString(); + catory.deviceType = query.value("deviceType").toString(); + catory.deviceName = query.value("deviceName").toString(); + catory.model = query.value("model").toString(); + catory.helpInstruction = query.value("helpInstruction").toString(); + catory.instructionsFile = query.value("instructionsFile").toString(); + catory.checkCycle = query.value("checkCycle").toString(); + catory.eqptDeviceModelId = query.value("eqptDeviceModelId").toString(); + catory.eqptDeviceType = query.value("eqptDeviceType").toString(); + result.append(catory); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + +//根据getDeviceMeasureEquipmentCatory返回的item_category_id查询检定程序 +QList BaseCommonApi::getVerificationProgramInfoByDeviceId(QString deviceId) +{ + QList catory; + QSqlQuery query; + 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.bindValue(":equipment_item_category",equipment_item_category); + if (query.exec()) { + while (query.next()) { + VerificationProgramInfo info; + info.id = query.value("id").toString(); + info.program_name = query.value("program_name").toString(); + info.create_name = query.value("create_name").toString(); + info.create_time = query.value("create_time").toDateTime(); + info.remark = query.value("remark").toString(); + info.img_path = query.value("img_path").toString(); + info.tested_device_id = query.value("tested_device_id").toString(); + info.standard_device_id = query.value("standard_device_id").toString(); + info.update_time = query.value("update_time").toDateTime(); + info.belong_standard_equipment = query.value("belong_standard_equipment").toString(); + info.equipment_item_category = query.value("equipment_item_category").toString(); + info.equipment_name = query.value("equipment_name").toString(); + info.model = query.value("model").toString(); + info.help_instruction = query.value("help_instruction").toString(); + result.append(info); + } + } else { + qDebug() << "Query execution failed: " << query.lastError().text(); + } + return result; +} + + //自动检定-结果保存-biz_business_device_measure_info 基本信息表 bool BaseCommonApi::InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo) { diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index c790250..eed8ef0 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -473,10 +473,14 @@ QDateTime create_time; QString remark;// 说明 QString img_path; //连接图片地址 - QString tested_device_id; //被检设备id - QString standard_device_id; //标准设备id + QString tested_device_id; //被检设备id 可为空 按照原型参考 + QString standard_device_id; //标准设备id存数组 QDateTime update_time;//更新时间 - + QString belong_standard_equipment;//检校标准装置 * + QString equipment_item_category;//设备检定项分类 * + QString equipment_name;//设备名称 可为空 + QString model;//型号规格 可为空 + QString help_instruction;//辅助字段 可为空 }; @@ -581,6 +585,28 @@ QString measure_person_id;//检定员id(人员id) QString create_user_name; //创建用户名 }; + +//自动检定-根据被检设备 查询检定项分类 在查询检定程序 +class DeviceMeasureEquipmentCatory +{ +public: + QString id;//检定项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 deviceType;//设备分类(字典code) + QString deviceName;//设备名称 + QString model;//型号规格 + QString helpInstruction;//辅助说明 + QString instructionsFile;//说明书(minio存储文件名)（多个用,拼接） + QString checkCycle;//检定周期(月) + QString eqptDeviceModelId;//设备型号表id + QString eqptDeviceType;//设备类型(1通用设备;2特种设备) +}; + //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) class SaveDeviceMeasureCalibrator { @@ -988,6 +1014,11 @@ QString GenerateTaskNumber(); // 生成任务单编号当天天数增加 bool AddTaskNumber(); + // + static QList getDeviceMeasureEquipmentCatory(QString deviceId); + // + static QList getVerificationProgramInfoByDeviceId(QString deviceId); + //自动检定-结果保存-基本信息 static bool InsertSaveDeviceMeasureInfo(SaveDeviceMeasureInfo saveInfo); //自动检定-结果保存-数据关联-计量检定业务-受检设备检定管理-检定数据管理-所使用的标准、主要测量设备