diff --git a/softwareDirectory/AutoVerScheme/TaskManager.cpp b/softwareDirectory/AutoVerScheme/TaskManager.cpp
index c6c6c43..09bba4a 100644
--- a/softwareDirectory/AutoVerScheme/TaskManager.cpp
+++ b/softwareDirectory/AutoVerScheme/TaskManager.cpp
@@ -39,7 +39,7 @@
     }
     QString dateStr = KeyDate;
     // 生成任务单编号，这里假设编号格式是 "rwdYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("rwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdrwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
 
     return taskId;
 }
@@ -79,7 +79,7 @@
 
     QString dateStr =  ResultKeyDate;
     // 生成结果保存编号，这里假设编号格式是 "jdsjYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("jdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdjdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
     //返回结果
     return  taskId;
 }

diff --git a/softwareDirectory/AutoVerScheme/TaskManager.cpp b/softwareDirectory/AutoVerScheme/TaskManager.cpp
index c6c6c43..09bba4a 100644
--- a/softwareDirectory/AutoVerScheme/TaskManager.cpp
+++ b/softwareDirectory/AutoVerScheme/TaskManager.cpp
@@ -39,7 +39,7 @@
     }
     QString dateStr = KeyDate;
     // 生成任务单编号，这里假设编号格式是 "rwdYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("rwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdrwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
 
     return taskId;
 }
@@ -79,7 +79,7 @@
 
     QString dateStr =  ResultKeyDate;
     // 生成结果保存编号，这里假设编号格式是 "jdsjYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("jdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdjdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
     //返回结果
     return  taskId;
 }
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 2ee74d5..ea6f9d8 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -701,6 +701,11 @@
 
          return result;
 }
+
+
+
+
+
 //获取标准设备管理-基本信息
 QList<CatDeviceInfor>BaseCommonApi::getCatDeviceInfor(QString id)
 {
@@ -787,24 +792,24 @@
 
          return result;
 }
-    //根据id获取装置名称
-QString BaseCommonApi::getApparatus(QString id)
-{
-    QString result;
-    QSqlQuery query;
-    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
-                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
-        // 将参数绑定到占位符
-         query.bindValue(":id", id);
-         if (query.exec()) {
-                while (query.next()) {
-                     result = query.value("standard_name").toString();
-                }
-         }   else {
-             result = "Not Found";
-         }
-         return  result;
-}
+    //根据id获取装置名称  2024年4月23日17:53:40  主系统数据库已变
+//QString BaseCommonApi::getApparatus(QString id,QString name)
+//{
+//    QString result;
+//    QSqlQuery query;
+//    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
+//                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
+//        // 将参数绑定到占位符
+//         query.bindValue(":id", id);
+//         if (query.exec()) {
+//                while (query.next()) {
+//                     result = query.value("standard_name").toString();
+//                }
+//         }   else {
+//             result = "Not Found";
+//         }
+//         return  result;
+//}
 
 //  被检设备管理 首页
 QList<TestedDevice> BaseCommonApi::getTestedDevice()
@@ -1204,7 +1209,8 @@
                {
                    VerificationItem = "DCV";
                    //添加列头
-                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值"
+                          << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                      HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1224,6 +1230,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCVList.append(Data);
                  }
                  else if(row[2]=="ACV" )
@@ -1232,7 +1240,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"频率"  <<"频率单位"<< "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1254,6 +1262,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACVList.append(Data);
                  } else if(row[2]=="DCI" )
                  {
@@ -1261,7 +1271,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1283,6 +1293,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCIList.append(Data);
 
                  } else if(row[2]=="ACI" )
@@ -1291,7 +1303,7 @@
                      //添加列头
 
                      head   << "序号" << "检定项目" << "量" << "单位" <<"频率" <<"频率单位"  << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1315,6 +1327,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACIList.append(Data);
                  } else if(row[2]=="R")
                  {
@@ -1322,7 +1336,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"两线/四线"   << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
 
@@ -1344,6 +1358,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      RList.append(Data);
                  }
 
@@ -1970,12 +1986,12 @@
 };
 
 //查询指令库  参数 检定程序id
-QList<InstructionLib> BaseCommonApi::getInstructionLib(QString program_id)
+QList<InstructionLib> BaseCommonApi::getInstructionLib(QString verification_program_id)
 {
     QList<InstructionLib> result;
     QSqlQuery query;
        QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 ";
-       QString ssql = sql.arg(program_id);
+       QString ssql = sql.arg(verification_program_id);
        if (query.exec(ssql)) {
            while (query.next()) {
                InstructionLib instruction;
@@ -2323,7 +2339,7 @@
                   " 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 "
+                  " create_user_name,meter_identify, create_time, update_time "
                 " ) VALUES ( "
                   " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, "
                   " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, "
@@ -2336,7 +2352,7 @@
                   " :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);");
+                  " :create_user_name,:meter_identify, :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);
@@ -2390,6 +2406,7 @@
        query.bindValue(":create_user_id", saveInfo.create_user_id);
        query.bindValue(":measure_person_id", saveInfo.measure_person_id);
        query.bindValue(":create_user_name", saveInfo.create_user_name);
+       query.bindValue(":meter_identify",saveInfo.meter_identify);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2530,10 +2547,10 @@
                                        .arg("'" + deviceMeasureInfo->manufacturer + "'")
                                        .arg("'" + deviceMeasureInfo->item_id + "'")
                                        .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'")
-                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'")
+                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString("yyyy-MM-dd HH:mm:ss") + "'")
                                        .arg("'" + deviceMeasureInfo->measure_address + "'")
-                                       .arg("'" +deviceMeasureInfo->temperature+ "'")
-                                       .arg("'" +deviceMeasureInfo->humidity+ "'")
+                                       .arg(deviceMeasureInfo->temperature.toDouble())
+                                       .arg(deviceMeasureInfo->humidity.toDouble())
                                        .arg("'" + deviceMeasureInfo->data_source + "'")
                                        .arg("'" +deviceMeasureInfo->ipri+ "'")
                                        .arg("'" + deviceMeasureInfo->ipri_unit + "'")
@@ -2544,21 +2561,21 @@
                                        .arg("'" +deviceMeasureInfo->vsec+ "'")
                                        .arg("'" + deviceMeasureInfo->vsec_unit + "'")
                                        .arg("'" +deviceMeasureInfo->appearance_function_check+ "'")
-                                       .arg("'" + deviceMeasureInfo->appearance + "'")
+                                       .arg( deviceMeasureInfo->appearance == "" ? 1: deviceMeasureInfo->appearance.toInt())
                                        .arg("'" + deviceMeasureInfo->appearance_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'")
+                                       .arg(deviceMeasureInfo->pointer_deflection_stability == "" ? 1: deviceMeasureInfo->pointer_deflection_stability.toInt())
                                        .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->tightness+ "'")
+                                       .arg(deviceMeasureInfo->tightness == "" ? 1: deviceMeasureInfo->tightness.toInt())
                                        .arg("'" + deviceMeasureInfo->tightness_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->insulation_resistance+ "'")
+                                       .arg(deviceMeasureInfo->insulation_resistance == "" ? 1:deviceMeasureInfo->insulation_resistance.toInt())
                                        .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'")
                                        .arg("'" +deviceMeasureInfo->measure_medium+ "'")
-                                       .arg("'" +deviceMeasureInfo->division+ "'")
+                                       .arg(deviceMeasureInfo->division.toDouble())
                                        .arg("'" +deviceMeasureInfo->zero_drift_result+ "'")
                                        .arg("'" +deviceMeasureInfo->work_line_equation+ "'")
-                                       .arg("'" +deviceMeasureInfo->sealing_test+ "'")
+                                       .arg(deviceMeasureInfo->sealing_test== "" ? 1: deviceMeasureInfo->sealing_test.toInt())
                                        .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'")
-                                       .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'")
+                                       .arg(deviceMeasureInfo->angle_adjust_error=="" ? 1:deviceMeasureInfo->angle_adjust_error.toInt())
                                        .arg("'" +deviceMeasureInfo->actual_division_value+ "'")
                                        .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'")
                                        .arg("'" +deviceMeasureInfo->conclusion+ "'")
@@ -2567,8 +2584,8 @@
                                        .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_id.toInt())
+                                       .arg(deviceMeasureInfo->measure_person_id.toInt())
                                        .arg("'" + deviceMeasureInfo->create_user_name + "'")
                                        .arg("'" +currentDateTime+ "'")
                                        .arg("'" +currentDateTime+ "'");
@@ -2693,7 +2710,7 @@
                                 .arg("'" +deviceDCPowerData->maximum_error+ "'")
                                 .arg("'" +deviceDCPowerData->maximum_error_unit+ "'")
                                 .arg("'" +deviceDCPowerData->absolute_error+ "'")
-                                .arg("'" +deviceDCPowerData->resolution+ "'")
+                                .arg(deviceDCPowerData->resolution.toDouble())
                                 .arg("'" +deviceDCPowerData->standard_voltage_value+ "'")
                                 .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'")
                                 .arg("'" +deviceDCPowerData->standard_resistance_value+ "'")
@@ -2701,7 +2718,7 @@
                                 .arg("'" +deviceDCPowerData->ripple_voltage+ "'")
                                 .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'")
                                 .arg("'" +deviceDCPowerData->short_term_stability+ "'")
-                                .arg("'" +deviceDCPowerData->exceed_mark+ "'")
+                                .arg(deviceDCPowerData->exceed_mark.toInt())
                                 .arg("'" +currentDateTime+ "'")
                                 .arg("'" +currentDateTime+ "'");
    }
@@ -2996,15 +3013,15 @@
 {
     QList<CheckProgramManage> result;
     QSqlQuery query;
-    bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time   "
-                                "FROM zd_verification_program_manage");
+    bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage");
     if (isSuccess) {
         while (query.next()) {
             CheckProgramManage programInfo;
             programInfo.id = query.value("id").toString();
             programInfo.check_name = query.value("check_name").toString();
+            programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString();
             programInfo.create_name = query.value("create_name").toString();
-            programInfo.create_time = query.value("create_time").toDateTime();
+//            programInfo.create_time = query.value("create_time").toDateTime();
             programInfo.remark = query.value("remark").toString();
             result.append(programInfo);
         }
@@ -3864,7 +3881,7 @@
               result.clear();
               result.append(query.value("id").toString());
               result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("indicating_value").toString());//标准器示值
+              result.append(query.value("indicating_value").toString());//标准ji器示值
               result.append(query.value("return_error").toString());//回程误差允许值
               result.append(query.value("friction_error").toString());//轻敲位移允许值
               result.append(query.value("indicating_error").toString());//示值误差允许值
@@ -4467,7 +4484,7 @@
                 //添加列头
                 QStringList head;
                 head  <<"序号"<<"检定项目"<<"输出通道"<<"单位"<<"调压器输出值"
-                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"电源电压调整率" ;
+                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"被检电源技术指标前符号"<<"电源电压调整率" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
@@ -4479,6 +4496,7 @@
                 Data.append("");//被检电源输出电压值
                 Data.append("");//被检电源输出电压最大差值  公式
                 Data.append(row[8] + row[7]);//被检电源技术指标
+                Data.append(row[8]);//被检电源技术指标单位
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
          }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
@@ -5195,15 +5213,15 @@
                 VerificationItem = "波动性测试";
                 //添加列头
                 QStringList head;
-                head  <<"序号"<< "上限点"  <<"下限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
+                head  <<"序号"<< "下限点"  <<"上限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
                         <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15"
                      <<"最大值"<<"最小值"<<"波动性" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
                 Data.append(row[0]);  //ID
-                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(showUpperLimit ?  "": row[5]);//下限点
+                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(row[3]);//单位
                 Data.append("");//示值1
                 Data.append("");//示值2
@@ -6440,3 +6458,52 @@
     return isSuccess;
 }
 
+//新建检定程序中查询所有的标准装置
+QList<StandardInfo> BaseCommonApi::getStandardInfo()
+{
+    QList<StandardInfo> result;
+    QSqlQuery query;
+    bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info ");
+    if(isSuccess){
+         while (query.next()) {
+             StandardInfo info;
+             info.id = query.value("id").toString();
+             info.standard_no = query.value("standard_no").toString();
+             info.standard_name = query.value("standard_name").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.manage_status = query.value("manage_status").toString();
+             result.append(info);
+         }
+    }else {
+        qDebug() << "select data failed: " << query.lastError().text();
+    }
+    return result;
+}
+
+//根据标准装置id查询标准设备
+QList<BizDevice> BaseCommonApi::getStandardInfoListByStandardId(QString standardId)
+{
+    QList<BizDevice> result;
+    QSqlQuery query;
+       bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type  FROM biz_equipment_info bei "
+                                   " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id "
+                                   " WHERE beser.standard_id = :standardId ");
+       query.bindValue(":standardId",standardId);
+     if (isSuccess) {
+             while (query.next()) {
+                 BizDevice device;
+                 device.id = query.value("id").toString();
+                 device.equipment_name = query.value("equipment_name").toString();
+                 device.model = query.value("model").toString();
+                 device.manufacture_no = query.value("manufacture_no").toString();
+                 device.manufacturer = query.value("manufacturer").toString();
+                 device.type = query.value("type").toString();
+                 result.append(device);
+             }
+         } else {
+             qDebug() << "Query execution failed: " << query.lastError().text();
+         }
+         return result;
+}
+
+

diff --git a/softwareDirectory/AutoVerScheme/TaskManager.cpp b/softwareDirectory/AutoVerScheme/TaskManager.cpp
index c6c6c43..09bba4a 100644
--- a/softwareDirectory/AutoVerScheme/TaskManager.cpp
+++ b/softwareDirectory/AutoVerScheme/TaskManager.cpp
@@ -39,7 +39,7 @@
     }
     QString dateStr = KeyDate;
     // 生成任务单编号，这里假设编号格式是 "rwdYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("rwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdrwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
 
     return taskId;
 }
@@ -79,7 +79,7 @@
 
     QString dateStr =  ResultKeyDate;
     // 生成结果保存编号，这里假设编号格式是 "jdsjYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("jdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdjdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
     //返回结果
     return  taskId;
 }
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 2ee74d5..ea6f9d8 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -701,6 +701,11 @@
 
          return result;
 }
+
+
+
+
+
 //获取标准设备管理-基本信息
 QList<CatDeviceInfor>BaseCommonApi::getCatDeviceInfor(QString id)
 {
@@ -787,24 +792,24 @@
 
          return result;
 }
-    //根据id获取装置名称
-QString BaseCommonApi::getApparatus(QString id)
-{
-    QString result;
-    QSqlQuery query;
-    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
-                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
-        // 将参数绑定到占位符
-         query.bindValue(":id", id);
-         if (query.exec()) {
-                while (query.next()) {
-                     result = query.value("standard_name").toString();
-                }
-         }   else {
-             result = "Not Found";
-         }
-         return  result;
-}
+    //根据id获取装置名称  2024年4月23日17:53:40  主系统数据库已变
+//QString BaseCommonApi::getApparatus(QString id,QString name)
+//{
+//    QString result;
+//    QSqlQuery query;
+//    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
+//                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
+//        // 将参数绑定到占位符
+//         query.bindValue(":id", id);
+//         if (query.exec()) {
+//                while (query.next()) {
+//                     result = query.value("standard_name").toString();
+//                }
+//         }   else {
+//             result = "Not Found";
+//         }
+//         return  result;
+//}
 
 //  被检设备管理 首页
 QList<TestedDevice> BaseCommonApi::getTestedDevice()
@@ -1204,7 +1209,8 @@
                {
                    VerificationItem = "DCV";
                    //添加列头
-                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值"
+                          << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                      HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1224,6 +1230,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCVList.append(Data);
                  }
                  else if(row[2]=="ACV" )
@@ -1232,7 +1240,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"频率"  <<"频率单位"<< "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1254,6 +1262,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACVList.append(Data);
                  } else if(row[2]=="DCI" )
                  {
@@ -1261,7 +1271,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1283,6 +1293,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCIList.append(Data);
 
                  } else if(row[2]=="ACI" )
@@ -1291,7 +1303,7 @@
                      //添加列头
 
                      head   << "序号" << "检定项目" << "量" << "单位" <<"频率" <<"频率单位"  << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1315,6 +1327,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACIList.append(Data);
                  } else if(row[2]=="R")
                  {
@@ -1322,7 +1336,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"两线/四线"   << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
 
@@ -1344,6 +1358,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      RList.append(Data);
                  }
 
@@ -1970,12 +1986,12 @@
 };
 
 //查询指令库  参数 检定程序id
-QList<InstructionLib> BaseCommonApi::getInstructionLib(QString program_id)
+QList<InstructionLib> BaseCommonApi::getInstructionLib(QString verification_program_id)
 {
     QList<InstructionLib> result;
     QSqlQuery query;
        QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 ";
-       QString ssql = sql.arg(program_id);
+       QString ssql = sql.arg(verification_program_id);
        if (query.exec(ssql)) {
            while (query.next()) {
                InstructionLib instruction;
@@ -2323,7 +2339,7 @@
                   " 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 "
+                  " create_user_name,meter_identify, create_time, update_time "
                 " ) VALUES ( "
                   " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, "
                   " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, "
@@ -2336,7 +2352,7 @@
                   " :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);");
+                  " :create_user_name,:meter_identify, :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);
@@ -2390,6 +2406,7 @@
        query.bindValue(":create_user_id", saveInfo.create_user_id);
        query.bindValue(":measure_person_id", saveInfo.measure_person_id);
        query.bindValue(":create_user_name", saveInfo.create_user_name);
+       query.bindValue(":meter_identify",saveInfo.meter_identify);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2530,10 +2547,10 @@
                                        .arg("'" + deviceMeasureInfo->manufacturer + "'")
                                        .arg("'" + deviceMeasureInfo->item_id + "'")
                                        .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'")
-                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'")
+                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString("yyyy-MM-dd HH:mm:ss") + "'")
                                        .arg("'" + deviceMeasureInfo->measure_address + "'")
-                                       .arg("'" +deviceMeasureInfo->temperature+ "'")
-                                       .arg("'" +deviceMeasureInfo->humidity+ "'")
+                                       .arg(deviceMeasureInfo->temperature.toDouble())
+                                       .arg(deviceMeasureInfo->humidity.toDouble())
                                        .arg("'" + deviceMeasureInfo->data_source + "'")
                                        .arg("'" +deviceMeasureInfo->ipri+ "'")
                                        .arg("'" + deviceMeasureInfo->ipri_unit + "'")
@@ -2544,21 +2561,21 @@
                                        .arg("'" +deviceMeasureInfo->vsec+ "'")
                                        .arg("'" + deviceMeasureInfo->vsec_unit + "'")
                                        .arg("'" +deviceMeasureInfo->appearance_function_check+ "'")
-                                       .arg("'" + deviceMeasureInfo->appearance + "'")
+                                       .arg( deviceMeasureInfo->appearance == "" ? 1: deviceMeasureInfo->appearance.toInt())
                                        .arg("'" + deviceMeasureInfo->appearance_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'")
+                                       .arg(deviceMeasureInfo->pointer_deflection_stability == "" ? 1: deviceMeasureInfo->pointer_deflection_stability.toInt())
                                        .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->tightness+ "'")
+                                       .arg(deviceMeasureInfo->tightness == "" ? 1: deviceMeasureInfo->tightness.toInt())
                                        .arg("'" + deviceMeasureInfo->tightness_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->insulation_resistance+ "'")
+                                       .arg(deviceMeasureInfo->insulation_resistance == "" ? 1:deviceMeasureInfo->insulation_resistance.toInt())
                                        .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'")
                                        .arg("'" +deviceMeasureInfo->measure_medium+ "'")
-                                       .arg("'" +deviceMeasureInfo->division+ "'")
+                                       .arg(deviceMeasureInfo->division.toDouble())
                                        .arg("'" +deviceMeasureInfo->zero_drift_result+ "'")
                                        .arg("'" +deviceMeasureInfo->work_line_equation+ "'")
-                                       .arg("'" +deviceMeasureInfo->sealing_test+ "'")
+                                       .arg(deviceMeasureInfo->sealing_test== "" ? 1: deviceMeasureInfo->sealing_test.toInt())
                                        .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'")
-                                       .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'")
+                                       .arg(deviceMeasureInfo->angle_adjust_error=="" ? 1:deviceMeasureInfo->angle_adjust_error.toInt())
                                        .arg("'" +deviceMeasureInfo->actual_division_value+ "'")
                                        .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'")
                                        .arg("'" +deviceMeasureInfo->conclusion+ "'")
@@ -2567,8 +2584,8 @@
                                        .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_id.toInt())
+                                       .arg(deviceMeasureInfo->measure_person_id.toInt())
                                        .arg("'" + deviceMeasureInfo->create_user_name + "'")
                                        .arg("'" +currentDateTime+ "'")
                                        .arg("'" +currentDateTime+ "'");
@@ -2693,7 +2710,7 @@
                                 .arg("'" +deviceDCPowerData->maximum_error+ "'")
                                 .arg("'" +deviceDCPowerData->maximum_error_unit+ "'")
                                 .arg("'" +deviceDCPowerData->absolute_error+ "'")
-                                .arg("'" +deviceDCPowerData->resolution+ "'")
+                                .arg(deviceDCPowerData->resolution.toDouble())
                                 .arg("'" +deviceDCPowerData->standard_voltage_value+ "'")
                                 .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'")
                                 .arg("'" +deviceDCPowerData->standard_resistance_value+ "'")
@@ -2701,7 +2718,7 @@
                                 .arg("'" +deviceDCPowerData->ripple_voltage+ "'")
                                 .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'")
                                 .arg("'" +deviceDCPowerData->short_term_stability+ "'")
-                                .arg("'" +deviceDCPowerData->exceed_mark+ "'")
+                                .arg(deviceDCPowerData->exceed_mark.toInt())
                                 .arg("'" +currentDateTime+ "'")
                                 .arg("'" +currentDateTime+ "'");
    }
@@ -2996,15 +3013,15 @@
 {
     QList<CheckProgramManage> result;
     QSqlQuery query;
-    bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time   "
-                                "FROM zd_verification_program_manage");
+    bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage");
     if (isSuccess) {
         while (query.next()) {
             CheckProgramManage programInfo;
             programInfo.id = query.value("id").toString();
             programInfo.check_name = query.value("check_name").toString();
+            programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString();
             programInfo.create_name = query.value("create_name").toString();
-            programInfo.create_time = query.value("create_time").toDateTime();
+//            programInfo.create_time = query.value("create_time").toDateTime();
             programInfo.remark = query.value("remark").toString();
             result.append(programInfo);
         }
@@ -3864,7 +3881,7 @@
               result.clear();
               result.append(query.value("id").toString());
               result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("indicating_value").toString());//标准器示值
+              result.append(query.value("indicating_value").toString());//标准ji器示值
               result.append(query.value("return_error").toString());//回程误差允许值
               result.append(query.value("friction_error").toString());//轻敲位移允许值
               result.append(query.value("indicating_error").toString());//示值误差允许值
@@ -4467,7 +4484,7 @@
                 //添加列头
                 QStringList head;
                 head  <<"序号"<<"检定项目"<<"输出通道"<<"单位"<<"调压器输出值"
-                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"电源电压调整率" ;
+                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"被检电源技术指标前符号"<<"电源电压调整率" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
@@ -4479,6 +4496,7 @@
                 Data.append("");//被检电源输出电压值
                 Data.append("");//被检电源输出电压最大差值  公式
                 Data.append(row[8] + row[7]);//被检电源技术指标
+                Data.append(row[8]);//被检电源技术指标单位
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
          }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
@@ -5195,15 +5213,15 @@
                 VerificationItem = "波动性测试";
                 //添加列头
                 QStringList head;
-                head  <<"序号"<< "上限点"  <<"下限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
+                head  <<"序号"<< "下限点"  <<"上限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
                         <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15"
                      <<"最大值"<<"最小值"<<"波动性" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
                 Data.append(row[0]);  //ID
-                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(showUpperLimit ?  "": row[5]);//下限点
+                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(row[3]);//单位
                 Data.append("");//示值1
                 Data.append("");//示值2
@@ -6440,3 +6458,52 @@
     return isSuccess;
 }
 
+//新建检定程序中查询所有的标准装置
+QList<StandardInfo> BaseCommonApi::getStandardInfo()
+{
+    QList<StandardInfo> result;
+    QSqlQuery query;
+    bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info ");
+    if(isSuccess){
+         while (query.next()) {
+             StandardInfo info;
+             info.id = query.value("id").toString();
+             info.standard_no = query.value("standard_no").toString();
+             info.standard_name = query.value("standard_name").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.manage_status = query.value("manage_status").toString();
+             result.append(info);
+         }
+    }else {
+        qDebug() << "select data failed: " << query.lastError().text();
+    }
+    return result;
+}
+
+//根据标准装置id查询标准设备
+QList<BizDevice> BaseCommonApi::getStandardInfoListByStandardId(QString standardId)
+{
+    QList<BizDevice> result;
+    QSqlQuery query;
+       bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type  FROM biz_equipment_info bei "
+                                   " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id "
+                                   " WHERE beser.standard_id = :standardId ");
+       query.bindValue(":standardId",standardId);
+     if (isSuccess) {
+             while (query.next()) {
+                 BizDevice device;
+                 device.id = query.value("id").toString();
+                 device.equipment_name = query.value("equipment_name").toString();
+                 device.model = query.value("model").toString();
+                 device.manufacture_no = query.value("manufacture_no").toString();
+                 device.manufacturer = query.value("manufacturer").toString();
+                 device.type = query.value("type").toString();
+                 result.append(device);
+             }
+         } else {
+             qDebug() << "Query execution failed: " << query.lastError().text();
+         }
+         return result;
+}
+
+
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 8cf703a..3aa3cb4 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -191,6 +191,7 @@
     QString model;
     QString manufacture_no;
     QString manufacturer;
+    QString type;
 };
 //标准设备管理-查看设备信息
 class CatDeviceInfor
@@ -607,6 +608,7 @@
     QString other_outcome;//结果(检定数据中有2个表格情况下的第2个表中的合格/不合格)
     QString remark;//备注/情况说明(安全阀)
     QString other_remark;//备注(检定数据中有2个表格情况下的第2个表中的备注)
+    QString meter_identify;//计量标识(生成证书后需同步更新至受检设备)
     QString create_user_id;//检定员id(系统用户id)
     QString measure_person_id;//检定员id(人员id)
     QString create_user_name;  //创建用户名
@@ -705,6 +707,7 @@
 public:
     QString id;//id
     QString check_name;//核查程序名称
+    QString belong_standard_equipment;//核查标准装置
     QString create_name;//创建人
     QDateTime create_time;//创建时间
     QString remark; //说明
@@ -1335,7 +1338,16 @@
     QDateTime create_time;
     QDateTime update_time;
 };
-
+//新建检定程序，选择标准装置
+class StandardInfo
+{
+public:
+    QString id;
+    QString standard_no;
+    QString standard_name;
+    QString dept_name;
+    QString manage_status;
+};
 
 enum class SyncRunStatus {
     Running,
@@ -1406,7 +1418,7 @@
     //标准设备管理-设备基本信息
     static QList<CatDeviceInfor>getCatDeviceInfor(QString id);
     //判断是哪个核查项
-    static  QString  getApparatus(QString id);
+//    static  QString  getApparatus(QString id,QString name);
     //直流稳压电源检定装置
     static QList<CheckDCPower>getCheckDCPower(QString item_category_id,QStringList *headList);
     //获取被检设备管理首页数据
@@ -1502,8 +1514,11 @@
     static QList<CheckAndTestedDevice> getCheckDeviceList();
     //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集
     static QList<CheckAndTestedDevice> getCheckAndTestedDeviceList();
-    //核查程序管理-核查设置-多功能校准源  参数设备id  同标准设备管理-核查项及核查点
+    //多功能校准源  核查项及核查点 参数设备id
     static QList<QStringList> getVerificationItemsMultiList(QString equipment_id,QStringList *headList);
+
+
+
     //新增核查程序
     static bool InsertCheckProgramManage(CheckProgramManage check);
     //更新核查程序  参数核查程序的id
@@ -1617,6 +1632,10 @@
    static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator);
 
    static bool saveLogToSql(QString ssql,BaseClass* entity);
+   //新建检定程序中查询所有的标准装置
+   static QList<StandardInfo> getStandardInfo();
+   //根据标准装置id查询标准设备
+   static QList<BizDevice> getStandardInfoListByStandardId(QString standardId);
 };
 
 

diff --git a/softwareDirectory/AutoVerScheme/TaskManager.cpp b/softwareDirectory/AutoVerScheme/TaskManager.cpp
index c6c6c43..09bba4a 100644
--- a/softwareDirectory/AutoVerScheme/TaskManager.cpp
+++ b/softwareDirectory/AutoVerScheme/TaskManager.cpp
@@ -39,7 +39,7 @@
     }
     QString dateStr = KeyDate;
     // 生成任务单编号，这里假设编号格式是 "rwdYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("rwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdrwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
 
     return taskId;
 }
@@ -79,7 +79,7 @@
 
     QString dateStr =  ResultKeyDate;
     // 生成结果保存编号，这里假设编号格式是 "jdsjYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("jdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdjdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
     //返回结果
     return  taskId;
 }
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 2ee74d5..ea6f9d8 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -701,6 +701,11 @@
 
          return result;
 }
+
+
+
+
+
 //获取标准设备管理-基本信息
 QList<CatDeviceInfor>BaseCommonApi::getCatDeviceInfor(QString id)
 {
@@ -787,24 +792,24 @@
 
          return result;
 }
-    //根据id获取装置名称
-QString BaseCommonApi::getApparatus(QString id)
-{
-    QString result;
-    QSqlQuery query;
-    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
-                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
-        // 将参数绑定到占位符
-         query.bindValue(":id", id);
-         if (query.exec()) {
-                while (query.next()) {
-                     result = query.value("standard_name").toString();
-                }
-         }   else {
-             result = "Not Found";
-         }
-         return  result;
-}
+    //根据id获取装置名称  2024年4月23日17:53:40  主系统数据库已变
+//QString BaseCommonApi::getApparatus(QString id,QString name)
+//{
+//    QString result;
+//    QSqlQuery query;
+//    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
+//                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
+//        // 将参数绑定到占位符
+//         query.bindValue(":id", id);
+//         if (query.exec()) {
+//                while (query.next()) {
+//                     result = query.value("standard_name").toString();
+//                }
+//         }   else {
+//             result = "Not Found";
+//         }
+//         return  result;
+//}
 
 //  被检设备管理 首页
 QList<TestedDevice> BaseCommonApi::getTestedDevice()
@@ -1204,7 +1209,8 @@
                {
                    VerificationItem = "DCV";
                    //添加列头
-                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值"
+                          << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                      HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1224,6 +1230,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCVList.append(Data);
                  }
                  else if(row[2]=="ACV" )
@@ -1232,7 +1240,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"频率"  <<"频率单位"<< "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1254,6 +1262,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACVList.append(Data);
                  } else if(row[2]=="DCI" )
                  {
@@ -1261,7 +1271,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1283,6 +1293,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCIList.append(Data);
 
                  } else if(row[2]=="ACI" )
@@ -1291,7 +1303,7 @@
                      //添加列头
 
                      head   << "序号" << "检定项目" << "量" << "单位" <<"频率" <<"频率单位"  << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1315,6 +1327,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACIList.append(Data);
                  } else if(row[2]=="R")
                  {
@@ -1322,7 +1336,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"两线/四线"   << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
 
@@ -1344,6 +1358,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      RList.append(Data);
                  }
 
@@ -1970,12 +1986,12 @@
 };
 
 //查询指令库  参数 检定程序id
-QList<InstructionLib> BaseCommonApi::getInstructionLib(QString program_id)
+QList<InstructionLib> BaseCommonApi::getInstructionLib(QString verification_program_id)
 {
     QList<InstructionLib> result;
     QSqlQuery query;
        QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 ";
-       QString ssql = sql.arg(program_id);
+       QString ssql = sql.arg(verification_program_id);
        if (query.exec(ssql)) {
            while (query.next()) {
                InstructionLib instruction;
@@ -2323,7 +2339,7 @@
                   " 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 "
+                  " create_user_name,meter_identify, create_time, update_time "
                 " ) VALUES ( "
                   " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, "
                   " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, "
@@ -2336,7 +2352,7 @@
                   " :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);");
+                  " :create_user_name,:meter_identify, :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);
@@ -2390,6 +2406,7 @@
        query.bindValue(":create_user_id", saveInfo.create_user_id);
        query.bindValue(":measure_person_id", saveInfo.measure_person_id);
        query.bindValue(":create_user_name", saveInfo.create_user_name);
+       query.bindValue(":meter_identify",saveInfo.meter_identify);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2530,10 +2547,10 @@
                                        .arg("'" + deviceMeasureInfo->manufacturer + "'")
                                        .arg("'" + deviceMeasureInfo->item_id + "'")
                                        .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'")
-                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'")
+                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString("yyyy-MM-dd HH:mm:ss") + "'")
                                        .arg("'" + deviceMeasureInfo->measure_address + "'")
-                                       .arg("'" +deviceMeasureInfo->temperature+ "'")
-                                       .arg("'" +deviceMeasureInfo->humidity+ "'")
+                                       .arg(deviceMeasureInfo->temperature.toDouble())
+                                       .arg(deviceMeasureInfo->humidity.toDouble())
                                        .arg("'" + deviceMeasureInfo->data_source + "'")
                                        .arg("'" +deviceMeasureInfo->ipri+ "'")
                                        .arg("'" + deviceMeasureInfo->ipri_unit + "'")
@@ -2544,21 +2561,21 @@
                                        .arg("'" +deviceMeasureInfo->vsec+ "'")
                                        .arg("'" + deviceMeasureInfo->vsec_unit + "'")
                                        .arg("'" +deviceMeasureInfo->appearance_function_check+ "'")
-                                       .arg("'" + deviceMeasureInfo->appearance + "'")
+                                       .arg( deviceMeasureInfo->appearance == "" ? 1: deviceMeasureInfo->appearance.toInt())
                                        .arg("'" + deviceMeasureInfo->appearance_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'")
+                                       .arg(deviceMeasureInfo->pointer_deflection_stability == "" ? 1: deviceMeasureInfo->pointer_deflection_stability.toInt())
                                        .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->tightness+ "'")
+                                       .arg(deviceMeasureInfo->tightness == "" ? 1: deviceMeasureInfo->tightness.toInt())
                                        .arg("'" + deviceMeasureInfo->tightness_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->insulation_resistance+ "'")
+                                       .arg(deviceMeasureInfo->insulation_resistance == "" ? 1:deviceMeasureInfo->insulation_resistance.toInt())
                                        .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'")
                                        .arg("'" +deviceMeasureInfo->measure_medium+ "'")
-                                       .arg("'" +deviceMeasureInfo->division+ "'")
+                                       .arg(deviceMeasureInfo->division.toDouble())
                                        .arg("'" +deviceMeasureInfo->zero_drift_result+ "'")
                                        .arg("'" +deviceMeasureInfo->work_line_equation+ "'")
-                                       .arg("'" +deviceMeasureInfo->sealing_test+ "'")
+                                       .arg(deviceMeasureInfo->sealing_test== "" ? 1: deviceMeasureInfo->sealing_test.toInt())
                                        .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'")
-                                       .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'")
+                                       .arg(deviceMeasureInfo->angle_adjust_error=="" ? 1:deviceMeasureInfo->angle_adjust_error.toInt())
                                        .arg("'" +deviceMeasureInfo->actual_division_value+ "'")
                                        .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'")
                                        .arg("'" +deviceMeasureInfo->conclusion+ "'")
@@ -2567,8 +2584,8 @@
                                        .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_id.toInt())
+                                       .arg(deviceMeasureInfo->measure_person_id.toInt())
                                        .arg("'" + deviceMeasureInfo->create_user_name + "'")
                                        .arg("'" +currentDateTime+ "'")
                                        .arg("'" +currentDateTime+ "'");
@@ -2693,7 +2710,7 @@
                                 .arg("'" +deviceDCPowerData->maximum_error+ "'")
                                 .arg("'" +deviceDCPowerData->maximum_error_unit+ "'")
                                 .arg("'" +deviceDCPowerData->absolute_error+ "'")
-                                .arg("'" +deviceDCPowerData->resolution+ "'")
+                                .arg(deviceDCPowerData->resolution.toDouble())
                                 .arg("'" +deviceDCPowerData->standard_voltage_value+ "'")
                                 .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'")
                                 .arg("'" +deviceDCPowerData->standard_resistance_value+ "'")
@@ -2701,7 +2718,7 @@
                                 .arg("'" +deviceDCPowerData->ripple_voltage+ "'")
                                 .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'")
                                 .arg("'" +deviceDCPowerData->short_term_stability+ "'")
-                                .arg("'" +deviceDCPowerData->exceed_mark+ "'")
+                                .arg(deviceDCPowerData->exceed_mark.toInt())
                                 .arg("'" +currentDateTime+ "'")
                                 .arg("'" +currentDateTime+ "'");
    }
@@ -2996,15 +3013,15 @@
 {
     QList<CheckProgramManage> result;
     QSqlQuery query;
-    bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time   "
-                                "FROM zd_verification_program_manage");
+    bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage");
     if (isSuccess) {
         while (query.next()) {
             CheckProgramManage programInfo;
             programInfo.id = query.value("id").toString();
             programInfo.check_name = query.value("check_name").toString();
+            programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString();
             programInfo.create_name = query.value("create_name").toString();
-            programInfo.create_time = query.value("create_time").toDateTime();
+//            programInfo.create_time = query.value("create_time").toDateTime();
             programInfo.remark = query.value("remark").toString();
             result.append(programInfo);
         }
@@ -3864,7 +3881,7 @@
               result.clear();
               result.append(query.value("id").toString());
               result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("indicating_value").toString());//标准器示值
+              result.append(query.value("indicating_value").toString());//标准ji器示值
               result.append(query.value("return_error").toString());//回程误差允许值
               result.append(query.value("friction_error").toString());//轻敲位移允许值
               result.append(query.value("indicating_error").toString());//示值误差允许值
@@ -4467,7 +4484,7 @@
                 //添加列头
                 QStringList head;
                 head  <<"序号"<<"检定项目"<<"输出通道"<<"单位"<<"调压器输出值"
-                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"电源电压调整率" ;
+                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"被检电源技术指标前符号"<<"电源电压调整率" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
@@ -4479,6 +4496,7 @@
                 Data.append("");//被检电源输出电压值
                 Data.append("");//被检电源输出电压最大差值  公式
                 Data.append(row[8] + row[7]);//被检电源技术指标
+                Data.append(row[8]);//被检电源技术指标单位
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
          }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
@@ -5195,15 +5213,15 @@
                 VerificationItem = "波动性测试";
                 //添加列头
                 QStringList head;
-                head  <<"序号"<< "上限点"  <<"下限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
+                head  <<"序号"<< "下限点"  <<"上限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
                         <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15"
                      <<"最大值"<<"最小值"<<"波动性" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
                 Data.append(row[0]);  //ID
-                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(showUpperLimit ?  "": row[5]);//下限点
+                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(row[3]);//单位
                 Data.append("");//示值1
                 Data.append("");//示值2
@@ -6440,3 +6458,52 @@
     return isSuccess;
 }
 
+//新建检定程序中查询所有的标准装置
+QList<StandardInfo> BaseCommonApi::getStandardInfo()
+{
+    QList<StandardInfo> result;
+    QSqlQuery query;
+    bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info ");
+    if(isSuccess){
+         while (query.next()) {
+             StandardInfo info;
+             info.id = query.value("id").toString();
+             info.standard_no = query.value("standard_no").toString();
+             info.standard_name = query.value("standard_name").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.manage_status = query.value("manage_status").toString();
+             result.append(info);
+         }
+    }else {
+        qDebug() << "select data failed: " << query.lastError().text();
+    }
+    return result;
+}
+
+//根据标准装置id查询标准设备
+QList<BizDevice> BaseCommonApi::getStandardInfoListByStandardId(QString standardId)
+{
+    QList<BizDevice> result;
+    QSqlQuery query;
+       bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type  FROM biz_equipment_info bei "
+                                   " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id "
+                                   " WHERE beser.standard_id = :standardId ");
+       query.bindValue(":standardId",standardId);
+     if (isSuccess) {
+             while (query.next()) {
+                 BizDevice device;
+                 device.id = query.value("id").toString();
+                 device.equipment_name = query.value("equipment_name").toString();
+                 device.model = query.value("model").toString();
+                 device.manufacture_no = query.value("manufacture_no").toString();
+                 device.manufacturer = query.value("manufacturer").toString();
+                 device.type = query.value("type").toString();
+                 result.append(device);
+             }
+         } else {
+             qDebug() << "Query execution failed: " << query.lastError().text();
+         }
+         return result;
+}
+
+
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 8cf703a..3aa3cb4 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -191,6 +191,7 @@
     QString model;
     QString manufacture_no;
     QString manufacturer;
+    QString type;
 };
 //标准设备管理-查看设备信息
 class CatDeviceInfor
@@ -607,6 +608,7 @@
     QString other_outcome;//结果(检定数据中有2个表格情况下的第2个表中的合格/不合格)
     QString remark;//备注/情况说明(安全阀)
     QString other_remark;//备注(检定数据中有2个表格情况下的第2个表中的备注)
+    QString meter_identify;//计量标识(生成证书后需同步更新至受检设备)
     QString create_user_id;//检定员id(系统用户id)
     QString measure_person_id;//检定员id(人员id)
     QString create_user_name;  //创建用户名
@@ -705,6 +707,7 @@
 public:
     QString id;//id
     QString check_name;//核查程序名称
+    QString belong_standard_equipment;//核查标准装置
     QString create_name;//创建人
     QDateTime create_time;//创建时间
     QString remark; //说明
@@ -1335,7 +1338,16 @@
     QDateTime create_time;
     QDateTime update_time;
 };
-
+//新建检定程序，选择标准装置
+class StandardInfo
+{
+public:
+    QString id;
+    QString standard_no;
+    QString standard_name;
+    QString dept_name;
+    QString manage_status;
+};
 
 enum class SyncRunStatus {
     Running,
@@ -1406,7 +1418,7 @@
     //标准设备管理-设备基本信息
     static QList<CatDeviceInfor>getCatDeviceInfor(QString id);
     //判断是哪个核查项
-    static  QString  getApparatus(QString id);
+//    static  QString  getApparatus(QString id,QString name);
     //直流稳压电源检定装置
     static QList<CheckDCPower>getCheckDCPower(QString item_category_id,QStringList *headList);
     //获取被检设备管理首页数据
@@ -1502,8 +1514,11 @@
     static QList<CheckAndTestedDevice> getCheckDeviceList();
     //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集
     static QList<CheckAndTestedDevice> getCheckAndTestedDeviceList();
-    //核查程序管理-核查设置-多功能校准源  参数设备id  同标准设备管理-核查项及核查点
+    //多功能校准源  核查项及核查点 参数设备id
     static QList<QStringList> getVerificationItemsMultiList(QString equipment_id,QStringList *headList);
+
+
+
     //新增核查程序
     static bool InsertCheckProgramManage(CheckProgramManage check);
     //更新核查程序  参数核查程序的id
@@ -1617,6 +1632,10 @@
    static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator);
 
    static bool saveLogToSql(QString ssql,BaseClass* entity);
+   //新建检定程序中查询所有的标准装置
+   static QList<StandardInfo> getStandardInfo();
+   //根据标准装置id查询标准设备
+   static QList<BizDevice> getStandardInfoListByStandardId(QString standardId);
 };
 
 
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 30c6341..87b3df7 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -63,6 +63,7 @@
     //ui->tableWidgetDevice->verticalHeader()->sectionResizeMode(QHeaderView::Stretch);
     //this->grabKeyboard();
     setFocusPolicy(Qt::StrongFocus);
+//    this->close()；
 }
 
 CheckWindow::~CheckWindow()
@@ -76,8 +77,9 @@
     measureCalList.clear();
     caliDataListAll.clear();
     headTableListAll.clear();
-    VisaStanEngineList.clear();
-    delete ui;
+  closeDevice();
+VisaStanEngineList.clear();
+delete ui;
 }
 
 void CheckWindow::showMethod()
@@ -1074,6 +1076,17 @@
                ui->tableWidgetCheck->setCellWidget(i,j,tmp_widget);
            }else
                ui->tableWidgetCheck->setItem(i, j, new QTableWidgetItem(dataRes[i][j]));
+            if(dataRes[i][1] == "DCV" || dataRes[i][1] == "DCI"){
+                 ui->tableWidgetCheck->hideColumn(10);
+                 ui->tableWidgetCheck->hideColumn(11);
+            }else if (dataRes[i][1] == "ACV" || dataRes[i][1] == "ACI") {
+                 ui->tableWidgetCheck->hideColumn(12);
+                 ui->tableWidgetCheck->hideColumn(13);
+            }else if (dataRes[i][1] == "R") {
+                ui->tableWidgetCheck->hideColumn(11);
+                ui->tableWidgetCheck->hideColumn(12);
+            }
+
         }
     }
     if(iEquipType==4&&nextGageIndex!=-1){
@@ -1104,8 +1117,14 @@
             }
         }else if(sLabel=="均匀性测试"){
             for(int i=0;i<ui->tableWidgetCheck->rowCount()/8;i++){
+//                QString sLimit;
+//                if(dataRes[i*8][2]!="")
+//                    sLimit = dataRes[i*8][2];
+//                else
+//                    sLimit = dataRes[i*8][3];
+//                ui->tableWidgetCheck->item(i*8,1)->setText(sLimit);
                 ui->tableWidgetCheck->setSpan(i*8,1,8,1);
-                ui->tableWidgetCheck->setSpan(i*8,2,8,2);
+//                ui->tableWidgetCheck->setSpan(i*8,2,8,2);
                 ui->tableWidgetCheck->setSpan(i*8,15,8,1);
                 ui->tableWidgetCheck->setSpan(i*8,16,8,1);
                 ui->tableWidgetCheck->setSpan(i*8,17,8,1);
@@ -1771,6 +1790,7 @@
             autoAdujstData(constsLable,i,dStdValue,dataRes);
             CheckBackColorUpdate(false,i);
             closeCmd();
+            CheckBackColorUpdate(false,i);
             Delay_MSec(2000);
         }
         caliDataList->insert(constsLable,dataRes);
@@ -2033,6 +2053,7 @@
                     }
                 }
             }
+
         }
         else if(sLabel=="负载调整率"){
             newdStdValue= TranDecimals(sLabel,dataRes[i],dStdValue);

diff --git a/softwareDirectory/AutoVerScheme/TaskManager.cpp b/softwareDirectory/AutoVerScheme/TaskManager.cpp
index c6c6c43..09bba4a 100644
--- a/softwareDirectory/AutoVerScheme/TaskManager.cpp
+++ b/softwareDirectory/AutoVerScheme/TaskManager.cpp
@@ -39,7 +39,7 @@
     }
     QString dateStr = KeyDate;
     // 生成任务单编号，这里假设编号格式是 "rwdYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("rwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdrwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
 
     return taskId;
 }
@@ -79,7 +79,7 @@
 
     QString dateStr =  ResultKeyDate;
     // 生成结果保存编号，这里假设编号格式是 "jdsjYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("jdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdjdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
     //返回结果
     return  taskId;
 }
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 2ee74d5..ea6f9d8 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -701,6 +701,11 @@
 
          return result;
 }
+
+
+
+
+
 //获取标准设备管理-基本信息
 QList<CatDeviceInfor>BaseCommonApi::getCatDeviceInfor(QString id)
 {
@@ -787,24 +792,24 @@
 
          return result;
 }
-    //根据id获取装置名称
-QString BaseCommonApi::getApparatus(QString id)
-{
-    QString result;
-    QSqlQuery query;
-    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
-                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
-        // 将参数绑定到占位符
-         query.bindValue(":id", id);
-         if (query.exec()) {
-                while (query.next()) {
-                     result = query.value("standard_name").toString();
-                }
-         }   else {
-             result = "Not Found";
-         }
-         return  result;
-}
+    //根据id获取装置名称  2024年4月23日17:53:40  主系统数据库已变
+//QString BaseCommonApi::getApparatus(QString id,QString name)
+//{
+//    QString result;
+//    QSqlQuery query;
+//    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
+//                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
+//        // 将参数绑定到占位符
+//         query.bindValue(":id", id);
+//         if (query.exec()) {
+//                while (query.next()) {
+//                     result = query.value("standard_name").toString();
+//                }
+//         }   else {
+//             result = "Not Found";
+//         }
+//         return  result;
+//}
 
 //  被检设备管理 首页
 QList<TestedDevice> BaseCommonApi::getTestedDevice()
@@ -1204,7 +1209,8 @@
                {
                    VerificationItem = "DCV";
                    //添加列头
-                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值"
+                          << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                      HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1224,6 +1230,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCVList.append(Data);
                  }
                  else if(row[2]=="ACV" )
@@ -1232,7 +1240,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"频率"  <<"频率单位"<< "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1254,6 +1262,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACVList.append(Data);
                  } else if(row[2]=="DCI" )
                  {
@@ -1261,7 +1271,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1283,6 +1293,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCIList.append(Data);
 
                  } else if(row[2]=="ACI" )
@@ -1291,7 +1303,7 @@
                      //添加列头
 
                      head   << "序号" << "检定项目" << "量" << "单位" <<"频率" <<"频率单位"  << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1315,6 +1327,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACIList.append(Data);
                  } else if(row[2]=="R")
                  {
@@ -1322,7 +1336,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"两线/四线"   << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
 
@@ -1344,6 +1358,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      RList.append(Data);
                  }
 
@@ -1970,12 +1986,12 @@
 };
 
 //查询指令库  参数 检定程序id
-QList<InstructionLib> BaseCommonApi::getInstructionLib(QString program_id)
+QList<InstructionLib> BaseCommonApi::getInstructionLib(QString verification_program_id)
 {
     QList<InstructionLib> result;
     QSqlQuery query;
        QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 ";
-       QString ssql = sql.arg(program_id);
+       QString ssql = sql.arg(verification_program_id);
        if (query.exec(ssql)) {
            while (query.next()) {
                InstructionLib instruction;
@@ -2323,7 +2339,7 @@
                   " 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 "
+                  " create_user_name,meter_identify, create_time, update_time "
                 " ) VALUES ( "
                   " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, "
                   " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, "
@@ -2336,7 +2352,7 @@
                   " :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);");
+                  " :create_user_name,:meter_identify, :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);
@@ -2390,6 +2406,7 @@
        query.bindValue(":create_user_id", saveInfo.create_user_id);
        query.bindValue(":measure_person_id", saveInfo.measure_person_id);
        query.bindValue(":create_user_name", saveInfo.create_user_name);
+       query.bindValue(":meter_identify",saveInfo.meter_identify);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2530,10 +2547,10 @@
                                        .arg("'" + deviceMeasureInfo->manufacturer + "'")
                                        .arg("'" + deviceMeasureInfo->item_id + "'")
                                        .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'")
-                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'")
+                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString("yyyy-MM-dd HH:mm:ss") + "'")
                                        .arg("'" + deviceMeasureInfo->measure_address + "'")
-                                       .arg("'" +deviceMeasureInfo->temperature+ "'")
-                                       .arg("'" +deviceMeasureInfo->humidity+ "'")
+                                       .arg(deviceMeasureInfo->temperature.toDouble())
+                                       .arg(deviceMeasureInfo->humidity.toDouble())
                                        .arg("'" + deviceMeasureInfo->data_source + "'")
                                        .arg("'" +deviceMeasureInfo->ipri+ "'")
                                        .arg("'" + deviceMeasureInfo->ipri_unit + "'")
@@ -2544,21 +2561,21 @@
                                        .arg("'" +deviceMeasureInfo->vsec+ "'")
                                        .arg("'" + deviceMeasureInfo->vsec_unit + "'")
                                        .arg("'" +deviceMeasureInfo->appearance_function_check+ "'")
-                                       .arg("'" + deviceMeasureInfo->appearance + "'")
+                                       .arg( deviceMeasureInfo->appearance == "" ? 1: deviceMeasureInfo->appearance.toInt())
                                        .arg("'" + deviceMeasureInfo->appearance_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'")
+                                       .arg(deviceMeasureInfo->pointer_deflection_stability == "" ? 1: deviceMeasureInfo->pointer_deflection_stability.toInt())
                                        .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->tightness+ "'")
+                                       .arg(deviceMeasureInfo->tightness == "" ? 1: deviceMeasureInfo->tightness.toInt())
                                        .arg("'" + deviceMeasureInfo->tightness_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->insulation_resistance+ "'")
+                                       .arg(deviceMeasureInfo->insulation_resistance == "" ? 1:deviceMeasureInfo->insulation_resistance.toInt())
                                        .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'")
                                        .arg("'" +deviceMeasureInfo->measure_medium+ "'")
-                                       .arg("'" +deviceMeasureInfo->division+ "'")
+                                       .arg(deviceMeasureInfo->division.toDouble())
                                        .arg("'" +deviceMeasureInfo->zero_drift_result+ "'")
                                        .arg("'" +deviceMeasureInfo->work_line_equation+ "'")
-                                       .arg("'" +deviceMeasureInfo->sealing_test+ "'")
+                                       .arg(deviceMeasureInfo->sealing_test== "" ? 1: deviceMeasureInfo->sealing_test.toInt())
                                        .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'")
-                                       .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'")
+                                       .arg(deviceMeasureInfo->angle_adjust_error=="" ? 1:deviceMeasureInfo->angle_adjust_error.toInt())
                                        .arg("'" +deviceMeasureInfo->actual_division_value+ "'")
                                        .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'")
                                        .arg("'" +deviceMeasureInfo->conclusion+ "'")
@@ -2567,8 +2584,8 @@
                                        .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_id.toInt())
+                                       .arg(deviceMeasureInfo->measure_person_id.toInt())
                                        .arg("'" + deviceMeasureInfo->create_user_name + "'")
                                        .arg("'" +currentDateTime+ "'")
                                        .arg("'" +currentDateTime+ "'");
@@ -2693,7 +2710,7 @@
                                 .arg("'" +deviceDCPowerData->maximum_error+ "'")
                                 .arg("'" +deviceDCPowerData->maximum_error_unit+ "'")
                                 .arg("'" +deviceDCPowerData->absolute_error+ "'")
-                                .arg("'" +deviceDCPowerData->resolution+ "'")
+                                .arg(deviceDCPowerData->resolution.toDouble())
                                 .arg("'" +deviceDCPowerData->standard_voltage_value+ "'")
                                 .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'")
                                 .arg("'" +deviceDCPowerData->standard_resistance_value+ "'")
@@ -2701,7 +2718,7 @@
                                 .arg("'" +deviceDCPowerData->ripple_voltage+ "'")
                                 .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'")
                                 .arg("'" +deviceDCPowerData->short_term_stability+ "'")
-                                .arg("'" +deviceDCPowerData->exceed_mark+ "'")
+                                .arg(deviceDCPowerData->exceed_mark.toInt())
                                 .arg("'" +currentDateTime+ "'")
                                 .arg("'" +currentDateTime+ "'");
    }
@@ -2996,15 +3013,15 @@
 {
     QList<CheckProgramManage> result;
     QSqlQuery query;
-    bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time   "
-                                "FROM zd_verification_program_manage");
+    bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage");
     if (isSuccess) {
         while (query.next()) {
             CheckProgramManage programInfo;
             programInfo.id = query.value("id").toString();
             programInfo.check_name = query.value("check_name").toString();
+            programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString();
             programInfo.create_name = query.value("create_name").toString();
-            programInfo.create_time = query.value("create_time").toDateTime();
+//            programInfo.create_time = query.value("create_time").toDateTime();
             programInfo.remark = query.value("remark").toString();
             result.append(programInfo);
         }
@@ -3864,7 +3881,7 @@
               result.clear();
               result.append(query.value("id").toString());
               result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("indicating_value").toString());//标准器示值
+              result.append(query.value("indicating_value").toString());//标准ji器示值
               result.append(query.value("return_error").toString());//回程误差允许值
               result.append(query.value("friction_error").toString());//轻敲位移允许值
               result.append(query.value("indicating_error").toString());//示值误差允许值
@@ -4467,7 +4484,7 @@
                 //添加列头
                 QStringList head;
                 head  <<"序号"<<"检定项目"<<"输出通道"<<"单位"<<"调压器输出值"
-                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"电源电压调整率" ;
+                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"被检电源技术指标前符号"<<"电源电压调整率" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
@@ -4479,6 +4496,7 @@
                 Data.append("");//被检电源输出电压值
                 Data.append("");//被检电源输出电压最大差值  公式
                 Data.append(row[8] + row[7]);//被检电源技术指标
+                Data.append(row[8]);//被检电源技术指标单位
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
          }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
@@ -5195,15 +5213,15 @@
                 VerificationItem = "波动性测试";
                 //添加列头
                 QStringList head;
-                head  <<"序号"<< "上限点"  <<"下限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
+                head  <<"序号"<< "下限点"  <<"上限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
                         <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15"
                      <<"最大值"<<"最小值"<<"波动性" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
                 Data.append(row[0]);  //ID
-                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(showUpperLimit ?  "": row[5]);//下限点
+                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(row[3]);//单位
                 Data.append("");//示值1
                 Data.append("");//示值2
@@ -6440,3 +6458,52 @@
     return isSuccess;
 }
 
+//新建检定程序中查询所有的标准装置
+QList<StandardInfo> BaseCommonApi::getStandardInfo()
+{
+    QList<StandardInfo> result;
+    QSqlQuery query;
+    bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info ");
+    if(isSuccess){
+         while (query.next()) {
+             StandardInfo info;
+             info.id = query.value("id").toString();
+             info.standard_no = query.value("standard_no").toString();
+             info.standard_name = query.value("standard_name").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.manage_status = query.value("manage_status").toString();
+             result.append(info);
+         }
+    }else {
+        qDebug() << "select data failed: " << query.lastError().text();
+    }
+    return result;
+}
+
+//根据标准装置id查询标准设备
+QList<BizDevice> BaseCommonApi::getStandardInfoListByStandardId(QString standardId)
+{
+    QList<BizDevice> result;
+    QSqlQuery query;
+       bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type  FROM biz_equipment_info bei "
+                                   " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id "
+                                   " WHERE beser.standard_id = :standardId ");
+       query.bindValue(":standardId",standardId);
+     if (isSuccess) {
+             while (query.next()) {
+                 BizDevice device;
+                 device.id = query.value("id").toString();
+                 device.equipment_name = query.value("equipment_name").toString();
+                 device.model = query.value("model").toString();
+                 device.manufacture_no = query.value("manufacture_no").toString();
+                 device.manufacturer = query.value("manufacturer").toString();
+                 device.type = query.value("type").toString();
+                 result.append(device);
+             }
+         } else {
+             qDebug() << "Query execution failed: " << query.lastError().text();
+         }
+         return result;
+}
+
+
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 8cf703a..3aa3cb4 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -191,6 +191,7 @@
     QString model;
     QString manufacture_no;
     QString manufacturer;
+    QString type;
 };
 //标准设备管理-查看设备信息
 class CatDeviceInfor
@@ -607,6 +608,7 @@
     QString other_outcome;//结果(检定数据中有2个表格情况下的第2个表中的合格/不合格)
     QString remark;//备注/情况说明(安全阀)
     QString other_remark;//备注(检定数据中有2个表格情况下的第2个表中的备注)
+    QString meter_identify;//计量标识(生成证书后需同步更新至受检设备)
     QString create_user_id;//检定员id(系统用户id)
     QString measure_person_id;//检定员id(人员id)
     QString create_user_name;  //创建用户名
@@ -705,6 +707,7 @@
 public:
     QString id;//id
     QString check_name;//核查程序名称
+    QString belong_standard_equipment;//核查标准装置
     QString create_name;//创建人
     QDateTime create_time;//创建时间
     QString remark; //说明
@@ -1335,7 +1338,16 @@
     QDateTime create_time;
     QDateTime update_time;
 };
-
+//新建检定程序，选择标准装置
+class StandardInfo
+{
+public:
+    QString id;
+    QString standard_no;
+    QString standard_name;
+    QString dept_name;
+    QString manage_status;
+};
 
 enum class SyncRunStatus {
     Running,
@@ -1406,7 +1418,7 @@
     //标准设备管理-设备基本信息
     static QList<CatDeviceInfor>getCatDeviceInfor(QString id);
     //判断是哪个核查项
-    static  QString  getApparatus(QString id);
+//    static  QString  getApparatus(QString id,QString name);
     //直流稳压电源检定装置
     static QList<CheckDCPower>getCheckDCPower(QString item_category_id,QStringList *headList);
     //获取被检设备管理首页数据
@@ -1502,8 +1514,11 @@
     static QList<CheckAndTestedDevice> getCheckDeviceList();
     //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集
     static QList<CheckAndTestedDevice> getCheckAndTestedDeviceList();
-    //核查程序管理-核查设置-多功能校准源  参数设备id  同标准设备管理-核查项及核查点
+    //多功能校准源  核查项及核查点 参数设备id
     static QList<QStringList> getVerificationItemsMultiList(QString equipment_id,QStringList *headList);
+
+
+
     //新增核查程序
     static bool InsertCheckProgramManage(CheckProgramManage check);
     //更新核查程序  参数核查程序的id
@@ -1617,6 +1632,10 @@
    static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator);
 
    static bool saveLogToSql(QString ssql,BaseClass* entity);
+   //新建检定程序中查询所有的标准装置
+   static QList<StandardInfo> getStandardInfo();
+   //根据标准装置id查询标准设备
+   static QList<BizDevice> getStandardInfoListByStandardId(QString standardId);
 };
 
 
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 30c6341..87b3df7 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -63,6 +63,7 @@
     //ui->tableWidgetDevice->verticalHeader()->sectionResizeMode(QHeaderView::Stretch);
     //this->grabKeyboard();
     setFocusPolicy(Qt::StrongFocus);
+//    this->close()；
 }
 
 CheckWindow::~CheckWindow()
@@ -76,8 +77,9 @@
     measureCalList.clear();
     caliDataListAll.clear();
     headTableListAll.clear();
-    VisaStanEngineList.clear();
-    delete ui;
+  closeDevice();
+VisaStanEngineList.clear();
+delete ui;
 }
 
 void CheckWindow::showMethod()
@@ -1074,6 +1076,17 @@
                ui->tableWidgetCheck->setCellWidget(i,j,tmp_widget);
            }else
                ui->tableWidgetCheck->setItem(i, j, new QTableWidgetItem(dataRes[i][j]));
+            if(dataRes[i][1] == "DCV" || dataRes[i][1] == "DCI"){
+                 ui->tableWidgetCheck->hideColumn(10);
+                 ui->tableWidgetCheck->hideColumn(11);
+            }else if (dataRes[i][1] == "ACV" || dataRes[i][1] == "ACI") {
+                 ui->tableWidgetCheck->hideColumn(12);
+                 ui->tableWidgetCheck->hideColumn(13);
+            }else if (dataRes[i][1] == "R") {
+                ui->tableWidgetCheck->hideColumn(11);
+                ui->tableWidgetCheck->hideColumn(12);
+            }
+
         }
     }
     if(iEquipType==4&&nextGageIndex!=-1){
@@ -1104,8 +1117,14 @@
             }
         }else if(sLabel=="均匀性测试"){
             for(int i=0;i<ui->tableWidgetCheck->rowCount()/8;i++){
+//                QString sLimit;
+//                if(dataRes[i*8][2]!="")
+//                    sLimit = dataRes[i*8][2];
+//                else
+//                    sLimit = dataRes[i*8][3];
+//                ui->tableWidgetCheck->item(i*8,1)->setText(sLimit);
                 ui->tableWidgetCheck->setSpan(i*8,1,8,1);
-                ui->tableWidgetCheck->setSpan(i*8,2,8,2);
+//                ui->tableWidgetCheck->setSpan(i*8,2,8,2);
                 ui->tableWidgetCheck->setSpan(i*8,15,8,1);
                 ui->tableWidgetCheck->setSpan(i*8,16,8,1);
                 ui->tableWidgetCheck->setSpan(i*8,17,8,1);
@@ -1771,6 +1790,7 @@
             autoAdujstData(constsLable,i,dStdValue,dataRes);
             CheckBackColorUpdate(false,i);
             closeCmd();
+            CheckBackColorUpdate(false,i);
             Delay_MSec(2000);
         }
         caliDataList->insert(constsLable,dataRes);
@@ -2033,6 +2053,7 @@
                     }
                 }
             }
+
         }
         else if(sLabel=="负载调整率"){
             newdStdValue= TranDecimals(sLabel,dataRes[i],dStdValue);
diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp
index 7167b39..82ccd24 100644
--- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp
+++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp
@@ -102,6 +102,21 @@
 
 void DialogCheckResult::on_deviceButton_clicked(int idx)
 {
+    QStringList item;
+    item << "测试"<<"校准"<<"检定"<<"校验";
+    ui->comboBoxCategory->addItems(item);
+    ui->comboBoxCategory->setCurrentIndex(0);
+
+    QStringList conclusion;
+    conclusion <<"所检项目合格"<<"不合格"<<"除*外所检项目合格";
+    ui->comboBoxConclusion->addItems(conclusion);
+    ui->comboBoxConclusion->setCurrentIndex(0);
+
+    QStringList identify;
+    identify <<"合格"<<"限用"<<"测试"<<"校准"<<"校验"<<"停用"<<"禁用"<<"封存";
+    ui->comboBoxIdentify->addItems(identify);
+    ui->comboBoxIdentify->setCurrentIndex(0);
+
     if(curDevciceIdx == idx||idx<0||idx>=taskList.length())
         return;
     curDevciceIdx = idx;
@@ -278,7 +293,8 @@
 }
 
 void DialogCheckResult::on_pushButtonSave_clicked()
-{
+{   
+    int num = ui->comboBoxCategory->currentIndex() + 1;
     checkitemlist.clear();
     SaveDeviceMeasureInfo measInfo;
     BaseCommonApi api;
@@ -290,7 +306,7 @@
     measInfo.model = taskList[curDevciceIdx].sample_model;
     measInfo.manufacturer = taskList[curDevciceIdx].manufacturer;
     measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no;
-    measInfo.measure_category = catoryList[0].item_category_name;
+    measInfo.measure_category =QString::number(num) ;
     measInfo.item_id=catoryList[0].eqptDeviceModelId;
     measInfo.temperature = ui->lineEditTemp->text();
     measInfo.humidity =ui->lineEdit_Hum->text();
@@ -298,6 +314,11 @@
     measInfo.trace_date = ui->dateEditCheck->date();
     measInfo.measure_valid_date = ui->dateEdit_Valid->dateTime();
     measInfo.outcome = ui->lineEdit_Cons->text();
+    measInfo.create_user_name = ui->comboBox_User->currentText();
+    measInfo.data_source = "自动检定系统";
+    measInfo.appearance_function_check = "外观完好，工作正常";
+    measInfo.conclusion = ui->comboBoxConclusion->currentText();
+    measInfo.meter_identify = ui->comboBoxIdentify->currentText();
     if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){
         QStringList idList = stdId;
         for(const QString& id : idList)
@@ -321,13 +342,14 @@
                    measItem.data_id = measInfo.id;
                    measItem.item_data_id = getValueByHeader(i,sLabel,"序号");
                    measItem.maximum_error_formula = getValueByHeader(i,sLabel,"最大允许误差");//最大允许误差(公式)
-                   //measItem.error_param_a = item[11];//误差参数a
-                   //measItem.error_param_b = item[12];//误差参数b
+                   measItem.error_param_a = getValueByHeader(i,sLabel,"a");//误差参数a
+                   measItem.error_param_b = getValueByHeader(i,sLabel,"b");//误差参数b
                    measItem.params = getValueByHeader(i,sLabel,"检定项目");//参数
                    measItem.capacity=getValueByHeader(i,sLabel,"量");//量
                    measItem.unit=getValueByHeader(i,sLabel,"单位");//单位
-                   //measItem.frequency=item[5];//频率
-                   //measItem.frequency_unit=item[6];//频率单位
+                   measItem.line_mode = getValueByHeader(i,sLabel,"两线/四线");
+                   measItem.frequency=getValueByHeader(i,sLabel,"频率");//频率
+                   measItem.frequency_unit=getValueByHeader(i,sLabel,"频率单位");//频率单位
                    measItem.range_range=getValueByHeader(i,sLabel,"量程");//量程
                    measItem.standard_value=getValueByHeader(i,sLabel,"标准值");//标准值(输入字段,特殊:指针式万用表输出字段)
                    measItem.indicating_value=getValueByHeader(i,sLabel,"示值");//示值(输出字段,特殊:指针式万用表输入字段)
@@ -354,10 +376,12 @@
                    measItem.voltage_output_value=getValueByHeader(i,sLabel,"被检电源输出电压值");
                    measItem.voltage_max_difference=getValueByHeader(i,sLabel,"被检电源输出电压最大差值");
                    measItem.technical_index=getValueByHeader(i,sLabel,"被检电源技术指标");
+                   measItem.technical_index_symbol=getValueByHeader(i,sLabel,"被检电源技术指标前符号");
                    measItem.voltage_regulation=getValueByHeader(i,sLabel,"电源电压调整率");
                    measItem.load_situation=getValueByHeader(i,sLabel,"负载情况");
                    measItem.voltage_difference=getValueByHeader(i,sLabel,"电压差值");
                    measItem.load_regulation=getValueByHeader(i,sLabel,"负载调整率");
+                   measItem.measure_indication_value = getValueByHeader(i,sLabel,"被检表示值");
                    BaseCommonApi::SearchSelectTable(QString::number(iEquipType),&measItem);
                }
            }
@@ -875,3 +899,4 @@
 {
     QMessageBox::warning(this, "警告", "打印");
 }
+

diff --git a/softwareDirectory/AutoVerScheme/TaskManager.cpp b/softwareDirectory/AutoVerScheme/TaskManager.cpp
index c6c6c43..09bba4a 100644
--- a/softwareDirectory/AutoVerScheme/TaskManager.cpp
+++ b/softwareDirectory/AutoVerScheme/TaskManager.cpp
@@ -39,7 +39,7 @@
     }
     QString dateStr = KeyDate;
     // 生成任务单编号，这里假设编号格式是 "rwdYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("rwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdrwd%1%2").arg(dateStr).arg(dailyTaskCounts[KeyDate], 4, 10, QChar('0'));
 
     return taskId;
 }
@@ -79,7 +79,7 @@
 
     QString dateStr =  ResultKeyDate;
     // 生成结果保存编号，这里假设编号格式是 "jdsjYYYYMMDDXXXX"，XXXX是顺序号  字段4  10进制 不足时0填充
-    QString taskId = QString("jdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
+    QString taskId = QString("zdjdsj%1%2").arg(dateStr).arg(saveResultdatanoList[ResultKeyDate], 4, 10, QChar('0'));
     //返回结果
     return  taskId;
 }
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
index 2ee74d5..ea6f9d8 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp
@@ -701,6 +701,11 @@
 
          return result;
 }
+
+
+
+
+
 //获取标准设备管理-基本信息
 QList<CatDeviceInfor>BaseCommonApi::getCatDeviceInfor(QString id)
 {
@@ -787,24 +792,24 @@
 
          return result;
 }
-    //根据id获取装置名称
-QString BaseCommonApi::getApparatus(QString id)
-{
-    QString result;
-    QSqlQuery query;
-    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
-                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
-        // 将参数绑定到占位符
-         query.bindValue(":id", id);
-         if (query.exec()) {
-                while (query.next()) {
-                     result = query.value("standard_name").toString();
-                }
-         }   else {
-             result = "Not Found";
-         }
-         return  result;
-}
+    //根据id获取装置名称  2024年4月23日17:53:40  主系统数据库已变
+//QString BaseCommonApi::getApparatus(QString id,QString name)
+//{
+//    QString result;
+//    QSqlQuery query;
+//    query.prepare("SELECT besi.standard_name FROM biz_equipment_standard_info besi WHERE besi.id = ( "
+//                   "SELECT bei.meter_standard_id FROM biz_equipment_info bei WHERE bei.id = :id )");
+//        // 将参数绑定到占位符
+//         query.bindValue(":id", id);
+//         if (query.exec()) {
+//                while (query.next()) {
+//                     result = query.value("standard_name").toString();
+//                }
+//         }   else {
+//             result = "Not Found";
+//         }
+//         return  result;
+//}
 
 //  被检设备管理 首页
 QList<TestedDevice> BaseCommonApi::getTestedDevice()
@@ -1204,7 +1209,8 @@
                {
                    VerificationItem = "DCV";
                    //添加列头
-                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                     head << "序号" << "检定项目" << "量" << "单位" << "量程"<< "标准值" << "示值"
+                          << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                      HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1224,6 +1230,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCVList.append(Data);
                  }
                  else if(row[2]=="ACV" )
@@ -1232,7 +1240,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"频率"  <<"频率单位"<< "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
                      Data.append(row[0]);  //ID
@@ -1254,6 +1262,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACVList.append(Data);
                  } else if(row[2]=="DCI" )
                  {
@@ -1261,7 +1271,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1283,6 +1293,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      DCIList.append(Data);
 
                  } else if(row[2]=="ACI" )
@@ -1291,7 +1303,7 @@
                      //添加列头
 
                      head   << "序号" << "检定项目" << "量" << "单位" <<"频率" <<"频率单位"  << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
 
                      //添加数据
@@ -1315,6 +1327,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      ACIList.append(Data);
                  } else if(row[2]=="R")
                  {
@@ -1322,7 +1336,7 @@
                      //添加列头
 
                      head << "序号" << "检定项目" << "量" << "单位" <<"两线/四线"   << "量程"
-                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力";
+                          << "标准值" << "示值" << "绝对误差" << "最大允许误差" << "分辨力"<<"a"<<"b";
                       HeadMapList->insert(VerificationItem,head);
                      //添加数据
 
@@ -1344,6 +1358,8 @@
                          Data.append("0");
                      }
                      Data.append(row[9]);  //分辨力
+                     Data.append(row[11]);//a
+                     Data.append(row[12]);//b
                      RList.append(Data);
                  }
 
@@ -1970,12 +1986,12 @@
 };
 
 //查询指令库  参数 检定程序id
-QList<InstructionLib> BaseCommonApi::getInstructionLib(QString program_id)
+QList<InstructionLib> BaseCommonApi::getInstructionLib(QString verification_program_id)
 {
     QList<InstructionLib> result;
     QSqlQuery query;
        QString sql = "SELECT * FROM zd_instruction_library WHERE device_id = %1 ";
-       QString ssql = sql.arg(program_id);
+       QString ssql = sql.arg(verification_program_id);
        if (query.exec(ssql)) {
            while (query.next()) {
                InstructionLib instruction;
@@ -2323,7 +2339,7 @@
                   " 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 "
+                  " create_user_name,meter_identify, create_time, update_time "
                 " ) VALUES ( "
                   " :id, :data_no, :measure_category, :order_id, :sample_id, :sample_name, :model, "
                   " :manufacture_no, :manufacturer, :item_id, :trace_date, :measure_valid_date, "
@@ -2336,7 +2352,7 @@
                   " :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);");
+                  " :create_user_name,:meter_identify, :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);
@@ -2390,6 +2406,7 @@
        query.bindValue(":create_user_id", saveInfo.create_user_id);
        query.bindValue(":measure_person_id", saveInfo.measure_person_id);
        query.bindValue(":create_user_name", saveInfo.create_user_name);
+       query.bindValue(":meter_identify",saveInfo.meter_identify);
        query.bindValue(":create_time", currentDateTime);
        query.bindValue(":update_time", currentDateTime);
        bool isSuccess = query.exec();
@@ -2530,10 +2547,10 @@
                                        .arg("'" + deviceMeasureInfo->manufacturer + "'")
                                        .arg("'" + deviceMeasureInfo->item_id + "'")
                                        .arg("'" + deviceMeasureInfo->trace_date.toString("yyyy-MM-dd") + "'")
-                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString() + "'")
+                                       .arg("'" + deviceMeasureInfo->measure_valid_date.toString("yyyy-MM-dd HH:mm:ss") + "'")
                                        .arg("'" + deviceMeasureInfo->measure_address + "'")
-                                       .arg("'" +deviceMeasureInfo->temperature+ "'")
-                                       .arg("'" +deviceMeasureInfo->humidity+ "'")
+                                       .arg(deviceMeasureInfo->temperature.toDouble())
+                                       .arg(deviceMeasureInfo->humidity.toDouble())
                                        .arg("'" + deviceMeasureInfo->data_source + "'")
                                        .arg("'" +deviceMeasureInfo->ipri+ "'")
                                        .arg("'" + deviceMeasureInfo->ipri_unit + "'")
@@ -2544,21 +2561,21 @@
                                        .arg("'" +deviceMeasureInfo->vsec+ "'")
                                        .arg("'" + deviceMeasureInfo->vsec_unit + "'")
                                        .arg("'" +deviceMeasureInfo->appearance_function_check+ "'")
-                                       .arg("'" + deviceMeasureInfo->appearance + "'")
+                                       .arg( deviceMeasureInfo->appearance == "" ? 1: deviceMeasureInfo->appearance.toInt())
                                        .arg("'" + deviceMeasureInfo->appearance_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->pointer_deflection_stability+ "'")
+                                       .arg(deviceMeasureInfo->pointer_deflection_stability == "" ? 1: deviceMeasureInfo->pointer_deflection_stability.toInt())
                                        .arg("'" + deviceMeasureInfo->pointer_deflection_stability_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->tightness+ "'")
+                                       .arg(deviceMeasureInfo->tightness == "" ? 1: deviceMeasureInfo->tightness.toInt())
                                        .arg("'" + deviceMeasureInfo->tightness_remark + "'")
-                                       .arg("'" +deviceMeasureInfo->insulation_resistance+ "'")
+                                       .arg(deviceMeasureInfo->insulation_resistance == "" ? 1:deviceMeasureInfo->insulation_resistance.toInt())
                                        .arg("'" + deviceMeasureInfo->insulation_resistance_remark + "'")
                                        .arg("'" +deviceMeasureInfo->measure_medium+ "'")
-                                       .arg("'" +deviceMeasureInfo->division+ "'")
+                                       .arg(deviceMeasureInfo->division.toDouble())
                                        .arg("'" +deviceMeasureInfo->zero_drift_result+ "'")
                                        .arg("'" +deviceMeasureInfo->work_line_equation+ "'")
-                                       .arg("'" +deviceMeasureInfo->sealing_test+ "'")
+                                       .arg(deviceMeasureInfo->sealing_test== "" ? 1: deviceMeasureInfo->sealing_test.toInt())
                                        .arg("'" +deviceMeasureInfo->insulation_resistance_value+ "'")
-                                       .arg("'" +deviceMeasureInfo->angle_adjust_error+ "'")
+                                       .arg(deviceMeasureInfo->angle_adjust_error=="" ? 1:deviceMeasureInfo->angle_adjust_error.toInt())
                                        .arg("'" +deviceMeasureInfo->actual_division_value+ "'")
                                        .arg("'" + deviceMeasureInfo->actual_division_value_unit + "'")
                                        .arg("'" +deviceMeasureInfo->conclusion+ "'")
@@ -2567,8 +2584,8 @@
                                        .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_id.toInt())
+                                       .arg(deviceMeasureInfo->measure_person_id.toInt())
                                        .arg("'" + deviceMeasureInfo->create_user_name + "'")
                                        .arg("'" +currentDateTime+ "'")
                                        .arg("'" +currentDateTime+ "'");
@@ -2693,7 +2710,7 @@
                                 .arg("'" +deviceDCPowerData->maximum_error+ "'")
                                 .arg("'" +deviceDCPowerData->maximum_error_unit+ "'")
                                 .arg("'" +deviceDCPowerData->absolute_error+ "'")
-                                .arg("'" +deviceDCPowerData->resolution+ "'")
+                                .arg(deviceDCPowerData->resolution.toDouble())
                                 .arg("'" +deviceDCPowerData->standard_voltage_value+ "'")
                                 .arg("'" +deviceDCPowerData->standard_voltage_value_unit+ "'")
                                 .arg("'" +deviceDCPowerData->standard_resistance_value+ "'")
@@ -2701,7 +2718,7 @@
                                 .arg("'" +deviceDCPowerData->ripple_voltage+ "'")
                                 .arg("'" +deviceDCPowerData->output_voltage_max_change+ "'")
                                 .arg("'" +deviceDCPowerData->short_term_stability+ "'")
-                                .arg("'" +deviceDCPowerData->exceed_mark+ "'")
+                                .arg(deviceDCPowerData->exceed_mark.toInt())
                                 .arg("'" +currentDateTime+ "'")
                                 .arg("'" +currentDateTime+ "'");
    }
@@ -2996,15 +3013,15 @@
 {
     QList<CheckProgramManage> result;
     QSqlQuery query;
-    bool isSuccess = query.exec("SELECT id,check_name,create_name,create_time,remark,img_path,standard_device_id,verification_documents_id,update_time   "
-                                "FROM zd_verification_program_manage");
+    bool isSuccess = query.exec("SELECT id,check_name,belong_standard_equipment,create_name,remark FROM zd_verification_program_manage");
     if (isSuccess) {
         while (query.next()) {
             CheckProgramManage programInfo;
             programInfo.id = query.value("id").toString();
             programInfo.check_name = query.value("check_name").toString();
+            programInfo.belong_standard_equipment = query.value("belong_standard_equipment").toString();
             programInfo.create_name = query.value("create_name").toString();
-            programInfo.create_time = query.value("create_time").toDateTime();
+//            programInfo.create_time = query.value("create_time").toDateTime();
             programInfo.remark = query.value("remark").toString();
             result.append(programInfo);
         }
@@ -3864,7 +3881,7 @@
               result.clear();
               result.append(query.value("id").toString());
               result.append(query.value("item_id").toString());  //检定项目ID
-              result.append(query.value("indicating_value").toString());//标准器示值
+              result.append(query.value("indicating_value").toString());//标准ji器示值
               result.append(query.value("return_error").toString());//回程误差允许值
               result.append(query.value("friction_error").toString());//轻敲位移允许值
               result.append(query.value("indicating_error").toString());//示值误差允许值
@@ -4467,7 +4484,7 @@
                 //添加列头
                 QStringList head;
                 head  <<"序号"<<"检定项目"<<"输出通道"<<"单位"<<"调压器输出值"
-                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"电源电压调整率" ;
+                     <<"被检电源输出电压值"<<"被检电源输出电压最大差值"<<"被检电源技术指标"<<"被检电源技术指标前符号"<<"电源电压调整率" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
@@ -4479,6 +4496,7 @@
                 Data.append("");//被检电源输出电压值
                 Data.append("");//被检电源输出电压最大差值  公式
                 Data.append(row[8] + row[7]);//被检电源技术指标
+                Data.append(row[8]);//被检电源技术指标单位
                 Data.append("");//电源电压调整率   公式
                 VpsAdjustmentRateList.append(Data);
          }else if(!row.isEmpty() && row[21]=="1" && row[2] =="2"){
@@ -5195,15 +5213,15 @@
                 VerificationItem = "波动性测试";
                 //添加列头
                 QStringList head;
-                head  <<"序号"<< "上限点"  <<"下限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
+                head  <<"序号"<< "下限点"  <<"上限点" <<"单位"<<"示值1"<<"示值2"<<"示值3"<<"示值4"<<"示值5"
                         <<"示值6"<<"示值7"<<"示值8"<<"示值9"<<"示值10"<<"示值11"<<"示值12"<<"示值13"<<"示值14"<<"示值15"
                      <<"最大值"<<"最小值"<<"波动性" ;
                 HeadMapList->insert(VerificationItem,head);
                 //添加数据
                 QStringList Data;
                 Data.append(row[0]);  //ID
-                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(showUpperLimit ?  "": row[5]);//下限点
+                Data.append(showUpperLimit ? row[4] : "");  // 上限点
                 Data.append(row[3]);//单位
                 Data.append("");//示值1
                 Data.append("");//示值2
@@ -6440,3 +6458,52 @@
     return isSuccess;
 }
 
+//新建检定程序中查询所有的标准装置
+QList<StandardInfo> BaseCommonApi::getStandardInfo()
+{
+    QList<StandardInfo> result;
+    QSqlQuery query;
+    bool isSuccess = query.exec("SELECT id,standard_no,standard_name,dept_name,manage_status FROM biz_equipment_standard_info ");
+    if(isSuccess){
+         while (query.next()) {
+             StandardInfo info;
+             info.id = query.value("id").toString();
+             info.standard_no = query.value("standard_no").toString();
+             info.standard_name = query.value("standard_name").toString();
+             info.dept_name = query.value("dept_name").toString();
+             info.manage_status = query.value("manage_status").toString();
+             result.append(info);
+         }
+    }else {
+        qDebug() << "select data failed: " << query.lastError().text();
+    }
+    return result;
+}
+
+//根据标准装置id查询标准设备
+QList<BizDevice> BaseCommonApi::getStandardInfoListByStandardId(QString standardId)
+{
+    QList<BizDevice> result;
+    QSqlQuery query;
+       bool isSuccess = query.exec("SELECT bei.id ,bei.equipment_name ,bei.model ,bei.manufacture_no ,bei.manufacturer,bei.type  FROM biz_equipment_info bei "
+                                   " JOIN biz_equipment_standard_equipment_relation beser ON beser.equipment_id = bei.id "
+                                   " WHERE beser.standard_id = :standardId ");
+       query.bindValue(":standardId",standardId);
+     if (isSuccess) {
+             while (query.next()) {
+                 BizDevice device;
+                 device.id = query.value("id").toString();
+                 device.equipment_name = query.value("equipment_name").toString();
+                 device.model = query.value("model").toString();
+                 device.manufacture_no = query.value("manufacture_no").toString();
+                 device.manufacturer = query.value("manufacturer").toString();
+                 device.type = query.value("type").toString();
+                 result.append(device);
+             }
+         } else {
+             qDebug() << "Query execution failed: " << query.lastError().text();
+         }
+         return result;
+}
+
+
diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h
index 8cf703a..3aa3cb4 100644
--- a/softwareDirectory/AutoVerScheme/basecommonapi.h
+++ b/softwareDirectory/AutoVerScheme/basecommonapi.h
@@ -191,6 +191,7 @@
     QString model;
     QString manufacture_no;
     QString manufacturer;
+    QString type;
 };
 //标准设备管理-查看设备信息
 class CatDeviceInfor
@@ -607,6 +608,7 @@
     QString other_outcome;//结果(检定数据中有2个表格情况下的第2个表中的合格/不合格)
     QString remark;//备注/情况说明(安全阀)
     QString other_remark;//备注(检定数据中有2个表格情况下的第2个表中的备注)
+    QString meter_identify;//计量标识(生成证书后需同步更新至受检设备)
     QString create_user_id;//检定员id(系统用户id)
     QString measure_person_id;//检定员id(人员id)
     QString create_user_name;  //创建用户名
@@ -705,6 +707,7 @@
 public:
     QString id;//id
     QString check_name;//核查程序名称
+    QString belong_standard_equipment;//核查标准装置
     QString create_name;//创建人
     QDateTime create_time;//创建时间
     QString remark; //说明
@@ -1335,7 +1338,16 @@
     QDateTime create_time;
     QDateTime update_time;
 };
-
+//新建检定程序，选择标准装置
+class StandardInfo
+{
+public:
+    QString id;
+    QString standard_no;
+    QString standard_name;
+    QString dept_name;
+    QString manage_status;
+};
 
 enum class SyncRunStatus {
     Running,
@@ -1406,7 +1418,7 @@
     //标准设备管理-设备基本信息
     static QList<CatDeviceInfor>getCatDeviceInfor(QString id);
     //判断是哪个核查项
-    static  QString  getApparatus(QString id);
+//    static  QString  getApparatus(QString id,QString name);
     //直流稳压电源检定装置
     static QList<CheckDCPower>getCheckDCPower(QString item_category_id,QStringList *headList);
     //获取被检设备管理首页数据
@@ -1502,8 +1514,11 @@
     static QList<CheckAndTestedDevice> getCheckDeviceList();
     //核查程序管理-编辑查询 选择设备 选择核查件 为标准和被检的并集
     static QList<CheckAndTestedDevice> getCheckAndTestedDeviceList();
-    //核查程序管理-核查设置-多功能校准源  参数设备id  同标准设备管理-核查项及核查点
+    //多功能校准源  核查项及核查点 参数设备id
     static QList<QStringList> getVerificationItemsMultiList(QString equipment_id,QStringList *headList);
+
+
+
     //新增核查程序
     static bool InsertCheckProgramManage(CheckProgramManage check);
     //更新核查程序  参数核查程序的id
@@ -1617,6 +1632,10 @@
    static bool InsertDeviceMeasureDataSignalGenerator(DeviceMeasureDataSignalGenerator generator);
 
    static bool saveLogToSql(QString ssql,BaseClass* entity);
+   //新建检定程序中查询所有的标准装置
+   static QList<StandardInfo> getStandardInfo();
+   //根据标准装置id查询标准设备
+   static QList<BizDevice> getStandardInfoListByStandardId(QString standardId);
 };
 
 
diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 30c6341..87b3df7 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -63,6 +63,7 @@
     //ui->tableWidgetDevice->verticalHeader()->sectionResizeMode(QHeaderView::Stretch);
     //this->grabKeyboard();
     setFocusPolicy(Qt::StrongFocus);
+//    this->close()；
 }
 
 CheckWindow::~CheckWindow()
@@ -76,8 +77,9 @@
     measureCalList.clear();
     caliDataListAll.clear();
     headTableListAll.clear();
-    VisaStanEngineList.clear();
-    delete ui;
+  closeDevice();
+VisaStanEngineList.clear();
+delete ui;
 }
 
 void CheckWindow::showMethod()
@@ -1074,6 +1076,17 @@
                ui->tableWidgetCheck->setCellWidget(i,j,tmp_widget);
            }else
                ui->tableWidgetCheck->setItem(i, j, new QTableWidgetItem(dataRes[i][j]));
+            if(dataRes[i][1] == "DCV" || dataRes[i][1] == "DCI"){
+                 ui->tableWidgetCheck->hideColumn(10);
+                 ui->tableWidgetCheck->hideColumn(11);
+            }else if (dataRes[i][1] == "ACV" || dataRes[i][1] == "ACI") {
+                 ui->tableWidgetCheck->hideColumn(12);
+                 ui->tableWidgetCheck->hideColumn(13);
+            }else if (dataRes[i][1] == "R") {
+                ui->tableWidgetCheck->hideColumn(11);
+                ui->tableWidgetCheck->hideColumn(12);
+            }
+
         }
     }
     if(iEquipType==4&&nextGageIndex!=-1){
@@ -1104,8 +1117,14 @@
             }
         }else if(sLabel=="均匀性测试"){
             for(int i=0;i<ui->tableWidgetCheck->rowCount()/8;i++){
+//                QString sLimit;
+//                if(dataRes[i*8][2]!="")
+//                    sLimit = dataRes[i*8][2];
+//                else
+//                    sLimit = dataRes[i*8][3];
+//                ui->tableWidgetCheck->item(i*8,1)->setText(sLimit);
                 ui->tableWidgetCheck->setSpan(i*8,1,8,1);
-                ui->tableWidgetCheck->setSpan(i*8,2,8,2);
+//                ui->tableWidgetCheck->setSpan(i*8,2,8,2);
                 ui->tableWidgetCheck->setSpan(i*8,15,8,1);
                 ui->tableWidgetCheck->setSpan(i*8,16,8,1);
                 ui->tableWidgetCheck->setSpan(i*8,17,8,1);
@@ -1771,6 +1790,7 @@
             autoAdujstData(constsLable,i,dStdValue,dataRes);
             CheckBackColorUpdate(false,i);
             closeCmd();
+            CheckBackColorUpdate(false,i);
             Delay_MSec(2000);
         }
         caliDataList->insert(constsLable,dataRes);
@@ -2033,6 +2053,7 @@
                     }
                 }
             }
+
         }
         else if(sLabel=="负载调整率"){
             newdStdValue= TranDecimals(sLabel,dataRes[i],dStdValue);
diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp
index 7167b39..82ccd24 100644
--- a/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp
+++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.cpp
@@ -102,6 +102,21 @@
 
 void DialogCheckResult::on_deviceButton_clicked(int idx)
 {
+    QStringList item;
+    item << "测试"<<"校准"<<"检定"<<"校验";
+    ui->comboBoxCategory->addItems(item);
+    ui->comboBoxCategory->setCurrentIndex(0);
+
+    QStringList conclusion;
+    conclusion <<"所检项目合格"<<"不合格"<<"除*外所检项目合格";
+    ui->comboBoxConclusion->addItems(conclusion);
+    ui->comboBoxConclusion->setCurrentIndex(0);
+
+    QStringList identify;
+    identify <<"合格"<<"限用"<<"测试"<<"校准"<<"校验"<<"停用"<<"禁用"<<"封存";
+    ui->comboBoxIdentify->addItems(identify);
+    ui->comboBoxIdentify->setCurrentIndex(0);
+
     if(curDevciceIdx == idx||idx<0||idx>=taskList.length())
         return;
     curDevciceIdx = idx;
@@ -278,7 +293,8 @@
 }
 
 void DialogCheckResult::on_pushButtonSave_clicked()
-{
+{   
+    int num = ui->comboBoxCategory->currentIndex() + 1;
     checkitemlist.clear();
     SaveDeviceMeasureInfo measInfo;
     BaseCommonApi api;
@@ -290,7 +306,7 @@
     measInfo.model = taskList[curDevciceIdx].sample_model;
     measInfo.manufacturer = taskList[curDevciceIdx].manufacturer;
     measInfo.manufacture_no = taskList[curDevciceIdx].manufacture_no;
-    measInfo.measure_category = catoryList[0].item_category_name;
+    measInfo.measure_category =QString::number(num) ;
     measInfo.item_id=catoryList[0].eqptDeviceModelId;
     measInfo.temperature = ui->lineEditTemp->text();
     measInfo.humidity =ui->lineEdit_Hum->text();
@@ -298,6 +314,11 @@
     measInfo.trace_date = ui->dateEditCheck->date();
     measInfo.measure_valid_date = ui->dateEdit_Valid->dateTime();
     measInfo.outcome = ui->lineEdit_Cons->text();
+    measInfo.create_user_name = ui->comboBox_User->currentText();
+    measInfo.data_source = "自动检定系统";
+    measInfo.appearance_function_check = "外观完好，工作正常";
+    measInfo.conclusion = ui->comboBoxConclusion->currentText();
+    measInfo.meter_identify = ui->comboBoxIdentify->currentText();
     if(BaseCommonApi::InsertSaveDeviceMeasureInfo(measInfo)){
         QStringList idList = stdId;
         for(const QString& id : idList)
@@ -321,13 +342,14 @@
                    measItem.data_id = measInfo.id;
                    measItem.item_data_id = getValueByHeader(i,sLabel,"序号");
                    measItem.maximum_error_formula = getValueByHeader(i,sLabel,"最大允许误差");//最大允许误差(公式)
-                   //measItem.error_param_a = item[11];//误差参数a
-                   //measItem.error_param_b = item[12];//误差参数b
+                   measItem.error_param_a = getValueByHeader(i,sLabel,"a");//误差参数a
+                   measItem.error_param_b = getValueByHeader(i,sLabel,"b");//误差参数b
                    measItem.params = getValueByHeader(i,sLabel,"检定项目");//参数
                    measItem.capacity=getValueByHeader(i,sLabel,"量");//量
                    measItem.unit=getValueByHeader(i,sLabel,"单位");//单位
-                   //measItem.frequency=item[5];//频率
-                   //measItem.frequency_unit=item[6];//频率单位
+                   measItem.line_mode = getValueByHeader(i,sLabel,"两线/四线");
+                   measItem.frequency=getValueByHeader(i,sLabel,"频率");//频率
+                   measItem.frequency_unit=getValueByHeader(i,sLabel,"频率单位");//频率单位
                    measItem.range_range=getValueByHeader(i,sLabel,"量程");//量程
                    measItem.standard_value=getValueByHeader(i,sLabel,"标准值");//标准值(输入字段,特殊:指针式万用表输出字段)
                    measItem.indicating_value=getValueByHeader(i,sLabel,"示值");//示值(输出字段,特殊:指针式万用表输入字段)
@@ -354,10 +376,12 @@
                    measItem.voltage_output_value=getValueByHeader(i,sLabel,"被检电源输出电压值");
                    measItem.voltage_max_difference=getValueByHeader(i,sLabel,"被检电源输出电压最大差值");
                    measItem.technical_index=getValueByHeader(i,sLabel,"被检电源技术指标");
+                   measItem.technical_index_symbol=getValueByHeader(i,sLabel,"被检电源技术指标前符号");
                    measItem.voltage_regulation=getValueByHeader(i,sLabel,"电源电压调整率");
                    measItem.load_situation=getValueByHeader(i,sLabel,"负载情况");
                    measItem.voltage_difference=getValueByHeader(i,sLabel,"电压差值");
                    measItem.load_regulation=getValueByHeader(i,sLabel,"负载调整率");
+                   measItem.measure_indication_value = getValueByHeader(i,sLabel,"被检表示值");
                    BaseCommonApi::SearchSelectTable(QString::number(iEquipType),&measItem);
                }
            }
@@ -875,3 +899,4 @@
 {
     QMessageBox::warning(this, "警告", "打印");
 }
+
diff --git a/softwareDirectory/AutoVerScheme/dialogcheckresult.ui b/softwareDirectory/AutoVerScheme/dialogcheckresult.ui
index d38e488..16003c0 100644
--- a/softwareDirectory/AutoVerScheme/dialogcheckresult.ui
+++ b/softwareDirectory/AutoVerScheme/dialogcheckresult.ui
@@ -134,108 +134,138 @@
    </item>
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>环境温度：</string>
-       </property>
-      </widget>
+     <item row="1" column="9">
+      <widget class="QLineEdit" name="lineEdit_Cons"/>
      </item>
-     <item row="0" column="1">
-      <widget class="QLineEdit" name="lineEditTemp"/>
-     </item>
-     <item row="0" column="2">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>环境湿度：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="3">
-      <widget class="QLineEdit" name="lineEdit_Hum"/>
-     </item>
-     <item row="0" column="4">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>检定日期：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="5">
-      <widget class="QDateEdit" name="dateEditCheck"/>
-     </item>
-     <item row="0" column="6">
-      <widget class="QLabel" name="label_8">
-       <property name="text">
-        <string>检定有效期至：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="7">
+     <item row="0" column="9">
       <widget class="QDateEdit" name="dateEdit_Valid"/>
      </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>检定地点：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
-      <widget class="QComboBox" name="comboBoxPlace">
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="2">
-      <widget class="QLabel" name="label_10">
-       <property name="text">
-        <string>检定员：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="3">
-      <widget class="QComboBox" name="comboBox_User">
-       <property name="editable">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="4">
-      <widget class="QLabel" name="label_11">
-       <property name="text">
-        <string>介质：</string>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="5">
+     <item row="1" column="7">
       <widget class="QComboBox" name="comboBox_Metrial">
        <property name="editable">
         <bool>true</bool>
        </property>
       </widget>
      </item>
-     <item row="1" column="6">
-      <widget class="QLabel" name="label_12">
+     <item row="0" column="6">
+      <widget class="QLabel" name="label_7">
        <property name="text">
-        <string>结论：</string>
+        <string>检定日期：</string>
        </property>
       </widget>
      </item>
-     <item row="1" column="7">
-      <widget class="QLineEdit" name="lineEdit_Cons"/>
+     <item row="0" column="2">
+      <widget class="QLabel" name="label_5">
+       <property name="text">
+        <string>环境温度：</string>
+       </property>
+      </widget>
      </item>
-     <item row="2" column="0">
+     <item row="0" column="3">
+      <widget class="QLineEdit" name="lineEditTemp"/>
+     </item>
+     <item row="1" column="2">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>检定地点：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <widget class="QLineEdit" name="lineEdit_Hum"/>
+     </item>
+     <item row="0" column="7">
+      <widget class="QDateEdit" name="dateEditCheck"/>
+     </item>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_14">
+       <property name="text">
+        <string>检校类别：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="comboBoxCategory"/>
+     </item>
+     <item row="1" column="6">
+      <widget class="QLabel" name="label_11">
+       <property name="text">
+        <string>介质：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QLabel" name="label_6">
+       <property name="text">
+        <string>环境湿度：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="4">
+      <widget class="QLabel" name="label_10">
+       <property name="text">
+        <string>检定员：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="5">
+      <widget class="QComboBox" name="comboBox_User">
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="3">
+      <widget class="QComboBox" name="comboBoxPlace">
+       <property name="editable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="2">
       <widget class="QLabel" name="label_13">
        <property name="text">
         <string>限用说明：</string>
        </property>
       </widget>
      </item>
-     <item row="2" column="1" colspan="7">
+     <item row="1" column="8">
+      <widget class="QLabel" name="label_12">
+       <property name="text">
+        <string>结论：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="8">
+      <widget class="QLabel" name="label_8">
+       <property name="text">
+        <string>检定有效期至：</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="1">
+      <widget class="QComboBox" name="comboBoxConclusion"/>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="label_15">
+       <property name="text">
+        <string>检定结论:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="3" colspan="5">
       <widget class="QLineEdit" name="lineEdit_Limit"/>
      </item>
+     <item row="2" column="8">
+      <widget class="QLabel" name="label_16">
+       <property name="text">
+        <string>计量标识:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="9">
+      <widget class="QComboBox" name="comboBoxIdentify"/>
+     </item>
     </layout>
    </item>
    <item>