diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 252ed5f..e1842ad 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -900,16 +900,22 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: + //多功能校准源标准装置 DataList=BaseCommonApi::getVerMultiCalClass(deviceCatoryName,CliTable[0].id,HeadList); break; case 2: + //直流稳压电源检定装置 DataList=BaseCommonApi::getDeviceMeasureItemDataDcPower(deviceCatoryName,CliTable[0].id,HeadList); break; case 4: + //0.02级活塞式压力计标准装置 DataList=BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(deviceCatoryName,CliTable[0].id,HeadList); break; + case 5: + //二等铂电阻温度计标准装置 + DataList=BaseCommonApi::getDeviceMeasureItemDataResistanceThermometer(deviceCatoryName,CliTable[0].id,HeadList); case 13: - //示波器标准装置 = 13 + //示波器标准装置 = 13 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; @@ -3399,6 +3405,17 @@ } break; } + case 5: { + //二等铂电阻 + DeviceMeasureDataPistonGauge *recordGauge = dynamic_cast(object); + if (recordGauge != nullptr) { + result = BaseCommonApi::InsertDeviceMeasureDataPistonGauge(*recordGauge); + } else { + // 处理转换失败的情况 + result = false; + } + break; + } case 13: { //示波器 DeviceOscilloscopeCalibration *recordGauge = dynamic_cast(object); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index 252ed5f..e1842ad 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -900,16 +900,22 @@ switch (CliTable[0].belong_standard_equipment.toInt()) { case 1: + //多功能校准源标准装置 DataList=BaseCommonApi::getVerMultiCalClass(deviceCatoryName,CliTable[0].id,HeadList); break; case 2: + //直流稳压电源检定装置 DataList=BaseCommonApi::getDeviceMeasureItemDataDcPower(deviceCatoryName,CliTable[0].id,HeadList); break; case 4: + //0.02级活塞式压力计标准装置 DataList=BaseCommonApi::getDeviceMeasureCalibratorPistonGauge(deviceCatoryName,CliTable[0].id,HeadList); break; + case 5: + //二等铂电阻温度计标准装置 + DataList=BaseCommonApi::getDeviceMeasureItemDataResistanceThermometer(deviceCatoryName,CliTable[0].id,HeadList); case 13: - //示波器标准装置 = 13 + //示波器标准装置 = 13 DataList=BaseCommonApi::getDeviceOscilloscopeCalibration(deviceCatoryName,CliTable[0].id,HeadList); break; @@ -3399,6 +3405,17 @@ } break; } + case 5: { + //二等铂电阻 + DeviceMeasureDataPistonGauge *recordGauge = dynamic_cast(object); + if (recordGauge != nullptr) { + result = BaseCommonApi::InsertDeviceMeasureDataPistonGauge(*recordGauge); + } else { + // 处理转换失败的情况 + result = false; + } + break; + } case 13: { //示波器 DeviceOscilloscopeCalibration *recordGauge = dynamic_cast(object); diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index fb3bed8..9bc333b 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -1445,7 +1445,7 @@ static QMap> GetDataReturnItemListByOscilloscope(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //【结果保存】示波器 static bool InsertDeviceOscilloscopeCalibration(DeviceOscilloscopeCalibration scope); - //二等铂电阻 + //【查询】检定项二等铂电阻 static QMap> getDeviceMeasureItemDataResistanceThermometer(QString itemCatoryName,QString itemId,QMap *headList); static QMap> GetDataReturnItemListByResistanceThermometer(QString itemCatoryName,QList ResultData,QMap> DataMapList,QMap *HeadMapList); //结果保存-二等铂电阻