diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5bd9a15..2b127aa 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -20,13 +20,6 @@ SOURCES += \ basecommonapi.cpp \ - biz_device_manage_serve.cpp \ - check_data_manage_serve.cpp \ - create_tasks_serve.cpp \ - my_tasks_serve.cpp \ - technique_file_serve.cpp \ - tested_device_manage_serve.cpp \ - verification_data_management_serve.cpp \ beexamined_deviceitem.cpp \ checkmethodmanage.cpp \ checkwindow.cpp \ @@ -60,13 +53,6 @@ Visa/Include/visatype.h \ Visa/Include/vpptype.h \ basecommonapi.h \ - biz_device_manage_serve.h \ - check_data_manage_serve.h \ - create_tasks_serve.h \ - my_tasks_serve.h \ - technique_file_serve.h \ - tested_device_manage_serve.h \ - verification_data_management_serve.h \ InfoBase.h \ beexamined_deviceitem.h \ checkmethodmanage.h \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5bd9a15..2b127aa 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -20,13 +20,6 @@ SOURCES += \ basecommonapi.cpp \ - biz_device_manage_serve.cpp \ - check_data_manage_serve.cpp \ - create_tasks_serve.cpp \ - my_tasks_serve.cpp \ - technique_file_serve.cpp \ - tested_device_manage_serve.cpp \ - verification_data_management_serve.cpp \ beexamined_deviceitem.cpp \ checkmethodmanage.cpp \ checkwindow.cpp \ @@ -60,13 +53,6 @@ Visa/Include/visatype.h \ Visa/Include/vpptype.h \ basecommonapi.h \ - biz_device_manage_serve.h \ - check_data_manage_serve.h \ - create_tasks_serve.h \ - my_tasks_serve.h \ - technique_file_serve.h \ - tested_device_manage_serve.h \ - verification_data_management_serve.h \ InfoBase.h \ beexamined_deviceitem.h \ checkmethodmanage.h \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index 39bcba0..b379c65 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {2746248a-b112-4e0f-9ae0-9e61f2a42309} + {94e4c4a1-54d4-412c-b108-da01d63f0d97} ProjectExplorer.Project.ActiveTarget @@ -55,40 +55,23 @@ ProjectExplorer.Project.PluginSettings - - true - true - true - true - - 0 - true -fno-delayed-template-parsing true - - true - Builtin.TidyAndClazy - 4 - - - - true - ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit 0 0 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -136,7 +119,7 @@ 2 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -184,7 +167,7 @@ 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -304,8 +287,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -316,7 +299,7 @@ false true - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug 1 @@ -324,14 +307,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit 0 0 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -379,7 +362,7 @@ 2 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -427,7 +410,7 @@ 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -547,14 +530,14 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + ProjectExplorer.CustomExecutableRunConfiguration + false false true - true false false true diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5bd9a15..2b127aa 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -20,13 +20,6 @@ SOURCES += \ basecommonapi.cpp \ - biz_device_manage_serve.cpp \ - check_data_manage_serve.cpp \ - create_tasks_serve.cpp \ - my_tasks_serve.cpp \ - technique_file_serve.cpp \ - tested_device_manage_serve.cpp \ - verification_data_management_serve.cpp \ beexamined_deviceitem.cpp \ checkmethodmanage.cpp \ checkwindow.cpp \ @@ -60,13 +53,6 @@ Visa/Include/visatype.h \ Visa/Include/vpptype.h \ basecommonapi.h \ - biz_device_manage_serve.h \ - check_data_manage_serve.h \ - create_tasks_serve.h \ - my_tasks_serve.h \ - technique_file_serve.h \ - tested_device_manage_serve.h \ - verification_data_management_serve.h \ InfoBase.h \ beexamined_deviceitem.h \ checkmethodmanage.h \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index 39bcba0..b379c65 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {2746248a-b112-4e0f-9ae0-9e61f2a42309} + {94e4c4a1-54d4-412c-b108-da01d63f0d97} ProjectExplorer.Project.ActiveTarget @@ -55,40 +55,23 @@ ProjectExplorer.Project.PluginSettings - - true - true - true - true - - 0 - true -fno-delayed-template-parsing true - - true - Builtin.TidyAndClazy - 4 - - - - true - ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit 0 0 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -136,7 +119,7 @@ 2 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -184,7 +167,7 @@ 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -304,8 +287,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -316,7 +299,7 @@ false true - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug 1 @@ -324,14 +307,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit 0 0 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -379,7 +362,7 @@ 2 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -427,7 +410,7 @@ 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -547,14 +530,14 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + ProjectExplorer.CustomExecutableRunConfiguration + false false true - true false false true diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index e29aec1..109fb2d 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,15 +306,15 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString item_category_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id) { QList result; QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number" - ", datum_point, resistance_value, resistance_value_unit, remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE item_category_id = (SELECT bescic.id FROM biz_equipment_standard_check_item_category bescic WHERE bescic.belong_standard_equipment_name = :item_category_id))"); - // 将参数绑定到占位符 - query.bindValue(":item_category_id", item_category_id); + query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " + " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); + // 将参数绑定到占位符 1693435753272557570 + query.bindValue(":equipment_id", equipment_id); if (query.exec()) { while (query.next()) { CheckDCPower checkDCPower; diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro index 5bd9a15..2b127aa 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro @@ -20,13 +20,6 @@ SOURCES += \ basecommonapi.cpp \ - biz_device_manage_serve.cpp \ - check_data_manage_serve.cpp \ - create_tasks_serve.cpp \ - my_tasks_serve.cpp \ - technique_file_serve.cpp \ - tested_device_manage_serve.cpp \ - verification_data_management_serve.cpp \ beexamined_deviceitem.cpp \ checkmethodmanage.cpp \ checkwindow.cpp \ @@ -60,13 +53,6 @@ Visa/Include/visatype.h \ Visa/Include/vpptype.h \ basecommonapi.h \ - biz_device_manage_serve.h \ - check_data_manage_serve.h \ - create_tasks_serve.h \ - my_tasks_serve.h \ - technique_file_serve.h \ - tested_device_manage_serve.h \ - verification_data_management_serve.h \ InfoBase.h \ beexamined_deviceitem.h \ checkmethodmanage.h \ diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user index 39bcba0..b379c65 100644 --- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user +++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {2746248a-b112-4e0f-9ae0-9e61f2a42309} + {94e4c4a1-54d4-412c-b108-da01d63f0d97} ProjectExplorer.Project.ActiveTarget @@ -55,40 +55,23 @@ ProjectExplorer.Project.PluginSettings - - true - true - true - true - - 0 - true -fno-delayed-template-parsing true - - true - Builtin.TidyAndClazy - 4 - - - - true - ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MinGW 64-bit - Desktop Qt 5.14.2 MinGW 64-bit - qt.qt5.5142.win64_mingw73_kit + Desktop Qt 5.14.2 MinGW 32-bit + Desktop Qt 5.14.2 MinGW 32-bit + qt.qt5.5142.win32_mingw73_kit 0 0 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug true @@ -136,7 +119,7 @@ 2 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release true @@ -184,7 +167,7 @@ 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile true @@ -304,8 +287,8 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + Qt4ProjectManager.Qt4RunConfiguration:D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + D:/work/code/BJJZ/svntest/softwareDirectory/AutoVerScheme/AutoVerScheme.pro false @@ -316,7 +299,7 @@ false true - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug 1 @@ -324,14 +307,14 @@ ProjectExplorer.Project.Target.1 - Desktop Qt 5.14.2 MinGW 32-bit - Desktop Qt 5.14.2 MinGW 32-bit - qt.qt5.5142.win32_mingw73_kit + Desktop Qt 5.14.2 MinGW 64-bit + Desktop Qt 5.14.2 MinGW 64-bit + qt.qt5.5142.win64_mingw73_kit 0 0 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Debug + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Debug true @@ -379,7 +362,7 @@ 2 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Release + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Release true @@ -427,7 +410,7 @@ 0 - D:/dev/software/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_32_bit-Profile + D:/work/code/BJJZ/svntest/softwareDirectory/build-AutoVerScheme-Desktop_Qt_5_14_2_MinGW_64_bit-Profile true @@ -547,14 +530,14 @@ 2 - Qt4ProjectManager.Qt4RunConfiguration:D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro - D:/dev/software/softwareDirectory/AutoVerScheme/AutoVerScheme.pro + + ProjectExplorer.CustomExecutableRunConfiguration + false false true - true false false true diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.cpp b/softwareDirectory/AutoVerScheme/basecommonapi.cpp index e29aec1..109fb2d 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.cpp +++ b/softwareDirectory/AutoVerScheme/basecommonapi.cpp @@ -306,15 +306,15 @@ //直流稳压电源检定装置 -QListBaseCommonApi::getCheckDCPower(QString item_category_id) +QListBaseCommonApi::getCheckDCPower(QString equipment_id) { QList result; QSqlQuery query; - query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number" - ", datum_point, resistance_value, resistance_value_unit, remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE item_category_id = (SELECT bescic.id FROM biz_equipment_standard_check_item_category bescic WHERE bescic.belong_standard_equipment_name = :item_category_id))"); - // 将参数绑定到占位符 - query.bindValue(":item_category_id", item_category_id); + query.prepare("SELECT besciddp.id ,besciddp.params,besciddp.unit,resolution,besciddp.urel,besciddp.check_type,datum_point,cycle_number " + " ,datum_point,resistance_value,resistance_value_unit,remark FROM biz_equipment_standard_check_item_data_dc_power besciddp WHERE equipment_id = :equipment_id "); + // 将参数绑定到占位符 1693435753272557570 + query.bindValue(":equipment_id", equipment_id); if (query.exec()) { while (query.next()) { CheckDCPower checkDCPower; diff --git a/softwareDirectory/AutoVerScheme/basecommonapi.h b/softwareDirectory/AutoVerScheme/basecommonapi.h index 10dfe15..d6045a9 100644 --- a/softwareDirectory/AutoVerScheme/basecommonapi.h +++ b/softwareDirectory/AutoVerScheme/basecommonapi.h @@ -6,6 +6,10 @@ #include #include "QList" #include "databaseconnection.h" + + +// + //部门任务 class Dept { public: