diff --git a/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/111.xlsx b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/111.xlsx new file mode 100644 index 0000000..8ab5d0c Binary files /dev/null and b/code/cpp/car_dealer_util/proj/vs2019/car_dealer_util/111.xlsx differ diff --git a/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp b/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp index 52e36da..ba50604 100644 --- a/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp +++ b/code/cpp/car_dealer_util/source/Data/DataManipulation/Excel/LoadFromExcel.cpp @@ -795,6 +795,13 @@ void LoadRepairRecommandationFromXlsx( const std::wstring & wstring messageSendingDate = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); wstring dataSource = ReadCellStringFromXlsx( pBook, sheetIndex, rowIndex, colunmIndex++, true ); + //空行跳过 + if ( notifyNo.empty() == true ) + { + rowIndex++; + continue; + } + RepairRecommandationRecord record( branchName, orderNo, orderType, diff --git a/code/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp b/code/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp index ab1d7b0..18b7f66 100644 --- a/code/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp +++ b/code/cpp/car_dealer_util/source/Data/DataManipulation/oracle/ImportToOracle.cpp @@ -34,7 +34,8 @@ void ImportCarDealerAchievementToOracleCpp( const std::string & " :a_others_amount ); \n" "END; "; - //初始化 + //初始化 + try { Environment::Initialize(); @@ -510,7 +511,7 @@ void ImportRepairRecommandationToOracle( const std::string & string 车牌号 = QString::fromStdWString( iterOrder->getPlateNumber() ).toLocal8Bit(); string 厂牌型号 = QString::fromStdWString( iterOrder->getBrandName() ).toLocal8Bit(); - if ( 工单号.empty() == true ) + if ( 报案号.empty() == true ) { continue; } diff --git a/code/数据库/oracle/pkg/data_import_util_pkg.pck b/code/数据库/oracle/pkg/data_import_util_pkg.pck index 2bc4ff2..1f1d4de 100644 --- a/code/数据库/oracle/pkg/data_import_util_pkg.pck +++ b/code/数据库/oracle/pkg/data_import_util_pkg.pck @@ -71,6 +71,7 @@ CREATE OR REPLACE PACKAGE data_import_util_pkg IS PROCEDURE import_repairing_suggestion ( + a_branch_name VARCHAR2, a_order_no VARCHAR2, a_order_type VARCHAR2, a_notify_no VARCHAR2, @@ -271,7 +272,8 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS --֤ IF a_car_dealer_code IS NULL THEN - raise_application_error(no_cardealer_code_excpt, no_cardealer_code_text); + raise_application_error(no_cardealer_code_excpt, + no_cardealer_code_text); END IF; --ɾ @@ -325,7 +327,8 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS --֤ IF a_car_dealer_code IS NULL THEN - raise_application_error(no_cardealer_code_excpt, no_cardealer_code_text); + raise_application_error(no_cardealer_code_excpt, + no_cardealer_code_text); END IF; --ɾ @@ -341,7 +344,14 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS -- INSERT INTO car_dealer.car_dealer_scheme - (the_year, the_month, car_dealer_code, man_hour_price, part_price, claim_support, scheme, is_qualified) + (the_year, + the_month, + car_dealer_code, + man_hour_price, + part_price, + claim_support, + scheme, + is_qualified) VALUES (a_the_year, a_the_month, @@ -392,7 +402,8 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS --֤ IF a_order_no IS NULL THEN - raise_application_error(no_cardealer_code_excpt, no_cardealer_code_text); + raise_application_error(no_cardealer_code_excpt, + no_cardealer_code_text); END IF; --ɾ @@ -405,35 +416,40 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS --ڴ BEGIN - l_damage_date := to_date(a_damage_date, 'yyyy-mm-dd hh24:mi:ss'); + l_damage_date := to_date(a_damage_date, + 'yyyy-mm-dd hh24:mi:ss'); EXCEPTION WHEN OTHERS THEN l_damage_date := NULL; END; BEGIN - l_gen_date := to_date(a_generating_date, 'yyyy-mm-dd hh24:mi:ss'); + l_gen_date := to_date(a_generating_date, + 'yyyy-mm-dd hh24:mi:ss'); EXCEPTION WHEN OTHERS THEN l_gen_date := NULL; END; BEGIN - l_repairing_start_date := to_date(a_repairing_start_date, 'yyyy-mm-dd hh24:mi:ss'); + l_repairing_start_date := to_date(a_repairing_start_date, + 'yyyy-mm-dd hh24:mi:ss'); EXCEPTION WHEN OTHERS THEN l_repairing_start_date := NULL; END; BEGIN - l_repairing_finish_date := to_date(a_repairing_finish_date, 'yyyy-mm-dd hh24:mi:ss'); + l_repairing_finish_date := to_date(a_repairing_finish_date, + 'yyyy-mm-dd hh24:mi:ss'); EXCEPTION WHEN OTHERS THEN l_repairing_finish_date := NULL; END; BEGIN - l_check_date := to_date(a_check_date, 'yyyy-mm-dd hh24:mi:ss'); + l_check_date := to_date(a_check_date, + 'yyyy-mm-dd hh24:mi:ss'); EXCEPTION WHEN OTHERS THEN l_check_date := NULL; @@ -500,6 +516,7 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS PROCEDURE import_repairing_suggestion ( + a_branch_name VARCHAR2, a_order_no VARCHAR2, a_order_type VARCHAR2, a_notify_no VARCHAR2, @@ -514,21 +531,15 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS ) IS BEGIN --֤ - IF a_order_no IS NULL + IF a_notify_no IS NULL --ŲΪ THEN - raise_application_error(no_order_no_excpt, no_order_no_text); - END IF; - - IF a_notify_no IS NULL - THEN - raise_application_error(no_notify_no_excpt, no_notify_no_text); + raise_application_error(no_notify_no_excpt, + no_notify_no_text); END IF; --ɾ BEGIN - DELETE FROM car_dealer.ͷƼ a - WHERE a. = a_order_no - AND a. = a_notify_no; + DELETE FROM car_dealer.ͷƼ a WHERE a. = a_notify_no; EXCEPTION WHEN OTHERS THEN NULL; @@ -536,7 +547,8 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS -- INSERT INTO car_dealer.ͷƼ - (, + (ֹ˾, + , , , Ƽ̴, @@ -548,17 +560,25 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS ʱ, Դ) VALUES - (a_order_no, + (a_branch_name, + a_order_no, a_order_type, a_notify_no, - nvl(a_Ƽ̴, ''), - nvl(a_Ƽ, ''), - to_date(a_damage_date, 'yyyy-mm-dd hh24:mi:ss'), + nvl(a_Ƽ̴, + ''), + nvl(a_Ƽ, + ''), + to_date(a_damage_date, + 'yyyy-mm-dd hh24:mi:ss'), a_plateNo, - nvl(a_brand_name, ''), - nvl(a_message_type, ''), - to_date(a_sending_date, 'yyyy-mm-dd hh24:mi:ss'), - nvl(a_data_source, '')); + nvl(a_brand_name, + ''), + nvl(a_message_type, + ''), + to_date(a_sending_date, + 'yyyy-mm-dd hh24:mi:ss'), + nvl(a_data_source, + '')); COMMIT; @@ -738,28 +758,41 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS --֤ IF a_ IS NULL THEN - raise_application_error(no_notify_no_excpt, no_notify_no_text); + raise_application_error(no_notify_no_excpt, + no_notify_no_text); END IF; --ɾ BEGIN - DELETE car_dealer.ͷ޼ر a WHERE a. = a_; + DELETE car_dealer.ͷ޼ر a + WHERE a. = a_ + AND a. = a_; EXCEPTION WHEN OTHERS THEN NULL; END; -- - l_ := ַת(a_, 'yyyy-mm-dd hh24:mi:ss'); - l_ := ַת(a_, 'yyyy-mm-dd hh24:mi:ss'); - l_ݸ := ַת(a_ݸ, 'yyyy-mm-dd hh24:mi:ss'); - l_һʱ := ַת(a_һʱ, 'yyyy-mm-dd hh24:mi:ss'); - l_ڶʱ := ַת(a_ڶʱ, 'yyyy-mm-dd hh24:mi:ss'); - l_ʱ := ַת(a_ʱ, 'yyyy-mm-dd hh24:mi:ss'); - l_˼ͨʱ := ַת(a_˼ͨʱ, 'yyyy-mm-dd hh24:mi:ss'); - l_ʱ := ַת(a_ʱ, 'yyyy-mm-dd hh24:mi:ss'); - l_ʱ := ַת(a_ʱ, 'yyyy-mm-dd hh24:mi:ss'); - l_᰸ʱ := ַת(a_᰸ʱ, 'yyyy-mm-dd hh24:mi:ss'); + l_ := ַת(a_, + 'yyyy-mm-dd hh24:mi:ss'); + l_ := ַת(a_, + 'yyyy-mm-dd hh24:mi:ss'); + l_ݸ := ַת(a_ݸ, + 'yyyy-mm-dd hh24:mi:ss'); + l_һʱ := ַת(a_һʱ, + 'yyyy-mm-dd hh24:mi:ss'); + l_ڶʱ := ַת(a_ڶʱ, + 'yyyy-mm-dd hh24:mi:ss'); + l_ʱ := ַת(a_ʱ, + 'yyyy-mm-dd hh24:mi:ss'); + l_˼ͨʱ := ַת(a_˼ͨʱ, + 'yyyy-mm-dd hh24:mi:ss'); + l_ʱ := ַת(a_ʱ, + 'yyyy-mm-dd hh24:mi:ss'); + l_ʱ := ַת(a_ʱ, + 'yyyy-mm-dd hh24:mi:ss'); + l_᰸ʱ := ַת(a_᰸ʱ, + 'yyyy-mm-dd hh24:mi:ss'); -- INSERT INTO car_dealer.ͷ޼ر @@ -1090,7 +1123,8 @@ CREATE OR REPLACE PACKAGE BODY data_import_util_pkg IS l_date DATE; BEGIN BEGIN - l_date := to_date(a_date, a_formate); + l_date := to_date(a_date, + a_formate); EXCEPTION WHEN OTHERS THEN l_date := NULL; diff --git a/数据/核价清单-字段.xlsx b/数据/核价清单-字段.xlsx new file mode 100644 index 0000000..b07c04a Binary files /dev/null and b/数据/核价清单-字段.xlsx differ