diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："< BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/datasyncview.cpp b/softwareDirectory/AutoVerScheme/datasyncview.cpp index 06c7f9a..9edaa24 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.cpp +++ b/softwareDirectory/AutoVerScheme/datasyncview.cpp @@ -111,10 +111,16 @@ row++; } } +void DataSyncView::on_UploadDataButton_clicked() +{ + SyncDialog *syncDialog = new SyncDialog(this,"1"); + syncDialog->exec(); + this->initForm(); +} void DataSyncView::on_DownloadDataButton_clicked() { - SyncDialog *syncDialog = new SyncDialog(this); + SyncDialog *syncDialog = new SyncDialog(this,"0"); syncDialog->exec(); // 显示进度条窗体并阻塞主窗口 this->initForm(); @@ -157,3 +163,5 @@ { ui->stackedWidget->setCurrentIndex(0); } + + diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/datasyncview.cpp b/softwareDirectory/AutoVerScheme/datasyncview.cpp index 06c7f9a..9edaa24 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.cpp +++ b/softwareDirectory/AutoVerScheme/datasyncview.cpp @@ -111,10 +111,16 @@ row++; } } +void DataSyncView::on_UploadDataButton_clicked() +{ + SyncDialog *syncDialog = new SyncDialog(this,"1"); + syncDialog->exec(); + this->initForm(); +} void DataSyncView::on_DownloadDataButton_clicked() { - SyncDialog *syncDialog = new SyncDialog(this); + SyncDialog *syncDialog = new SyncDialog(this,"0"); syncDialog->exec(); // 显示进度条窗体并阻塞主窗口 this->initForm(); @@ -157,3 +163,5 @@ { ui->stackedWidget->setCurrentIndex(0); } + + diff --git a/softwareDirectory/AutoVerScheme/datasyncview.h b/softwareDirectory/AutoVerScheme/datasyncview.h index b2b9847..ae241cc 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.h +++ b/softwareDirectory/AutoVerScheme/datasyncview.h @@ -31,6 +31,8 @@ void OnButtonSelectClicked(zdLog log); void on_button_return_clicked(); + void on_UploadDataButton_clicked(); + public: diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/datasyncview.cpp b/softwareDirectory/AutoVerScheme/datasyncview.cpp index 06c7f9a..9edaa24 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.cpp +++ b/softwareDirectory/AutoVerScheme/datasyncview.cpp @@ -111,10 +111,16 @@ row++; } } +void DataSyncView::on_UploadDataButton_clicked() +{ + SyncDialog *syncDialog = new SyncDialog(this,"1"); + syncDialog->exec(); + this->initForm(); +} void DataSyncView::on_DownloadDataButton_clicked() { - SyncDialog *syncDialog = new SyncDialog(this); + SyncDialog *syncDialog = new SyncDialog(this,"0"); syncDialog->exec(); // 显示进度条窗体并阻塞主窗口 this->initForm(); @@ -157,3 +163,5 @@ { ui->stackedWidget->setCurrentIndex(0); } + + diff --git a/softwareDirectory/AutoVerScheme/datasyncview.h b/softwareDirectory/AutoVerScheme/datasyncview.h index b2b9847..ae241cc 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.h +++ b/softwareDirectory/AutoVerScheme/datasyncview.h @@ -31,6 +31,8 @@ void OnButtonSelectClicked(zdLog log); void on_button_return_clicked(); + void on_UploadDataButton_clicked(); + public: diff --git a/softwareDirectory/AutoVerScheme/datasyncview.ui b/softwareDirectory/AutoVerScheme/datasyncview.ui index 7c9df8e..398b183 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.ui +++ b/softwareDirectory/AutoVerScheme/datasyncview.ui @@ -123,6 +123,19 @@ + + + background-color:#334582; + font: bold 18px Arial, sans-serif; +color:white; +padding:10px; + + + 上传数据 + + + + background-color:#334582; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/datasyncview.cpp b/softwareDirectory/AutoVerScheme/datasyncview.cpp index 06c7f9a..9edaa24 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.cpp +++ b/softwareDirectory/AutoVerScheme/datasyncview.cpp @@ -111,10 +111,16 @@ row++; } } +void DataSyncView::on_UploadDataButton_clicked() +{ + SyncDialog *syncDialog = new SyncDialog(this,"1"); + syncDialog->exec(); + this->initForm(); +} void DataSyncView::on_DownloadDataButton_clicked() { - SyncDialog *syncDialog = new SyncDialog(this); + SyncDialog *syncDialog = new SyncDialog(this,"0"); syncDialog->exec(); // 显示进度条窗体并阻塞主窗口 this->initForm(); @@ -157,3 +163,5 @@ { ui->stackedWidget->setCurrentIndex(0); } + + diff --git a/softwareDirectory/AutoVerScheme/datasyncview.h b/softwareDirectory/AutoVerScheme/datasyncview.h index b2b9847..ae241cc 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.h +++ b/softwareDirectory/AutoVerScheme/datasyncview.h @@ -31,6 +31,8 @@ void OnButtonSelectClicked(zdLog log); void on_button_return_clicked(); + void on_UploadDataButton_clicked(); + public: diff --git a/softwareDirectory/AutoVerScheme/datasyncview.ui b/softwareDirectory/AutoVerScheme/datasyncview.ui index 7c9df8e..398b183 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.ui +++ b/softwareDirectory/AutoVerScheme/datasyncview.ui @@ -123,6 +123,19 @@ + + + background-color:#334582; + font: bold 18px Arial, sans-serif; +color:white; +padding:10px; + + + 上传数据 + + + + background-color:#334582; diff --git a/softwareDirectory/AutoVerScheme/syncdialog.cpp b/softwareDirectory/AutoVerScheme/syncdialog.cpp index 11570fb..997f973 100644 --- a/softwareDirectory/AutoVerScheme/syncdialog.cpp +++ b/softwareDirectory/AutoVerScheme/syncdialog.cpp @@ -1,14 +1,16 @@ #include "syncdialog.h" #include "ui_syncdialog.h" - +#include "syncupload.h" +#include int SyncDialog::m_totalTasks; int SyncDialog::stepcount; int SyncDialog::filecount; -SyncDialog::SyncDialog(QWidget *parent) : +SyncDialog::SyncDialog(QWidget *parent,QString type) : QDialog(parent), + synctype(type), ui(new Ui::SyncDialog) { ui->setupUi(this); @@ -24,10 +26,70 @@ void SyncDialog::on_button_Start_clicked() { + if(synctype == "1"){ + upLoadData(); + }else { + //qint64 id = dbmang.generateId(); + //zdlogId=QString::number(id); + zdDataSyncList.clear(); + querydstList.clear(); + //从主系统下载 + //连接两个数据库 + bool IsOpen=false; + bool IsOpenMain=false; + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //DatabaseConnectionMainSys *MainConn=DatabaseConnectionMainSys::getInstance(); + if(!Conn->isopen()){IsOpen=Conn->open();}else{IsOpen=true;}; + if(!Conn->isopenmain()){IsOpenMain=Conn->openmain();}else{IsOpenMain=true;}; + + // 记录任务数量 + + m_totalTasks=0; + stepcount=0; + filecount=0; + // 获取第一个数据库的所有表名 + dstDb=Conn->getDatabase(); + srcDb=Conn->getDatabaseMain(); + QSqlQuery querydst(dstDb); + querydst.exec("SHOW TABLES"); + QSqlQuery query(srcDb); + query.exec("SHOW TABLES"); + + while(querydst.next()){ + QString tableName = querydst.value(0).toString(); + if(tableName.contains("act_") ||tableName.contains("flw_ru_")){continue;}; + querydstList.append(tableName);}; + // 创建一个线程池 + threadPool= QThreadPool::globalInstance(); + threadPool->setMaxThreadCount(5); // 设置线程池中的最大线程数 + // 遍历表名，为每个表创建一个任务并提交到线程池 + BaseCommonApi::SaveLogInfo(0,"开始下载同步"); + + while (query.next()) { + QString tableName = query.value(0).toString(); + if(!querydstList.contains(tableName)){continue;}; + if(tableName.contains("ACT_") + ||tableName.contains("FLW_RU_") + ||tableName.contains("zd")) + {continue;}; + SyncTask *task = new SyncTask(srcDb, dstDb, tableName); + connectTaskSignals(task); + // 提交任务到线程池 + threadPool->start(task); + ++m_totalTasks; + // + + } + //总数量 + ui->lab_sum->setText(QString::number(m_totalTasks)); + progressDecrement=static_cast(100) / m_totalTasks; +} - //qint64 id = dbmang.generateId(); - //zdlogId=QString::number(id); +} +void SyncDialog::upLoadData() +{ zdDataSyncList.clear(); querydstList.clear(); //从主系统下载 @@ -41,48 +103,58 @@ if(!Conn->isopenmain()){IsOpenMain=Conn->openmain();}else{IsOpenMain=true;}; // 记录任务数量 - m_totalTasks=0; stepcount=0; filecount=0; - // 获取第一个数据库的所有表名 + dstDb=Conn->getDatabase(); srcDb=Conn->getDatabaseMain(); - QSqlQuery querydst(dstDb); - querydst.exec("SHOW TABLES"); - QSqlQuery query(srcDb); - query.exec("SHOW TABLES"); +// QList sqlList; + QMap idToSqlMap; + qDebug() << "开始" << QThread::currentThreadId(); + QSqlQuery selectSql(dstDb); + bool isSuccess = selectSql.exec("SELECT * FROM zd_data_sync WHERE sync_type = '0' "); + if (!isSuccess) + return; + while (selectSql.next()) { + QString id = selectSql.value("id").toString(); + QString ssql = selectSql.value("ssql").toString(); +// sqlList.append(ssql); + idToSqlMap.insert(id,ssql); + } +// syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",sqlList); - while(querydst.next()){ - QString tableName = querydst.value(0).toString(); - if(tableName.contains("act_") ||tableName.contains("flw_ru_")){continue;}; - querydstList.append(tableName);}; - // 创建一个线程池 - threadPool= QThreadPool::globalInstance(); - threadPool->setMaxThreadCount(5); // 设置线程池中的最大线程数 - // 遍历表名，为每个表创建一个任务并提交到线程池 - BaseCommonApi::SaveLogInfo(0,"开始下载同步"); +// for(const QString& ssql : sqlList){ +// syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",ssql); +// threadPool= QThreadPool::globalInstance(); +// threadPool->setMaxThreadCount(QThread::idealThreadCount()); +// connectTaskSignalsByUp(syncload); +// threadPool->start(syncload); +// ++m_totalTasks; +// } - while (query.next()) { - QString tableName = query.value(0).toString(); - if(!querydstList.contains(tableName)){continue;}; - if(tableName.contains("ACT_") - ||tableName.contains("FLW_RU_") - ||tableName.contains("zd")) - {continue;}; - SyncTask *task = new SyncTask(srcDb, dstDb, tableName); - connectTaskSignals(task); - // 提交任务到线程池 - threadPool->start(task); - ++m_totalTasks; - // + for(const QString& id : idToSqlMap.keys()){ + syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",id,idToSqlMap); + threadPool= QThreadPool::globalInstance(); + threadPool->setMaxThreadCount(QThread::idealThreadCount()); + connectTaskSignalsByUp(syncload); + threadPool->start(syncload); + ++m_totalTasks; + } - } + //总数量 ui->lab_sum->setText(QString::number(m_totalTasks)); progressDecrement=static_cast(100) / m_totalTasks; - } + +void SyncDialog::connectTaskSignalsByUp(syncupload *upload){ + connect(upload, &syncupload::taskCompleted, this, &SyncDialog::onTaskCompleted); + connect(upload, &syncupload::TextState, this, &SyncDialog::onTextState); + connect(this,&SyncDialog::StopRequested,upload,&syncupload::UpdateState); +} + + void SyncDialog::connectTaskSignals(SyncTask *task) { connect(task, &SyncTask::taskCompleted, this, &SyncDialog::onTaskCompleted); connect(task, &SyncTask::TextState, this, &SyncDialog::onTextState); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/datasyncview.cpp b/softwareDirectory/AutoVerScheme/datasyncview.cpp index 06c7f9a..9edaa24 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.cpp +++ b/softwareDirectory/AutoVerScheme/datasyncview.cpp @@ -111,10 +111,16 @@ row++; } } +void DataSyncView::on_UploadDataButton_clicked() +{ + SyncDialog *syncDialog = new SyncDialog(this,"1"); + syncDialog->exec(); + this->initForm(); +} void DataSyncView::on_DownloadDataButton_clicked() { - SyncDialog *syncDialog = new SyncDialog(this); + SyncDialog *syncDialog = new SyncDialog(this,"0"); syncDialog->exec(); // 显示进度条窗体并阻塞主窗口 this->initForm(); @@ -157,3 +163,5 @@ { ui->stackedWidget->setCurrentIndex(0); } + + diff --git a/softwareDirectory/AutoVerScheme/datasyncview.h b/softwareDirectory/AutoVerScheme/datasyncview.h index b2b9847..ae241cc 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.h +++ b/softwareDirectory/AutoVerScheme/datasyncview.h @@ -31,6 +31,8 @@ void OnButtonSelectClicked(zdLog log); void on_button_return_clicked(); + void on_UploadDataButton_clicked(); + public: diff --git a/softwareDirectory/AutoVerScheme/datasyncview.ui b/softwareDirectory/AutoVerScheme/datasyncview.ui index 7c9df8e..398b183 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.ui +++ b/softwareDirectory/AutoVerScheme/datasyncview.ui @@ -123,6 +123,19 @@ + + + background-color:#334582; + font: bold 18px Arial, sans-serif; +color:white; +padding:10px; + + + 上传数据 + + + + background-color:#334582; diff --git a/softwareDirectory/AutoVerScheme/syncdialog.cpp b/softwareDirectory/AutoVerScheme/syncdialog.cpp index 11570fb..997f973 100644 --- a/softwareDirectory/AutoVerScheme/syncdialog.cpp +++ b/softwareDirectory/AutoVerScheme/syncdialog.cpp @@ -1,14 +1,16 @@ #include "syncdialog.h" #include "ui_syncdialog.h" - +#include "syncupload.h" +#include int SyncDialog::m_totalTasks; int SyncDialog::stepcount; int SyncDialog::filecount; -SyncDialog::SyncDialog(QWidget *parent) : +SyncDialog::SyncDialog(QWidget *parent,QString type) : QDialog(parent), + synctype(type), ui(new Ui::SyncDialog) { ui->setupUi(this); @@ -24,10 +26,70 @@ void SyncDialog::on_button_Start_clicked() { + if(synctype == "1"){ + upLoadData(); + }else { + //qint64 id = dbmang.generateId(); + //zdlogId=QString::number(id); + zdDataSyncList.clear(); + querydstList.clear(); + //从主系统下载 + //连接两个数据库 + bool IsOpen=false; + bool IsOpenMain=false; + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //DatabaseConnectionMainSys *MainConn=DatabaseConnectionMainSys::getInstance(); + if(!Conn->isopen()){IsOpen=Conn->open();}else{IsOpen=true;}; + if(!Conn->isopenmain()){IsOpenMain=Conn->openmain();}else{IsOpenMain=true;}; + + // 记录任务数量 + + m_totalTasks=0; + stepcount=0; + filecount=0; + // 获取第一个数据库的所有表名 + dstDb=Conn->getDatabase(); + srcDb=Conn->getDatabaseMain(); + QSqlQuery querydst(dstDb); + querydst.exec("SHOW TABLES"); + QSqlQuery query(srcDb); + query.exec("SHOW TABLES"); + + while(querydst.next()){ + QString tableName = querydst.value(0).toString(); + if(tableName.contains("act_") ||tableName.contains("flw_ru_")){continue;}; + querydstList.append(tableName);}; + // 创建一个线程池 + threadPool= QThreadPool::globalInstance(); + threadPool->setMaxThreadCount(5); // 设置线程池中的最大线程数 + // 遍历表名，为每个表创建一个任务并提交到线程池 + BaseCommonApi::SaveLogInfo(0,"开始下载同步"); + + while (query.next()) { + QString tableName = query.value(0).toString(); + if(!querydstList.contains(tableName)){continue;}; + if(tableName.contains("ACT_") + ||tableName.contains("FLW_RU_") + ||tableName.contains("zd")) + {continue;}; + SyncTask *task = new SyncTask(srcDb, dstDb, tableName); + connectTaskSignals(task); + // 提交任务到线程池 + threadPool->start(task); + ++m_totalTasks; + // + + } + //总数量 + ui->lab_sum->setText(QString::number(m_totalTasks)); + progressDecrement=static_cast(100) / m_totalTasks; +} - //qint64 id = dbmang.generateId(); - //zdlogId=QString::number(id); +} +void SyncDialog::upLoadData() +{ zdDataSyncList.clear(); querydstList.clear(); //从主系统下载 @@ -41,48 +103,58 @@ if(!Conn->isopenmain()){IsOpenMain=Conn->openmain();}else{IsOpenMain=true;}; // 记录任务数量 - m_totalTasks=0; stepcount=0; filecount=0; - // 获取第一个数据库的所有表名 + dstDb=Conn->getDatabase(); srcDb=Conn->getDatabaseMain(); - QSqlQuery querydst(dstDb); - querydst.exec("SHOW TABLES"); - QSqlQuery query(srcDb); - query.exec("SHOW TABLES"); +// QList sqlList; + QMap idToSqlMap; + qDebug() << "开始" << QThread::currentThreadId(); + QSqlQuery selectSql(dstDb); + bool isSuccess = selectSql.exec("SELECT * FROM zd_data_sync WHERE sync_type = '0' "); + if (!isSuccess) + return; + while (selectSql.next()) { + QString id = selectSql.value("id").toString(); + QString ssql = selectSql.value("ssql").toString(); +// sqlList.append(ssql); + idToSqlMap.insert(id,ssql); + } +// syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",sqlList); - while(querydst.next()){ - QString tableName = querydst.value(0).toString(); - if(tableName.contains("act_") ||tableName.contains("flw_ru_")){continue;}; - querydstList.append(tableName);}; - // 创建一个线程池 - threadPool= QThreadPool::globalInstance(); - threadPool->setMaxThreadCount(5); // 设置线程池中的最大线程数 - // 遍历表名，为每个表创建一个任务并提交到线程池 - BaseCommonApi::SaveLogInfo(0,"开始下载同步"); +// for(const QString& ssql : sqlList){ +// syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",ssql); +// threadPool= QThreadPool::globalInstance(); +// threadPool->setMaxThreadCount(QThread::idealThreadCount()); +// connectTaskSignalsByUp(syncload); +// threadPool->start(syncload); +// ++m_totalTasks; +// } - while (query.next()) { - QString tableName = query.value(0).toString(); - if(!querydstList.contains(tableName)){continue;}; - if(tableName.contains("ACT_") - ||tableName.contains("FLW_RU_") - ||tableName.contains("zd")) - {continue;}; - SyncTask *task = new SyncTask(srcDb, dstDb, tableName); - connectTaskSignals(task); - // 提交任务到线程池 - threadPool->start(task); - ++m_totalTasks; - // + for(const QString& id : idToSqlMap.keys()){ + syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",id,idToSqlMap); + threadPool= QThreadPool::globalInstance(); + threadPool->setMaxThreadCount(QThread::idealThreadCount()); + connectTaskSignalsByUp(syncload); + threadPool->start(syncload); + ++m_totalTasks; + } - } + //总数量 ui->lab_sum->setText(QString::number(m_totalTasks)); progressDecrement=static_cast(100) / m_totalTasks; - } + +void SyncDialog::connectTaskSignalsByUp(syncupload *upload){ + connect(upload, &syncupload::taskCompleted, this, &SyncDialog::onTaskCompleted); + connect(upload, &syncupload::TextState, this, &SyncDialog::onTextState); + connect(this,&SyncDialog::StopRequested,upload,&syncupload::UpdateState); +} + + void SyncDialog::connectTaskSignals(SyncTask *task) { connect(task, &SyncTask::taskCompleted, this, &SyncDialog::onTaskCompleted); connect(task, &SyncTask::TextState, this, &SyncDialog::onTextState); diff --git a/softwareDirectory/AutoVerScheme/syncdialog.h b/softwareDirectory/AutoVerScheme/syncdialog.h index dc82e04..be3730a 100644 --- a/softwareDirectory/AutoVerScheme/syncdialog.h +++ b/softwareDirectory/AutoVerScheme/syncdialog.h @@ -11,6 +11,7 @@ #include #include #include "synctask.h" +#include "syncupload.h" namespace Ui { class SyncDialog; @@ -21,7 +22,7 @@ Q_OBJECT public: - explicit SyncDialog(QWidget *parent = nullptr); + explicit SyncDialog(QWidget *parent = nullptr,QString type=NULL); ~SyncDialog(); private slots: @@ -29,11 +30,13 @@ void connectTaskSignals(SyncTask *task); + void connectTaskSignalsByUp(syncupload *upload); void onTaskCompleted(int success,QString tableName, const QString& errorMessage); void onTextState(); void on_button_Close_clicked(); void StopSync(); void on_button_step_clicked(); + void upLoadData(); public: static int m_totalTasks; @@ -50,6 +53,7 @@ BaseCommonApi dbmang; QList zdDataSyncList; QList querydstList; + QString synctype; signals: void StopRequested(int state); // 定义暂停 停止请求信号 private: diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index fed13f8..d21464f 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -394,18 +394,18 @@ bool BaseCommonApi::InsertTaskBasic(InsertTask insertTask) { //1640229293790650370 - insertTask.Create_user_id=temporary_user_id; + insertTask.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_info (id," "order_no, customer_name, require_over_time, deliverer, deliverer_tel," - "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,Create_user_id" + "undertaker_name, undertake_time, is_urgent, receive_illustrate, customer_id,create_user_id" " ) VALUES (:id, " " :order_no, :customer_name, :require_over_time, " " :deliverer, :deliverer_tel, :undertaker_name, :undertake_time, " " :is_urgent, " " :receive_illustrate," " :customer_id," - " :Create_user_id" + " :create_user_id" " );"); query.bindValue(":id", insertTask.id); @@ -419,7 +419,7 @@ query.bindValue(":is_urgent", insertTask.is_urgent); query.bindValue(":receive_illustrate", insertTask.receive_illustrate); query.bindValue(":customer_id", insertTask.customer_id); - query.bindValue(":Create_user_id", insertTask.Create_user_id); + query.bindValue(":Create_user_id", insertTask.create_user_id); bool isSuccess = query.exec(); if (!isSuccess) { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); @@ -433,24 +433,31 @@ orderSample.create_user_id=temporary_user_id; QSqlQuery query; query.prepare("INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," - "sample_name, sample_model,measure_complete_time)" + "sample_name, sample_model,measure_complete_time,create_time,update_time)" "VALUES (:id,:order_id,:sample_id," - ":sample_name, :sample_model,:measure_complete_time);"); + ":sample_name, :sample_model,:measure_complete_time,:create_time,:update_time);"); - // Bind values to the parameters + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", orderSample.id); query.bindValue(":order_id", orderSample.order_id); query.bindValue(":sample_id", orderSample.sample_id); query.bindValue(":sample_name", orderSample.sample_name); query.bindValue(":sample_model", orderSample.sample_model); query.bindValue(":measure_complete_time", orderSample.measure_complete_time); - + query.bindValue(":create_time", currentDateTime); + query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_order_sample_relation (id,order_id,sample_id," + "sample_name, sample_model,measure_complete_time,create_time,update_time)" + "VALUES (:1,:2,:3," + ":4, :5,:6,:7,:8);"; + saveLogToSql(ssql,&orderSample); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -464,8 +471,8 @@ "measure_person_id,create_user,measure_status,is_auto" ")VALUES" "(:id,:order_id,:sample_id,:measure_dept_id,:measure_person_id," - ":create_user_id,:measure_status,:is_auto)"); - + ":create_user_id,:measure_status,:is_auto,:create_time,:update_time)"); + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); // Bind values to the parameters query.bindValue(":id", eneity.id); query.bindValue(":order_id", eneity.order_id); @@ -475,11 +482,20 @@ query.bindValue(":create_user_id", eneity.create_user_id); query.bindValue(":measure_status","3"); query.bindValue(":is_auto","0"); + query.bindValue(":create_time",currentDateTime); + query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << " query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "INSERT biz_business_lab_executive_info(id,order_id,sample_id,measure_dept_id," + "measure_person_id,create_user,measure_status,is_auto,create_time,update_time" + ")VALUES" + "(:1,:2,:3,:4,:5," + ":6,:7,:8,:9,:10)"; + saveLogToSql(ssql,&eneity); + }else { +qDebug() << " query failed: " << query.lastError().text(); +} return isSuccess; } @@ -507,9 +523,18 @@ query.bindValue(":id", updateTask.id); bool isSuccess = query.exec(); - if (!isSuccess) { - qDebug() << "query failed: " << query.lastError().text(); - } + if (isSuccess) { + QString ssql = "UPDATE biz_business_order_info" + " SET order_no = :1,customer_name = :2," + " require_over_time = :3,deliverer = :4," + " deliverer_tel = :5,undertaker_name = :6," + " undertake_time = :7, is_urgent = :8," + " receive_illustrate = :9, customer_id = :10 " + " WHERE id = :11;"; + saveLogToSql(ssql,&updateTask); + }else { +qDebug() << "query failed: " << query.lastError().text(); +} return isSuccess; } @@ -555,10 +580,20 @@ auto deleteRecord = [&](const QString& tableName) { query.prepare("DELETE FROM " + tableName + " WHERE order_id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM "+ tableName + "WHERE order_id =" + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除" << tableName << "表中的记录失败: " << query.lastError().text(); allSuccessful = false; - } +} }; deleteRecord("biz_business_order_info"); deleteRecord("biz_business_order_sample_relation"); @@ -575,10 +610,20 @@ query.prepare("DELETE FROM biz_business_lab_executive_info WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_lab_executive_info WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -591,10 +636,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE order_id = :id"); query.bindValue(":id", order_id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE order_id =" + order_id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -607,10 +662,20 @@ query.prepare("DELETE FROM biz_business_order_sample_relation WHERE id = :id"); query.bindValue(":id", id); - if (!query.exec()) { + if (query.exec()) { + zdDataSync sync; + QString ssql_result = "DELETE FROM biz_business_order_sample_relation WHERE id = " + id; + sync.ssql = ssql_result; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + if(!isSuccess){ + qDebug()<<"save log fail"; + } + }else { qDebug() << "删除失败 " << query.lastError().text(); return false; - } +} return true; } @@ -1866,7 +1931,7 @@ bool isSuccess = query.exec(); qDebug() << "执行的sql：" < BaseCommonApi::getInstructionLib(QString verification_program_id) +QList BaseCommonApi::getInstructionLib(QString program_id) { QList result; - QSqlQuery query; - query.prepare("SELECT * FROM zd_instruction_library WHERE verification_program_id = :verification_program_id "); - query.bindValue(":verification_program_id", verification_program_id); - if (query.exec()) { + QSqlQuery query; + QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 "; + QString ssql = sql.arg(program_id); + if (query.exec(ssql)) { while (query.next()) { InstructionLib instruction; instruction.id = query.value("id").toString(); @@ -1922,9 +1987,9 @@ instruction.type = query.value("type").toString(); instruction.belong_vername = query.value("belong_vername").toString(); instruction.belong_checkname = query.value("belong_checkname").toString(); - instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.create_time = query.value("create_time").toDateTime(); instruction.update_time = query.value("update_time").toDateTime(); +// instruction.verification_program_id = query.value("verification_program_id").toString(); instruction.param = query.value("param").toString(); result.append(instruction); } @@ -2082,9 +2147,9 @@ { QSqlQuery query; query.prepare("INSERT INTO zd_instruction_library (id,device_id,device_name,instruct_config,instruct_read," - "type,belong_vername,belong_checkname,create_time,update_time,verification_program_id,param) " + "type,belong_vername,belong_checkname,create_time,update_time,program_id,param) " " VALUES (:id,:device_id,:device_name,:instruct_config,:instruct_read,:type,:belong_vername," - ":belong_checkname,:create_time,:update_time,:verification_program_id,:param)"); + ":belong_checkname,:create_time,:update_time,:program_id,:param)"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); query.bindValue(":id", instructionLib.id); query.bindValue(":device_id", instructionLib.device_id); @@ -2096,7 +2161,7 @@ query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); bool isSuccess = query.exec(); // qDebug() << "InsertTaskBasic query failed: " << query.lastQuery(); @@ -2136,12 +2201,12 @@ query.bindValue(":belong_vername", instructionLib.belong_vername); query.bindValue(":belong_checkname", instructionLib.belong_checkname); query.bindValue(":update_time", currentDateTime); - query.bindValue(":verification_program_id", instructionLib.verification_program_id); + query.bindValue(":program_id", instructionLib.program_id); query.bindValue(":param", instructionLib.param); query.bindValue(":id", instructionLib.id); bool isSuccess = query.exec(); if (!isSuccess) { - qDebug() << "InsertOrderSampleRelation query failed: " << query.lastError().text(); + qDebug() << "Insert query failed: " << query.lastError().text(); } return isSuccess; }; @@ -2159,7 +2224,7 @@ { return TaskManager::AddCurrenTaskCount(); }; -////自动检定-根据被检设备 查询检定项分类 +//自动检定-根据被检设备 查询检定项分类 QList BaseCommonApi::getDeviceMeasureEquipmentCatory(QString deviceId) { QList result; @@ -2273,7 +2338,7 @@ " :other_outcome, :remark, :other_remark, :create_user_id, :measure_person_id, " " :create_user_name, :create_time, :update_time);"); QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); - query.bindValue(":id", saveInfo.id); //id 自动生成 +// query.bindValue(":id", saveInfo.id); //id 自动生成 query.bindValue(":id", saveInfo.id); query.bindValue(":data_no", saveInfo.data_no); query.bindValue(":measure_category", saveInfo.measure_category); @@ -2332,6 +2397,33 @@ qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); }else{ TaskManager::AddResultDataNoCount(); + QString ssql = "INSERT INTO biz_business_device_measure_info ( " + " id, data_no, measure_category, order_id, sample_id, sample_name, model, " + " manufacture_no, manufacturer, item_id, trace_date, measure_valid_date, " + " measure_address, temperature, humidity, data_source, ipri, ipri_unit, " + " isec, isec_unit, vpri, vpri_unit, vsec, vsec_unit, appearance_function_check, " + " appearance, appearance_remark, pointer_deflection_stability, " + " pointer_deflection_stability_remark, tightness, tightness_remark," + " insulation_resistance, insulation_resistance_remark, measure_medium," + " division, zero_drift_result, work_line_equation, sealing_test, " + " insulation_resistance_value, angle_adjust_error, actual_division_value," + " actual_division_value_unit, conclusion, restriction_instruction, outcome," + " other_outcome, remark, other_remark, create_user_id, measure_person_id," + " create_user_name, create_time, update_time " + " ) VALUES ( " + " :1, :2, :3, :4, :5, :6, :7, " + " :8, :9, :10, :11, :12, " + " :13, :14, :15, :16, :17, :18, " + " :19, :20, :21, :22, :23, :24, :25, " + " :26, :27, :28, " + " :29, :30, :31, " + " :32, :33, :34, " + " :35, :36, :37, :38, " + " :39, :40, :41, " + " :42, :43, :44, :45, " + " :46, :47, :48, :49, :50, " + " :51, :52, :53);"; + saveLogToSql(ssql,&saveInfo); } return isSuccess; @@ -2352,12 +2444,497 @@ query.bindValue(":create_time", currentDateTime); query.bindValue(":update_time", currentDateTime); bool isSuccess = query.exec(); - if (!isSuccess) { + if (isSuccess) { + QString ssql = "INSERT INTO biz_business_device_measure_equipment " + " (id,data_id,equipment_id,create_time,update_time) " + " VALUES " + " (:1,:2,:3,:4,:5)"; + saveLogToSql(ssql,&deviceMeasure); + }else { qDebug() << "InsertTaskBasic query failed: " << query.lastError().text(); - } +} return isSuccess; }; +bool BaseCommonApi::saveLogToSql(QString ssql,BaseClass* entity) +{ zdDataSync sync; + QString resultsql; + QString currentDateTime = QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm:ss"); + if(!ssql.isEmpty()){ + ssql = ssql.replace(":","%"); + } + InsertTask* orderInfo = dynamic_cast(entity); + OrderSampleRelation* orderSampleRelation = dynamic_cast(entity); + biz_business_lab_executive_info* labExecutiveInfo = dynamic_cast(entity); + SaveDeviceMeasureInfo* deviceMeasureInfo = dynamic_cast(entity); + DeviceMeasureEquipment* deviceMeasureEquipment = dynamic_cast(entity); + SaveDeviceMeasureCalibrator* deviceMeasureCalibrator = dynamic_cast(entity); + //计量检定业务-受检设备检定管理-检定数据管理检定数据历史修改记录[新增] + MeasureModifyRecord* deviceModifyRecord = dynamic_cast(entity); + //【结果保存】压力 + DeviceMeasureDataPistonGauge* devicePistonGaugeData = dynamic_cast(entity); + //【结果保存】直流稳压电源 + bizBusinessDeviceMeasureDataDcPower* deviceDCPowerData = dynamic_cast(entity); + //【结果保存】示波器 + DeviceOscilloscopeCalibration* deviceOscilloscopeData = dynamic_cast(entity); + //【结果保存】二等铂电阻 + DeviceMeasureDataResistanceThermometer* deviceResistanceThermometerData = dynamic_cast(entity); + //【结果保存】频谱分析仪 + DeviceMeasureDataSpectrumAnalyzer* deviceSpectrumAnalyzerData = dynamic_cast(entity); + //【结果保存】信号发生器 + DeviceMeasureDataSignalGenerator* deviceSignalGeneratorData = dynamic_cast(entity); + if(orderInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + orderInfo->order_no + "'") + .arg("'" + orderInfo->customer_name + "'") + .arg("'" + orderInfo->require_over_time + "'") + .arg("'" + orderInfo->deliverer + "'") + .arg("'" + orderInfo->deliverer_tel + "'") + .arg("'" + orderInfo->undertaker_name + "'") + .arg("'" + orderInfo->undertake_time + "'") + .arg("'" + QString::number(orderInfo->is_urgent) + "'") + .arg("'" + orderInfo->receive_illustrate + "'") + .arg("'" + orderInfo->customer_id + "'") + .arg("'" + orderInfo->id + "'"); + } + if(orderSampleRelation !=nullptr){ + resultsql = QString(ssql).arg("'" + orderSampleRelation->id + "'") + .arg("'" + orderSampleRelation->order_id + "'") + .arg("'" + orderSampleRelation->sample_id + "'") + .arg("'" + orderSampleRelation->sample_name + "'") + .arg("'" + orderSampleRelation->sample_model + "'") + .arg("'" + orderSampleRelation->measure_complete_time.toString() + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(labExecutiveInfo !=nullptr){ + resultsql = QString(ssql).arg("'" + labExecutiveInfo->id + "'") + .arg("'" + labExecutiveInfo->order_id + "'") + .arg("'" + labExecutiveInfo->sample_id + "'") + .arg("'" + labExecutiveInfo->measure_dept_id + "'") + .arg("'" + labExecutiveInfo->measure_person_id + "'") + .arg("'" + labExecutiveInfo->create_user_id + "'") + .arg("'" + labExecutiveInfo->measure_status + "'") + .arg("'" + labExecutiveInfo->is_auto + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if (deviceMeasureInfo !=nullptr) { + resultsql = QString(ssql).arg("'" + deviceMeasureInfo->id + "'") + .arg("'" + deviceMeasureInfo->data_no + "'") + .arg("'" + deviceMeasureInfo->measure_category + "'") + .arg("'" + deviceMeasureInfo->order_id + "'") + .arg("'" + deviceMeasureInfo->sample_id + "'") + .arg("'" + deviceMeasureInfo->sample_name + "'") + .arg("'" + deviceMeasureInfo->model + "'") + .arg("'" + deviceMeasureInfo->manufacture_no + "'") + .arg("'" + deviceMeasureInfo->manufacturer + "'") + .arg("'" + deviceMeasureInfo->item_id + "'") + .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'") + .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'") + .arg("'" + deviceMeasureInfo->measure_address + "'") + .arg("'" +deviceMeasureInfo->temperature+ "'") + .arg("'" +deviceMeasureInfo->humidity+ "'") + .arg("'" + deviceMeasureInfo->data_source + "'") + .arg("'" +deviceMeasureInfo->ipri+ "'") + .arg("'" + deviceMeasureInfo->ipri_unit + "'") + .arg("'" +deviceMeasureInfo->isec+ "'") + .arg("'" + deviceMeasureInfo->isec_unit + "'") + .arg("'" +deviceMeasureInfo->vpri+ "'") + .arg("'" + deviceMeasureInfo->vpri_unit + "'") + .arg("'" +deviceMeasureInfo->vsec+ "'") + .arg("'" + deviceMeasureInfo->vsec_unit + "'") + .arg("'" +deviceMeasureInfo->appearance_function_check+ "'") + .arg("'" + deviceMeasureInfo->appearance + "'") + .arg("'" + deviceMeasureInfo->appearance_remark + "'") + .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'") + .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'") + .arg("'" +deviceMeasureInfo->tightness+ "'") + .arg("'" + deviceMeasureInfo->tightness_remark + "'") + .arg("'" +deviceMeasureInfo->insulation_resistance+ "'") + .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'") + .arg("'" +deviceMeasureInfo->measure_medium+ "'") + .arg("'" +deviceMeasureInfo->division+ "'") + .arg("'" +deviceMeasureInfo->zero_drift_result+ "'") + .arg("'" +deviceMeasureInfo->work_line_equation+ "'") + .arg("'" +deviceMeasureInfo->sealing_test+ "'") + .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'") + .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'") + .arg("'" +deviceMeasureInfo->actual_division_value+ "'") + .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'") + .arg("'" +deviceMeasureInfo->conclusion+ "'") + .arg("'" +deviceMeasureInfo->restriction_instruction+ "'") + .arg("'" +deviceMeasureInfo->outcome+ "'") + .arg("'" + deviceMeasureInfo->other_outcome + "'") + .arg("'" + deviceMeasureInfo->remark + "'") + .arg("'" + deviceMeasureInfo->other_remark + "'") + .arg("'" +deviceMeasureInfo->create_user_id+ "'") + .arg("'" +deviceMeasureInfo->measure_person_id+ "'") + .arg("'" + deviceMeasureInfo->create_user_name + "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceMeasureEquipment!=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureEquipment->id +"'") + .arg("'" + deviceMeasureEquipment->data_id +"'") + .arg("'" + deviceMeasureEquipment->equipment_id +"'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceMeasureCalibrator !=nullptr){ + resultsql = QString(ssql) + .arg("'" + deviceMeasureCalibrator->id +"'") + .arg("'" +deviceMeasureCalibrator->data_id+"'") + .arg("'" +deviceMeasureCalibrator->item_data_id+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error_formula+"'") + .arg("'" +deviceMeasureCalibrator->error_param_a+"'") + .arg("'" +deviceMeasureCalibrator->error_param_b+"'") + .arg("'" +deviceMeasureCalibrator->params+"'") + .arg("'" +deviceMeasureCalibrator->capacity+"'") + .arg("'" +deviceMeasureCalibrator->unit+"'") + .arg("'" +deviceMeasureCalibrator->frequency+"'") + .arg("'" +deviceMeasureCalibrator->frequency_unit+"'") + .arg("'" +deviceMeasureCalibrator->range_range+"'") + .arg("'" +deviceMeasureCalibrator->standard_value+"'") + .arg("'" +deviceMeasureCalibrator->indicating_value+"'") + .arg("'" +deviceMeasureCalibrator->maximum_error+"'") + .arg("'" +deviceMeasureCalibrator->absolute_error+"'") + .arg("'" +deviceMeasureCalibrator->resolution+"'") + .arg("'" +deviceMeasureCalibrator->line_mode+"'") + .arg("'" +deviceMeasureCalibrator->remark+"'").arg("'" +deviceMeasureCalibrator->an+"'").arg("'" +deviceMeasureCalibrator->bn+"'") + .arg("'" +deviceMeasureCalibrator->cn+"'") .arg("'" +deviceMeasureCalibrator->delta_an+"'") .arg("'" +deviceMeasureCalibrator->delta_bn+"'") + .arg("'" +deviceMeasureCalibrator->delta_cn+"'") .arg("'" +deviceMeasureCalibrator->measure_indication_value+"'") .arg("'" +deviceMeasureCalibrator->standard_value_upper_limit+"'") + .arg("'" +deviceMeasureCalibrator->accuracy_level+"'").arg("'" +currentDateTime+"'").arg("'" +currentDateTime+"'"); + qDebug()<<">>"<id+"'") + .arg("'" + deviceModifyRecord->data_id+"'") + .arg("'" + deviceModifyRecord->source_system+"'") + .arg("'" + deviceModifyRecord->modify_content+"'") + .arg("'" + deviceModifyRecord->create_user_id+"'") + .arg("'" + deviceModifyRecord->create_user_name+"'") + .arg("'" + currentDateTime+"'") + .arg("'" + currentDateTime+"'"); + } + if(devicePistonGaugeData !=nullptr){ + resultsql = QString(ssql).arg("'" + devicePistonGaugeData->id + "'") + .arg("'" + devicePistonGaugeData->data_id + "'") + .arg("'" + devicePistonGaugeData->data_type + "'") + .arg("'" + devicePistonGaugeData->data_category + "'") + .arg("'" + devicePistonGaugeData->indicating_value + "'") + .arg("'" + devicePistonGaugeData->before_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->before_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->after_friction_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->variation_reverse_stroke + "'") + .arg( devicePistonGaugeData->theoretical_output_value=="" ? "NULL" : "'" +devicePistonGaugeData->theoretical_output_value+ "'" ) + .arg("'" + devicePistonGaugeData->first_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->first_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->second_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->second_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->third_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->third_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->indicating_error + "'") + .arg("'" + devicePistonGaugeData->return_error + "'") + .arg("'" + devicePistonGaugeData->average_forward_stroke + "'") + .arg("'" + devicePistonGaugeData->average_reverse_stroke + "'") + .arg("'" + devicePistonGaugeData->average_value + "'") + .arg("'" + devicePistonGaugeData->average_return_error + "'") + .arg("'" + devicePistonGaugeData->item + "'") + .arg("'" + devicePistonGaugeData->max_indicating_error + "'") + .arg("'" + devicePistonGaugeData->max_return_error + "'") + .arg("'" + devicePistonGaugeData->max_friction_error + "'") + .arg("'" + devicePistonGaugeData->maximum_error_absolute + "'") + .arg("'" + devicePistonGaugeData->forward_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->reverse_stroke_switch_value + "'") + .arg("'" + devicePistonGaugeData->point_deviation + "'") + .arg("'" + devicePistonGaugeData->different_gap + "'") + .arg("'" + devicePistonGaugeData->max_point_deviation + "'") + .arg("'" + devicePistonGaugeData->allow_point_deviation + "'") + .arg("'" + devicePistonGaugeData->max_different_gap + "'") + .arg("'" + devicePistonGaugeData->allow_different_gap + "'") + .arg("'" + devicePistonGaugeData->zero_drift_one + "'") + .arg("'" + devicePistonGaugeData->zero_drift_two + "'") + .arg("'" + devicePistonGaugeData->zero_drift_three + "'") + .arg("'" + devicePistonGaugeData->zero_drift_four + "'") + .arg("'" + devicePistonGaugeData->zero_drift_five + "'") + .arg("'" + devicePistonGaugeData->intercept_a + "'") + .arg("'" + devicePistonGaugeData->slope_b + "'") + .arg("'" + devicePistonGaugeData->sensitivity_b + "'") + .arg("'" + devicePistonGaugeData->repeatability_r + "'") + .arg("'" + devicePistonGaugeData->hysteresis_h + "'") + .arg("'" + devicePistonGaugeData->linear_l + "'") + .arg("'" + devicePistonGaugeData->basic_error_a + "'") + .arg("'" + devicePistonGaugeData->periodic_stability_s_b + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + qDebug()<id + "'") + .arg("'" + deviceDCPowerData->data_id + "'") + .arg("'" + deviceDCPowerData->data_type + "'") + .arg("'" + deviceDCPowerData->data_type_type + "'") + .arg("'" +deviceDCPowerData->output_channel+ "'") + .arg("'" +deviceDCPowerData->unit+ "'") + .arg("'" +deviceDCPowerData->voltage_regulator_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_max_difference+ "'") + .arg("'" +deviceDCPowerData->technical_index+ "'") + .arg("'" +deviceDCPowerData->technical_index_symbol+ "'") + .arg("'" +deviceDCPowerData->voltage_regulation+ "'") + .arg("'" +deviceDCPowerData->load_situation+ "'") + .arg("'" +deviceDCPowerData->voltage_output_value+ "'") + .arg("'" +deviceDCPowerData->voltage_difference+ "'") + .arg("'" +deviceDCPowerData->load_regulation+ "'") + .arg("'" +deviceDCPowerData->measure_indication_value+ "'") + .arg("'" +deviceDCPowerData->standard_value+ "'") + .arg("'" +deviceDCPowerData->maximum_error+ "'") + .arg("'" +deviceDCPowerData->maximum_error_unit+ "'") + .arg("'" +deviceDCPowerData->absolute_error+ "'") + .arg("'" +deviceDCPowerData->resolution+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value+ "'") + .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value+ "'") + .arg("'" +deviceDCPowerData->standard_resistance_value_unit+ "'") + .arg("'" +deviceDCPowerData->ripple_voltage+ "'") + .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'") + .arg("'" +deviceDCPowerData->short_term_stability+ "'") + .arg("'" +deviceDCPowerData->exceed_mark+ "'") + .arg("'" +currentDateTime+ "'") + .arg("'" +currentDateTime+ "'"); + } + if(deviceOscilloscopeData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceOscilloscopeData->id + "'") + .arg("'" + deviceOscilloscopeData->data_id + "'") + .arg("'" + deviceOscilloscopeData->data_type + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal + "'") + .arg("'" + deviceOscilloscopeData->cycle_signal_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_absolute_error_unit + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error + "'") + .arg("'" + deviceOscilloscopeData->time_base_relative_error_unit + "'") + .arg("'" + deviceOscilloscopeData->technical_index_symbol + "'") + .arg("'" + deviceOscilloscopeData->technical_index + "'") + .arg("'" + deviceOscilloscopeData->technical_index_unit + "'") + .arg("'" + deviceOscilloscopeData->conclusion + "'") + .arg("'" + deviceOscilloscopeData->thoroughfare + "'") + .arg("'" + deviceOscilloscopeData->impedance + "'") + .arg("'" + deviceOscilloscopeData->impedance_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient + "'") + .arg("'" + deviceOscilloscopeData->vertical_deflect_coefficient_unit + "'") + .arg("'" + deviceOscilloscopeData->standard_value + "'") + .arg("'" + deviceOscilloscopeData->standard_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_value + "'") + .arg("'" + deviceOscilloscopeData->measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->relative_error + "'") + .arg("'" + deviceOscilloscopeData->error_value + "'") + .arg("'" + deviceOscilloscopeData->band_width + "'") + .arg("'" + deviceOscilloscopeData->band_width_unit + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude + "'") + .arg("'" + deviceOscilloscopeData->reference_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_unit + "'") + .arg("'" + deviceOscilloscopeData->decibel_number + "'") + .arg("'" + deviceOscilloscopeData->trigger_type + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency + "'") + .arg("'" + deviceOscilloscopeData->signal_frequency_unit + "'") + .arg("'" + deviceOscilloscopeData->item_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_value_unit + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value + "'") + .arg("'" + deviceOscilloscopeData->top_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value + "'") + .arg("'" + deviceOscilloscopeData->bottom_measure_value_unit + "'") + .arg("'" + deviceOscilloscopeData->scan_type + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->horizontal_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear + "'") + .arg("'" + deviceOscilloscopeData->vertical_scale_gear_unit + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper + "'") + .arg("'" + deviceOscilloscopeData->frequency_upper_unit + "'") + .arg("'" + deviceOscilloscopeData->output_signal_amplitude + "'") + .arg("'" + deviceOscilloscopeData->rise_time + "'") + .arg("'" + deviceOscilloscopeData->correct_rise_time + "'") + .arg("'" + deviceOscilloscopeData->signal_type + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->nominal_frequency_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value + "'") + .arg("'" + deviceOscilloscopeData->measure_amplitude_value_unit + "'") + .arg("'" + deviceOscilloscopeData->measure_frequency_value + "'") + .arg("'" + deviceOscilloscopeData->frequency_deviation + "'") + .arg("'" + deviceOscilloscopeData->amplitude_deviation + "'") + .arg("'" + deviceOscilloscopeData->exceed_mark + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceResistanceThermometerData!=nullptr){ + resultsql = QString(ssql).arg("'" + deviceResistanceThermometerData->id + "'") + .arg("'" + deviceResistanceThermometerData->data_id + "'") + .arg("'" + deviceResistanceThermometerData->data_type + "'") + .arg("'" + deviceResistanceThermometerData->data_category + "'") + .arg("'" + deviceResistanceThermometerData->upper_lower_point + "'") + .arg("'" + deviceResistanceThermometerData->location + "'") + .arg("'" + deviceResistanceThermometerData->unit + "'") + .arg("'" + deviceResistanceThermometerData->one_value + "'") + .arg("'" + deviceResistanceThermometerData->two_value + "'") + .arg("'" + deviceResistanceThermometerData->three_value + "'") + .arg("'" + deviceResistanceThermometerData->four_value + "'") + .arg("'" + deviceResistanceThermometerData->five_value + "'") + .arg("'" + deviceResistanceThermometerData->six_value + "'") + .arg("'" + deviceResistanceThermometerData->seven_value + "'") + .arg("'" + deviceResistanceThermometerData->eight_value + "'") + .arg("'" + deviceResistanceThermometerData->nine_value + "'") + .arg("'" + deviceResistanceThermometerData->ten_value + "'") + .arg("'" + deviceResistanceThermometerData->eleven_value + "'") + .arg("'" + deviceResistanceThermometerData->twelve_value + "'") + .arg("'" + deviceResistanceThermometerData->thirteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fourteen_value + "'") + .arg("'" + deviceResistanceThermometerData->fifteen_value + "'") + .arg("'" + deviceResistanceThermometerData->max_value + "'") + .arg("'" + deviceResistanceThermometerData->min_value + "'") + .arg("'" + deviceResistanceThermometerData->volatility + "'") + .arg("'" + deviceResistanceThermometerData->upper_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->lower_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_horizontal_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->max_work_temperature_different + "'") + .arg("'" + deviceResistanceThermometerData->calibrated_point + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->measure_indication_value_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_forward_stroke + "'") + .arg("'" + deviceResistanceThermometerData->indicating_error_reverse_stroke + "'") + .arg("'" + deviceResistanceThermometerData->maximum_error + "'") + .arg("'" + deviceResistanceThermometerData->urel + "'") + .arg("'" + deviceResistanceThermometerData->rank_level + "'") + .arg("'" + deviceResistanceThermometerData->nominal_temperature + "'") + .arg("'" + deviceResistanceThermometerData->item + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_lower + "'") + .arg("'" + deviceResistanceThermometerData->allow_error_upper + "'") + .arg("'" + deviceResistanceThermometerData->measure_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSpectrumAnalyzerData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSpectrumAnalyzerData->id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_id + "'") + .arg("'" + deviceSpectrumAnalyzerData->data_type + "'") + .arg("'" + deviceSpectrumAnalyzerData->nominal_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width + "'") + .arg("'" + deviceSpectrumAnalyzerData->sweep_width_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution + "'") + .arg("'" + deviceSpectrumAnalyzerData->horizontal_resolution_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth + "'") + .arg("'" + deviceSpectrumAnalyzerData->resolution_bandwidth_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->one_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->two_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->three_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->four_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->five_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->six_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->seven_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->eight_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->nine_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->ten_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_twice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_thrice_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_quartic_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->average_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_index_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->conclusion + "'") + .arg("'" + deviceSpectrumAnalyzerData->convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->lower_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->upper_convert_deviation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation + "'") + .arg("'" + deviceSpectrumAnalyzerData->standard_attenuator_attenuation_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude + "'") + .arg("'" + deviceSpectrumAnalyzerData->signal_source_amplitude_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->vertical_scale + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->start_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency + "'") + .arg("'" + deviceSpectrumAnalyzerData->end_frequency_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->revised_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->input_attenuator_conversion_effect + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level + "'") + .arg("'" + deviceSpectrumAnalyzerData->spectrum_level_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->gain_compression + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_one + "'") + .arg("'" + deviceSpectrumAnalyzerData->exceed_mark_two + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result + "'") + .arg("'" + deviceSpectrumAnalyzerData->measure_result_unit + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_left + "'") + .arg("'" + deviceSpectrumAnalyzerData->technical_index_right + "'") + .arg("'" + deviceSpectrumAnalyzerData->corrected_value + "'") + .arg("'" + deviceSpectrumAnalyzerData->type_value + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + if(deviceSignalGeneratorData !=nullptr){ + resultsql = QString(ssql).arg("'" + deviceSignalGeneratorData->id + "'") + .arg("'" + deviceSignalGeneratorData->data_id + "'") + .arg("'" + deviceSignalGeneratorData->data_type + "'") + .arg("'" + deviceSignalGeneratorData->nominal_value + "'") + .arg("'" + deviceSignalGeneratorData->unit + "'") + .arg("'" + deviceSignalGeneratorData->upper_index + "'") + .arg("'" + deviceSignalGeneratorData->upper_thd + "'") + .arg("'" + deviceSignalGeneratorData->lower_index + "'") + .arg("'" + deviceSignalGeneratorData->measure_value + "'") + .arg("'" + deviceSignalGeneratorData->measure_value_unit + "'") + .arg("'" + deviceSignalGeneratorData->relative_error + "'") + .arg("'" + deviceSignalGeneratorData->urel + "'") + .arg("'" + deviceSignalGeneratorData->frequency + "'") + .arg("'" + deviceSignalGeneratorData->frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->power + "'") + .arg("'" + deviceSignalGeneratorData->power_unit + "'") + .arg("'" + deviceSignalGeneratorData->amplitude + "'") + .arg("'" + deviceSignalGeneratorData->amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->high_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter + "'") + .arg("'" + deviceSignalGeneratorData->lower_pass_filter_unit + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate + "'") + .arg("'" + deviceSignalGeneratorData->modulation_rate_unit + "'") + .arg("'" + deviceSignalGeneratorData->thd + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_symbol + "'") + .arg("'" + deviceSignalGeneratorData->upper_index_unit + "'") + .arg("'" + deviceSignalGeneratorData->remain_amplitude_modulation + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_number + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->fundamental_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude + "'") + .arg("'" + deviceSignalGeneratorData->harmonic_amplitude_unit + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency + "'") + .arg("'" + deviceSignalGeneratorData->offset_frequency_unit + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark + "'") + .arg("'" + deviceSignalGeneratorData->exceed_mark_one + "'") + .arg("'" + currentDateTime + "'") + .arg("'" + currentDateTime + "'"); + } + sync.ssql = resultsql; + sync.id = QString::number(BaseCommonApi().generateId()); + sync.sync_type = "0"; + bool isSuccess = BaseCommonApi::InsertzdDataSync(sync); + +} //自动检定-结果保存-检定数据管理多功能校准源数据(自动检定输出或业务创建) bool BaseCommonApi::InsertVerMultiCal(SaveDeviceMeasureCalibrator measureCalibrator) { @@ -2403,8 +2980,14 @@ query.bindValue(":update_time",currentDateTime); bool isSuccess = query.exec(); qDebug()<<"保存的示值为："<> GetDataReturnItemListBySignalGenerator(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); // 【保存】信号发生器 static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator); + + static bool saveLogToSql(QString ssql,BaseClass* entity); }; diff --git a/softwareDirectory/AutoVerScheme/create_task.cpp b/softwareDirectory/AutoVerScheme/create_task.cpp index c9bdffa..78a4a07 100644 --- a/softwareDirectory/AutoVerScheme/create_task.cpp +++ b/softwareDirectory/AutoVerScheme/create_task.cpp @@ -444,8 +444,8 @@ //insertTask.=ui->comboBox_5->currentText(); if(ui->is_urgent->currentText()=="是") { - insertTask.is_urgent=true; - }else{insertTask.is_urgent=false;} + insertTask.is_urgent=1; + }else{insertTask.is_urgent=0;} insertTask.receive_illustrate=ui->receive_illustrate->text(); insertTask.customer_id=CustomerID; diff --git a/softwareDirectory/AutoVerScheme/datasyncview.cpp b/softwareDirectory/AutoVerScheme/datasyncview.cpp index 06c7f9a..9edaa24 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.cpp +++ b/softwareDirectory/AutoVerScheme/datasyncview.cpp @@ -111,10 +111,16 @@ row++; } } +void DataSyncView::on_UploadDataButton_clicked() +{ + SyncDialog *syncDialog = new SyncDialog(this,"1"); + syncDialog->exec(); + this->initForm(); +} void DataSyncView::on_DownloadDataButton_clicked() { - SyncDialog *syncDialog = new SyncDialog(this); + SyncDialog *syncDialog = new SyncDialog(this,"0"); syncDialog->exec(); // 显示进度条窗体并阻塞主窗口 this->initForm(); @@ -157,3 +163,5 @@ { ui->stackedWidget->setCurrentIndex(0); } + + diff --git a/softwareDirectory/AutoVerScheme/datasyncview.h b/softwareDirectory/AutoVerScheme/datasyncview.h index b2b9847..ae241cc 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.h +++ b/softwareDirectory/AutoVerScheme/datasyncview.h @@ -31,6 +31,8 @@ void OnButtonSelectClicked(zdLog log); void on_button_return_clicked(); + void on_UploadDataButton_clicked(); + public: diff --git a/softwareDirectory/AutoVerScheme/datasyncview.ui b/softwareDirectory/AutoVerScheme/datasyncview.ui index 7c9df8e..398b183 100644 --- a/softwareDirectory/AutoVerScheme/datasyncview.ui +++ b/softwareDirectory/AutoVerScheme/datasyncview.ui @@ -123,6 +123,19 @@ + + + background-color:#334582; + font: bold 18px Arial, sans-serif; +color:white; +padding:10px; + + + 上传数据 + + + + background-color:#334582; diff --git a/softwareDirectory/AutoVerScheme/syncdialog.cpp b/softwareDirectory/AutoVerScheme/syncdialog.cpp index 11570fb..997f973 100644 --- a/softwareDirectory/AutoVerScheme/syncdialog.cpp +++ b/softwareDirectory/AutoVerScheme/syncdialog.cpp @@ -1,14 +1,16 @@ #include "syncdialog.h" #include "ui_syncdialog.h" - +#include "syncupload.h" +#include int SyncDialog::m_totalTasks; int SyncDialog::stepcount; int SyncDialog::filecount; -SyncDialog::SyncDialog(QWidget *parent) : +SyncDialog::SyncDialog(QWidget *parent,QString type) : QDialog(parent), + synctype(type), ui(new Ui::SyncDialog) { ui->setupUi(this); @@ -24,10 +26,70 @@ void SyncDialog::on_button_Start_clicked() { + if(synctype == "1"){ + upLoadData(); + }else { + //qint64 id = dbmang.generateId(); + //zdlogId=QString::number(id); + zdDataSyncList.clear(); + querydstList.clear(); + //从主系统下载 + //连接两个数据库 + bool IsOpen=false; + bool IsOpenMain=false; + + DatabaseConnection *Conn=DatabaseConnection::getInstance(); + //DatabaseConnectionMainSys *MainConn=DatabaseConnectionMainSys::getInstance(); + if(!Conn->isopen()){IsOpen=Conn->open();}else{IsOpen=true;}; + if(!Conn->isopenmain()){IsOpenMain=Conn->openmain();}else{IsOpenMain=true;}; + + // 记录任务数量 + + m_totalTasks=0; + stepcount=0; + filecount=0; + // 获取第一个数据库的所有表名 + dstDb=Conn->getDatabase(); + srcDb=Conn->getDatabaseMain(); + QSqlQuery querydst(dstDb); + querydst.exec("SHOW TABLES"); + QSqlQuery query(srcDb); + query.exec("SHOW TABLES"); + + while(querydst.next()){ + QString tableName = querydst.value(0).toString(); + if(tableName.contains("act_") ||tableName.contains("flw_ru_")){continue;}; + querydstList.append(tableName);}; + // 创建一个线程池 + threadPool= QThreadPool::globalInstance(); + threadPool->setMaxThreadCount(5); // 设置线程池中的最大线程数 + // 遍历表名，为每个表创建一个任务并提交到线程池 + BaseCommonApi::SaveLogInfo(0,"开始下载同步"); + + while (query.next()) { + QString tableName = query.value(0).toString(); + if(!querydstList.contains(tableName)){continue;}; + if(tableName.contains("ACT_") + ||tableName.contains("FLW_RU_") + ||tableName.contains("zd")) + {continue;}; + SyncTask *task = new SyncTask(srcDb, dstDb, tableName); + connectTaskSignals(task); + // 提交任务到线程池 + threadPool->start(task); + ++m_totalTasks; + // + + } + //总数量 + ui->lab_sum->setText(QString::number(m_totalTasks)); + progressDecrement=static_cast(100) / m_totalTasks; +} - //qint64 id = dbmang.generateId(); - //zdlogId=QString::number(id); +} +void SyncDialog::upLoadData() +{ zdDataSyncList.clear(); querydstList.clear(); //从主系统下载 @@ -41,48 +103,58 @@ if(!Conn->isopenmain()){IsOpenMain=Conn->openmain();}else{IsOpenMain=true;}; // 记录任务数量 - m_totalTasks=0; stepcount=0; filecount=0; - // 获取第一个数据库的所有表名 + dstDb=Conn->getDatabase(); srcDb=Conn->getDatabaseMain(); - QSqlQuery querydst(dstDb); - querydst.exec("SHOW TABLES"); - QSqlQuery query(srcDb); - query.exec("SHOW TABLES"); +// QList sqlList; + QMap idToSqlMap; + qDebug() << "开始" << QThread::currentThreadId(); + QSqlQuery selectSql(dstDb); + bool isSuccess = selectSql.exec("SELECT * FROM zd_data_sync WHERE sync_type = '0' "); + if (!isSuccess) + return; + while (selectSql.next()) { + QString id = selectSql.value("id").toString(); + QString ssql = selectSql.value("ssql").toString(); +// sqlList.append(ssql); + idToSqlMap.insert(id,ssql); + } +// syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",sqlList); - while(querydst.next()){ - QString tableName = querydst.value(0).toString(); - if(tableName.contains("act_") ||tableName.contains("flw_ru_")){continue;}; - querydstList.append(tableName);}; - // 创建一个线程池 - threadPool= QThreadPool::globalInstance(); - threadPool->setMaxThreadCount(5); // 设置线程池中的最大线程数 - // 遍历表名，为每个表创建一个任务并提交到线程池 - BaseCommonApi::SaveLogInfo(0,"开始下载同步"); +// for(const QString& ssql : sqlList){ +// syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",ssql); +// threadPool= QThreadPool::globalInstance(); +// threadPool->setMaxThreadCount(QThread::idealThreadCount()); +// connectTaskSignalsByUp(syncload); +// threadPool->start(syncload); +// ++m_totalTasks; +// } - while (query.next()) { - QString tableName = query.value(0).toString(); - if(!querydstList.contains(tableName)){continue;}; - if(tableName.contains("ACT_") - ||tableName.contains("FLW_RU_") - ||tableName.contains("zd")) - {continue;}; - SyncTask *task = new SyncTask(srcDb, dstDb, tableName); - connectTaskSignals(task); - // 提交任务到线程池 - threadPool->start(task); - ++m_totalTasks; - // + for(const QString& id : idToSqlMap.keys()){ + syncupload *syncload = new syncupload(srcDb, dstDb, "zd_data_sync",id,idToSqlMap); + threadPool= QThreadPool::globalInstance(); + threadPool->setMaxThreadCount(QThread::idealThreadCount()); + connectTaskSignalsByUp(syncload); + threadPool->start(syncload); + ++m_totalTasks; + } - } + //总数量 ui->lab_sum->setText(QString::number(m_totalTasks)); progressDecrement=static_cast(100) / m_totalTasks; - } + +void SyncDialog::connectTaskSignalsByUp(syncupload *upload){ + connect(upload, &syncupload::taskCompleted, this, &SyncDialog::onTaskCompleted); + connect(upload, &syncupload::TextState, this, &SyncDialog::onTextState); + connect(this,&SyncDialog::StopRequested,upload,&syncupload::UpdateState); +} + + void SyncDialog::connectTaskSignals(SyncTask *task) { connect(task, &SyncTask::taskCompleted, this, &SyncDialog::onTaskCompleted); connect(task, &SyncTask::TextState, this, &SyncDialog::onTextState); diff --git a/softwareDirectory/AutoVerScheme/syncdialog.h b/softwareDirectory/AutoVerScheme/syncdialog.h index dc82e04..be3730a 100644 --- a/softwareDirectory/AutoVerScheme/syncdialog.h +++ b/softwareDirectory/AutoVerScheme/syncdialog.h @@ -11,6 +11,7 @@ #include #include #include "synctask.h" +#include "syncupload.h" namespace Ui { class SyncDialog; @@ -21,7 +22,7 @@ Q_OBJECT public: - explicit SyncDialog(QWidget *parent = nullptr); + explicit SyncDialog(QWidget *parent = nullptr,QString type=NULL); ~SyncDialog(); private slots: @@ -29,11 +30,13 @@ void connectTaskSignals(SyncTask *task); + void connectTaskSignalsByUp(syncupload *upload); void onTaskCompleted(int success,QString tableName, const QString& errorMessage); void onTextState(); void on_button_Close_clicked(); void StopSync(); void on_button_step_clicked(); + void upLoadData(); public: static int m_totalTasks; @@ -50,6 +53,7 @@ BaseCommonApi dbmang; QList zdDataSyncList; QList querydstList; + QString synctype; signals: void StopRequested(int state); // 定义暂停 停止请求信号 private: diff --git a/softwareDirectory/AutoVerScheme/synctask.cpp b/softwareDirectory/AutoVerScheme/synctask.cpp index 5729a3e..8903327 100644 --- a/softwareDirectory/AutoVerScheme/synctask.cpp +++ b/softwareDirectory/AutoVerScheme/synctask.cpp @@ -40,7 +40,6 @@ qDebug() << "删除错误：" << clearQuery.lastError().text(); //错误处理 //触发信号 - emit taskCompleted(1,tableName,tableName+"|删除本地表时错误:"+clearQuery.lastError().text()); return; }