diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 572246e..b3eff8f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -974,7 +974,10 @@ resultData.clear(); QSqlQuery query; - query.prepare("SELECT * FROM biz_business_device_measure_item_data_calibrator bbdmidc WHERE item_id = :itemId "); + query.prepare("SELECT bbdmidc.*,bbdmic.category_name FROM biz_business_device_measure_item_data_calibrator bbdmidc " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidc.item_id " + " JOIN biz_business_device_measure_item_category bbdmic ON bbdmic.id = bbdmii.item_category_id " + " WHERE item_id = :itemId"); // 将参数绑定到占位符 query.bindValue(":itemId", itemId); if (query.exec()) { @@ -1003,6 +1006,7 @@ result.append(query.value("accuracy_level").toString()); result.append(query.value("create_time").toString()); result.append(query.value("update_time").toString()); + result.append(query.value("category_name").toString()); resultData.append(result); } } else { @@ -1010,7 +1014,7 @@ } *headList <<"序号"<<"检定项id"<<"参数"<<"量"<<"单位"<<"频率"<<"频率单位"<<"量程"<<"标准值"<<"分辨力"<<"最大允许误差(公式)"<<"误差参数a"<<"误差参数b" - <<"两线/四线模式"<<"线圈放大"<<"示值"<<"准确度a"<<"指针式仪表满量程值"<<"指针式仪表满量程值单位"<<"被检表示值"<<"准确度等级"<<"创建时间"<<"更新时间"; + <<"两线/四线模式"<<"线圈放大"<<"示值"<<"准确度a"<<"指针式仪表满量程值"<<"指针式仪表满量程值单位"<<"被检表示值"<<"准确度等级"<<"创建时间"<<"更新时间"<<"检定项分类"; return resultData; } //被检设备管理-检定项目及检定点-多功能校准源 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 572246e..b3eff8f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -974,7 +974,10 @@ resultData.clear(); QSqlQuery query; - query.prepare("SELECT * FROM biz_business_device_measure_item_data_calibrator bbdmidc WHERE item_id = :itemId "); + query.prepare("SELECT bbdmidc.*,bbdmic.category_name FROM biz_business_device_measure_item_data_calibrator bbdmidc " + " JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmidc.item_id " + " JOIN biz_business_device_measure_item_category bbdmic ON bbdmic.id = bbdmii.item_category_id " + " WHERE item_id = :itemId"); // 将参数绑定到占位符 query.bindValue(":itemId", itemId); if (query.exec()) { @@ -1003,6 +1006,7 @@ result.append(query.value("accuracy_level").toString()); result.append(query.value("create_time").toString()); result.append(query.value("update_time").toString()); + result.append(query.value("category_name").toString()); resultData.append(result); } } else { @@ -1010,7 +1014,7 @@ } *headList <<"序号"<<"检定项id"<<"参数"<<"量"<<"单位"<<"频率"<<"频率单位"<<"量程"<<"标准值"<<"分辨力"<<"最大允许误差(公式)"<<"误差参数a"<<"误差参数b" - <<"两线/四线模式"<<"线圈放大"<<"示值"<<"准确度a"<<"指针式仪表满量程值"<<"指针式仪表满量程值单位"<<"被检表示值"<<"准确度等级"<<"创建时间"<<"更新时间"; + <<"两线/四线模式"<<"线圈放大"<<"示值"<<"准确度a"<<"指针式仪表满量程值"<<"指针式仪表满量程值单位"<<"被检表示值"<<"准确度等级"<<"创建时间"<<"更新时间"<<"检定项分类"; return resultData; } //被检设备管理-检定项目及检定点-多功能校准源 diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 098944a..e37f877 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1010,7 +1010,7 @@ static QList getVerificationProgramInfoMain(); //查询检定项分类 static QList getitemCategoryList(QString item); - //检定程序中设置指令时选择检定项目 + //检定程序中设置指令时选择检定项目 参数 装置字典 1 OR 2 ,参数2: 检定项分类id ,在新建程序时选择的 例如:数字多用表(手持)的id static QList getParams(QString belong_standard_equipment_id,QString equipment_item_category_id); //检定程序管理 编辑 static VerificationProgramInfo getVerificationProgramInfo(QString id);