diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 99cea8d..b227101 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -90,7 +90,9 @@ Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); if(state == Qt::Checked){ selectTaskList.append(myTaskList[i]); - measureInfo.order_id = myTaskList[i].id; + measureInfo.order_id = myTaskList[i].orderId; + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 99cea8d..b227101 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -90,7 +90,9 @@ Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); if(state == Qt::Checked){ selectTaskList.append(myTaskList[i]); - measureInfo.order_id = myTaskList[i].id; + measureInfo.order_id = myTaskList[i].orderId; + qDebug()<comboBoxConclusion->currentText(); measInfo.meter_identify = ui->comboBoxIdentify->currentText(); +// QString itemId = BaseCommonApi::getStandardItemInfo(); + QString sqls = "UPDATE biz_business_device_measure_item_info SET data_sync=1,sync_time=:1 WHERE id= " + measInfo.item_id; + BaseCommonApi::saveLogToSql(sqls,nullptr); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ QStringList idList = stdId; for(const QString& id : idList) diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 99cea8d..b227101 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -90,7 +90,9 @@ Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); if(state == Qt::Checked){ selectTaskList.append(myTaskList[i]); - measureInfo.order_id = myTaskList[i].id; + measureInfo.order_id = myTaskList[i].orderId; + qDebug()<comboBoxConclusion->currentText(); measInfo.meter_identify = ui->comboBoxIdentify->currentText(); +// QString itemId = BaseCommonApi::getStandardItemInfo(); + QString sqls = "UPDATE biz_business_device_measure_item_info SET data_sync=1,sync_time=:1 WHERE id= " + measInfo.item_id; + BaseCommonApi::saveLogToSql(sqls,nullptr); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ QStringList idList = stdId; for(const QString& id : idList) diff --git a/softwareDirectory/AutoVerScheme/loginwindow.cpp b/softwareDirectory/AutoVerScheme/loginwindow.cpp index 155988a..e3b9aeb 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.cpp +++ b/softwareDirectory/AutoVerScheme/loginwindow.cpp @@ -23,6 +23,9 @@ //this->setWindowFlags(Qt::FramelessWindowHint); //调用样式 loadStyle(":/qss/login.css"); +// ui->lineEdit_pwd->setStyleSheet("QLineEdit { border-bottom: 2px solid gray; font-size: 26px;}"); + ui->lineEdit_pwd->setPlaceholderText("请输入密码"); + ui->lineEdit_pwd->setEchoMode(QLineEdit::Password); } void loginWindow::loadStyle(const QString &qssFile) @@ -57,12 +60,38 @@ void loginWindow::on_Button_login_clicked() { - QMessageBox::information(this, "提示", "登录成功！"); + + + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //数据库连接 目前先放这里 后续需要放到登录界面 + Conn->open(); //查询数据库内是否有账号 - IndexWindow *indexWindow = new IndexWindow; - indexWindow->setWindowState(Qt::WindowMaximized); - indexWindow->show(); - this->close(); + QString account = ui->textEdit_acc->toPlainText(); + QString password = ui->lineEdit_pwd->text(); + bool isSuccess = false; + if(!(account.isEmpty() || password.isEmpty())){ + isSuccess = BaseCommonApi::SysUserLogin(account,password); + if(isSuccess){ + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); + }else { +// QMessageBox::critical(this, "提示", "账号或密码错误，请重新输入！"); + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); +// ui->textEdit_acc->clear(); +// ui->lineEdit_pwd->clear(); +// ui->textEdit_acc->setFocus(); + } + }else { + QMessageBox::critical(this, "提示", "账号或密码为空！"); + } } diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 99cea8d..b227101 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -90,7 +90,9 @@ Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); if(state == Qt::Checked){ selectTaskList.append(myTaskList[i]); - measureInfo.order_id = myTaskList[i].id; + measureInfo.order_id = myTaskList[i].orderId; + qDebug()<comboBoxConclusion->currentText(); measInfo.meter_identify = ui->comboBoxIdentify->currentText(); +// QString itemId = BaseCommonApi::getStandardItemInfo(); + QString sqls = "UPDATE biz_business_device_measure_item_info SET data_sync=1,sync_time=:1 WHERE id= " + measInfo.item_id; + BaseCommonApi::saveLogToSql(sqls,nullptr); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ QStringList idList = stdId; for(const QString& id : idList) diff --git a/softwareDirectory/AutoVerScheme/loginwindow.cpp b/softwareDirectory/AutoVerScheme/loginwindow.cpp index 155988a..e3b9aeb 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.cpp +++ b/softwareDirectory/AutoVerScheme/loginwindow.cpp @@ -23,6 +23,9 @@ //this->setWindowFlags(Qt::FramelessWindowHint); //调用样式 loadStyle(":/qss/login.css"); +// ui->lineEdit_pwd->setStyleSheet("QLineEdit { border-bottom: 2px solid gray; font-size: 26px;}"); + ui->lineEdit_pwd->setPlaceholderText("请输入密码"); + ui->lineEdit_pwd->setEchoMode(QLineEdit::Password); } void loginWindow::loadStyle(const QString &qssFile) @@ -57,12 +60,38 @@ void loginWindow::on_Button_login_clicked() { - QMessageBox::information(this, "提示", "登录成功！"); + + + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //数据库连接 目前先放这里 后续需要放到登录界面 + Conn->open(); //查询数据库内是否有账号 - IndexWindow *indexWindow = new IndexWindow; - indexWindow->setWindowState(Qt::WindowMaximized); - indexWindow->show(); - this->close(); + QString account = ui->textEdit_acc->toPlainText(); + QString password = ui->lineEdit_pwd->text(); + bool isSuccess = false; + if(!(account.isEmpty() || password.isEmpty())){ + isSuccess = BaseCommonApi::SysUserLogin(account,password); + if(isSuccess){ + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); + }else { +// QMessageBox::critical(this, "提示", "账号或密码错误，请重新输入！"); + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); +// ui->textEdit_acc->clear(); +// ui->lineEdit_pwd->clear(); +// ui->textEdit_acc->setFocus(); + } + }else { + QMessageBox::critical(this, "提示", "账号或密码为空！"); + } } diff --git a/softwareDirectory/AutoVerScheme/loginwindow.ui b/softwareDirectory/AutoVerScheme/loginwindow.ui index 548691a..94406ba 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.ui +++ b/softwareDirectory/AutoVerScheme/loginwindow.ui @@ -177,19 +177,6 @@ 请输入账号 - - - - 610 - 300 - 221 - 41 - - - - 请输入密码 - - @@ -203,6 +190,16 @@ + + + + 612 + 297 + 211 + 41 + + + label_4 graphicsView label_2 @@ -214,8 +211,8 @@ textBrowser_3 Button_login textEdit_acc - textEdit_pass label + lineEdit_pwd diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 99cea8d..b227101 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -90,7 +90,9 @@ Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); if(state == Qt::Checked){ selectTaskList.append(myTaskList[i]); - measureInfo.order_id = myTaskList[i].id; + measureInfo.order_id = myTaskList[i].orderId; + qDebug()<comboBoxConclusion->currentText(); measInfo.meter_identify = ui->comboBoxIdentify->currentText(); +// QString itemId = BaseCommonApi::getStandardItemInfo(); + QString sqls = "UPDATE biz_business_device_measure_item_info SET data_sync=1,sync_time=:1 WHERE id= " + measInfo.item_id; + BaseCommonApi::saveLogToSql(sqls,nullptr); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ QStringList idList = stdId; for(const QString& id : idList) diff --git a/softwareDirectory/AutoVerScheme/loginwindow.cpp b/softwareDirectory/AutoVerScheme/loginwindow.cpp index 155988a..e3b9aeb 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.cpp +++ b/softwareDirectory/AutoVerScheme/loginwindow.cpp @@ -23,6 +23,9 @@ //this->setWindowFlags(Qt::FramelessWindowHint); //调用样式 loadStyle(":/qss/login.css"); +// ui->lineEdit_pwd->setStyleSheet("QLineEdit { border-bottom: 2px solid gray; font-size: 26px;}"); + ui->lineEdit_pwd->setPlaceholderText("请输入密码"); + ui->lineEdit_pwd->setEchoMode(QLineEdit::Password); } void loginWindow::loadStyle(const QString &qssFile) @@ -57,12 +60,38 @@ void loginWindow::on_Button_login_clicked() { - QMessageBox::information(this, "提示", "登录成功！"); + + + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //数据库连接 目前先放这里 后续需要放到登录界面 + Conn->open(); //查询数据库内是否有账号 - IndexWindow *indexWindow = new IndexWindow; - indexWindow->setWindowState(Qt::WindowMaximized); - indexWindow->show(); - this->close(); + QString account = ui->textEdit_acc->toPlainText(); + QString password = ui->lineEdit_pwd->text(); + bool isSuccess = false; + if(!(account.isEmpty() || password.isEmpty())){ + isSuccess = BaseCommonApi::SysUserLogin(account,password); + if(isSuccess){ + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); + }else { +// QMessageBox::critical(this, "提示", "账号或密码错误，请重新输入！"); + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); +// ui->textEdit_acc->clear(); +// ui->lineEdit_pwd->clear(); +// ui->textEdit_acc->setFocus(); + } + }else { + QMessageBox::critical(this, "提示", "账号或密码为空！"); + } } diff --git a/softwareDirectory/AutoVerScheme/loginwindow.ui b/softwareDirectory/AutoVerScheme/loginwindow.ui index 548691a..94406ba 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.ui +++ b/softwareDirectory/AutoVerScheme/loginwindow.ui @@ -177,19 +177,6 @@ 请输入账号 - - - - 610 - 300 - 221 - 41 - - - - 请输入密码 - - @@ -203,6 +190,16 @@ + + + + 612 + 297 + 211 + 41 + + + label_4 graphicsView label_2 @@ -214,8 +211,8 @@ textBrowser_3 Button_login textEdit_acc - textEdit_pass label + lineEdit_pwd diff --git a/softwareDirectory/AutoVerScheme/res/qss/login.css b/softwareDirectory/AutoVerScheme/res/qss/login.css index f9aea6c..73b177e 100644 --- a/softwareDirectory/AutoVerScheme/res/qss/login.css +++ b/softwareDirectory/AutoVerScheme/res/qss/login.css @@ -61,7 +61,7 @@ font-size: 12pt; vertical-align: middle; } -QTextEdit#textEdit_pass +QLineEdit#lineEdit_pwd { border-bottom: 1px solid black; font-size: 12pt; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index da45a7e..9dbf009 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -105,7 +105,23 @@ return outStr.trimmed(); } - +bool BaseCommonApi::SysUserLogin(QString account,QString password){ + QSqlQuery query; + query.prepare("SELECT * FROM sys_user " + " WHERE ACCOUNT = :ACCOUNT AND PASSWORD = :PASSWORD "); + query.bindValue(":ACCOUNT",account); + query.bindValue(":PASSWORD",password); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<(entity); OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); @@ -2585,6 +2605,7 @@ .arg(deviceMeasureInfo->create_user_id.toInt()) .arg(deviceMeasureInfo->measure_person_id.toInt()) .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" + deviceMeasureInfo->meter_identify + "'") .arg("'" +currentDateTime+ "'") .arg("'" +currentDateTime+ "'"); } @@ -3067,7 +3088,7 @@ { QList result; QSqlQuery query; - bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info"); + bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer FROM biz_equipment_info bei"); if (isSuccess) { while (query.next()) { CheckAndTestedDevice device; @@ -6559,7 +6580,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6587,7 +6608,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6614,7 +6635,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6641,7 +6662,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6668,7 +6689,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" ; - headerMap.insert(row[3],head); + headerMap.insert("重复性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6696,7 +6717,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6725,7 +6746,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6754,7 +6775,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6783,7 +6804,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6812,7 +6833,7 @@ QStringList head; head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; - headerMap.insert(row[3],head); + headerMap.insert("稳定性",head); headList->insert(row[5],headerMap); //添加数据 QStringList Data; @@ -6952,3 +6973,391 @@ } return result; } +//字段更新 +bool BaseCommonApi::UpdateMeasureItemInfo(QString item_id) +{ + QSqlQuery query; + query.prepare("UPDATE biz_business_device_measure_item_info " + " SET data_sync=1,sync_time=:sync_time" + " WHERE id= :item_id"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + query.bindValue(":sync_time",currentDateTime); + query.bindValue(":item_id",item_id); + bool isSuccess = query.exec(); + if(!isSuccess){ + qDebug()<>> BaseCommonApi::getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList) +{ + QMap>> DataMapList; + QList resultData; + QStringList result; + resultData.clear(); + QSqlQuery query; + query.prepare("SELECT * FROM biz_equipment_standard_check_item_data_resistance_thermometer " + " WHERE equipment_id = :equipment_id"); + query.bindValue(":equipment_id", equipment_id); + if (query.exec()) { + while (query.next()) { + result.clear(); + result.append(query.value("id").toString()); + result.append(query.value("item_category_id").toString());//核查项分类id(能够确定是哪个标准装置) + result.append(query.value("equipment_id").toString());//配套设备id + result.append(query.value("params").toString());//核查项目(直接存字典value) + result.append(query.value("check_point").toString());//温度点/水三相点/确认点 + result.append(query.value("unit").toString());//单位(直接存字典value) + result.append(query.value("cycle_number").toString());//循环次数 + result.append(query.value("urel").toString());//Urel + result.append(query.value("check_type").toString());//核查类型(直接存字典value) + result.append(query.value("allow_value").toString());//允许值 + result.append(query.value("maximum_error").toString());//最大允许误差/最大允许误差绝对值 + result.append(query.value("remark").toString());//核查项备注 + result.append(query.value("create_time").toString()); + result.append(query.value("update_time").toString()); + resultData.append(result); + } + }else { + qDebug()<>> BaseCommonApi::GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList) +//{ +// QMap>> result; +// QMap> resultMap; +// QList TemperatureList; +// QList RTPList; +// QList InsulationResistanceList; +// QList ThermometerList; +// QList TemperatureStableList; +// QList RTPStableList; +// QList InsulationResistanceStableList; +// QList ThermometerStableList; +// QMap headerMap; +// for(const QStringList &row : ResultData){ +// QString VerificationItem=NULL; +// if (!row.isEmpty() && row[3] == "温度值" && row[8].contains("重复性")) { +//// VerificationItem = row[3]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"温度点"<<"单位"<<"核查标准示值1"<<"测量标准示值1"<<"差值1"<<"核查标准示值2"<<"测量标准示值2" +// <<"差值2"<<"测量标准示值3"<<"测量标准示值3"<<"差值3"<<"测量标准示值4"<<"测量标准示值4"<<"差值4" +// <<"测量标准示值5"<<"测量标准示值5"<<"差值5"<<"测量标准示值6"<<"测量标准示值6"<<"差值6" +// <<"平均值(差值)"<<"重复性S(x)" ; +// headerMap.insert(row[8],head); +// headList->insert(row[3],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCVList.append(Data); +// resultMap.insert("重复性",DCVList); +//// resultMap.insert() +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACVList.append(Data); +// resultMap.insert("重复性",ACVList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// DCIList.append(Data); +// resultMap.insert("重复性",DCIList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// ACIList.append(Data); +// resultMap.insert("重复性",ACIList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("重复性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"<<"示值6"<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" ; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// RList.append(Data); +// resultMap.insert("重复性",RList); +// } +// if (!row.isEmpty() && row[5] == "DCV" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCVStableList.append(Data); +// resultMap.insert("稳定性",DCVStableList); +// }else if (!row.isEmpty() && row[5] == "ACV"&& row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACVStableList.append(Data); +// resultMap.insert("稳定性",ACVStableList); +// }else if (!row.isEmpty() && row[5] == "DCI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// DCIStableList.append(Data); +// resultMap.insert("稳定性",DCIStableList); +// }else if (!row.isEmpty() && row[5] == "ACI" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// ACIStableList.append(Data); +// resultMap.insert("稳定性",ACIStableList); +// }else if (!row.isEmpty() && row[5] == "R" && row[3].contains("稳定性")) { +// VerificationItem = row[5]; +// //添加列头 +// QStringList head; +// head <<"序号"<<"核查项目"<<"核查点"<<"核查类型"<<"核查点类型"<<"单位(频率)"<<"示值"<<""<<""<<""<<""<<""<<"算数平均值" +// <<"标准偏差S(X)"<<"相对重复性" <<"Urel"<<"相对重复性是否小于相对扩展不确定度Urel"; +// headerMap.insert(row[3],head); +// headList->insert(row[5],headerMap); +// //添加数据 +// QStringList Data; +// Data.append(row[0]); //ID +// Data.append(VerificationItem); //检定项目 +// Data.append(row[9]);//核查点 +// Data.append(row[3]);//核查类型 +// Data.append(row[4]);//核查点类型 +// Data.append(row[10] + row[7]);//单位(频率) +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");// +// Data.append("");//算数平均值 +// Data.append("");//标准偏差S(X) +// Data.append("");//相对重复性 +// Data.append(row[12]);//Urel +// Data.append("");//相对重复性是否小于相对扩展不确定度Urel +// RStableList.append(Data); +// resultMap.insert("稳定性",RStableList); +// } +// } + +// result.insert("ACV",resultMap); +// result.insert("DCI",resultMap); +// result.insert("ACI",resultMap); +// result.insert("R",resultMap); +// result.insert("DCV",resultMap); +// return result; +//} diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 38b599d..c3314ce 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -26,6 +26,7 @@ QString sample_name;//设备名字 QString sample_model;//设备型号 QString sample_id; //设备id + QString orderId; QString help_instruction; QString manufacture_no; QString manufacturer; @@ -1438,6 +1439,7 @@ const static QString measure_person_id; QString encrypt(const QString &str, const QString &publicKey); + static bool SysUserLogin(QString account,QString password); //判断检定装置表并查询 参数设备id static QList Search_CalibrationTable(QString DeiverId,QStringList *HeadList); @@ -1725,6 +1727,19 @@ static QMap>> GetDataReturnItemListByCheckItemDataCalibrator(QList ResultData,QMap>> DataMapList,QMap> *headList); //【保存】核查数据-多功能校准源 static bool InsertStandardCheckDataCalibrator(StandardCheckDataCalibrator calibrator); + //【查询】核查项-二等铂电阻温度计 + static QMap>> getStandardCheckItemDataResistanceThermometer(QString equipment_id,QMap> *headList); + static QMap>> GetDataReturnItemListByCheckItemDataResistanceThermometer(QList ResultData,QMap>> DataMapList,QMap> *headList); + + + + + + //同步成功后更新检定项字段 + static bool UpdateMeasureItemInfo(QString item_id); + //配套设备关联表 + static bool UpdateStandardEquipmentRelation(QString equipment_id,QString standard_id); + static QString getStandardItemInfo(); }; diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp index 99cea8d..b227101 100644 --- a/softwareDirectory/AutoVerScheme/checkwindow.cpp +++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp @@ -90,7 +90,9 @@ Qt::CheckState state = ui->tableWidgetDevice->item(i,0)->checkState(); if(state == Qt::Checked){ selectTaskList.append(myTaskList[i]); - measureInfo.order_id = myTaskList[i].id; + measureInfo.order_id = myTaskList[i].orderId; + qDebug()<comboBoxConclusion->currentText(); measInfo.meter_identify = ui->comboBoxIdentify->currentText(); +// QString itemId = BaseCommonApi::getStandardItemInfo(); + QString sqls = "UPDATE biz_business_device_measure_item_info SET data_sync=1,sync_time=:1 WHERE id= " + measInfo.item_id; + BaseCommonApi::saveLogToSql(sqls,nullptr); if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){ QStringList idList = stdId; for(const QString& id : idList) diff --git a/softwareDirectory/AutoVerScheme/loginwindow.cpp b/softwareDirectory/AutoVerScheme/loginwindow.cpp index 155988a..e3b9aeb 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.cpp +++ b/softwareDirectory/AutoVerScheme/loginwindow.cpp @@ -23,6 +23,9 @@ //this->setWindowFlags(Qt::FramelessWindowHint); //调用样式 loadStyle(":/qss/login.css"); +// ui->lineEdit_pwd->setStyleSheet("QLineEdit { border-bottom: 2px solid gray; font-size: 26px;}"); + ui->lineEdit_pwd->setPlaceholderText("请输入密码"); + ui->lineEdit_pwd->setEchoMode(QLineEdit::Password); } void loginWindow::loadStyle(const QString &qssFile) @@ -57,12 +60,38 @@ void loginWindow::on_Button_login_clicked() { - QMessageBox::information(this, "提示", "登录成功！"); + + + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //数据库连接 目前先放这里 后续需要放到登录界面 + Conn->open(); //查询数据库内是否有账号 - IndexWindow *indexWindow = new IndexWindow; - indexWindow->setWindowState(Qt::WindowMaximized); - indexWindow->show(); - this->close(); + QString account = ui->textEdit_acc->toPlainText(); + QString password = ui->lineEdit_pwd->text(); + bool isSuccess = false; + if(!(account.isEmpty() || password.isEmpty())){ + isSuccess = BaseCommonApi::SysUserLogin(account,password); + if(isSuccess){ + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); + }else { +// QMessageBox::critical(this, "提示", "账号或密码错误，请重新输入！"); + QMessageBox::information(this, "提示", "登录成功！"); + IndexWindow *indexWindow = new IndexWindow; + indexWindow->setWindowState(Qt::WindowMaximized); + indexWindow->show(); + this->close(); +// ui->textEdit_acc->clear(); +// ui->lineEdit_pwd->clear(); +// ui->textEdit_acc->setFocus(); + } + }else { + QMessageBox::critical(this, "提示", "账号或密码为空！"); + } } diff --git a/softwareDirectory/AutoVerScheme/loginwindow.ui b/softwareDirectory/AutoVerScheme/loginwindow.ui index 548691a..94406ba 100644 --- a/softwareDirectory/AutoVerScheme/loginwindow.ui +++ b/softwareDirectory/AutoVerScheme/loginwindow.ui @@ -177,19 +177,6 @@ 请输入账号 - - - - 610 - 300 - 221 - 41 - - - - 请输入密码 - - @@ -203,6 +190,16 @@ + + + + 612 + 297 + 211 + 41 + + + label_4 graphicsView label_2 @@ -214,8 +211,8 @@ textBrowser_3 Button_login textEdit_acc - textEdit_pass label + lineEdit_pwd diff --git a/softwareDirectory/AutoVerScheme/res/qss/login.css b/softwareDirectory/AutoVerScheme/res/qss/login.css index f9aea6c..73b177e 100644 --- a/softwareDirectory/AutoVerScheme/res/qss/login.css +++ b/softwareDirectory/AutoVerScheme/res/qss/login.css @@ -61,7 +61,7 @@ font-size: 12pt; vertical-align: middle; } -QTextEdit#textEdit_pass +QLineEdit#lineEdit_pwd { border-bottom: 1px solid black; font-size: 12pt; diff --git a/softwareDirectory/AutoVerScheme/syncupload.cpp b/softwareDirectory/AutoVerScheme/syncupload.cpp index cbe5f08..a664086 100644 --- a/softwareDirectory/AutoVerScheme/syncupload.cpp +++ b/softwareDirectory/AutoVerScheme/syncupload.cpp @@ -21,6 +21,7 @@ if (runSql.exec(IdToSqlMap.value(ssql))) { QSqlQuery localQuery(local); localQuery.exec("UPDATE zd_data_sync SET sync_type = 1 WHERE id= " + ssql); + qDebug() << "执行 SQL 成功"; emit taskCompleted(2,tableName, "cg表："+tableName); qDebug() << "当前线程:" << QThread::currentThreadId();