From 366e42aeaeb01e82d489001c80d9602f8ba58357 Mon Sep 17 00:00:00 2001 From: Arthur Egberink Date: Thu, 3 Nov 2022 10:06:14 +0000 Subject: [PATCH] LOGC#75016 -- SAP bestanden geautomatiseerd verwerken svn path=/Customer/trunk/; revision=57854 --- LOGC/logc.sql | 66 ++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 38 deletions(-) diff --git a/LOGC/logc.sql b/LOGC/logc.sql index 23e549c0c..e996a7981 100644 --- a/LOGC/logc.sql +++ b/LOGC/logc.sql @@ -992,11 +992,37 @@ BEGIN AND UPPER (v_PlanWorkCosts) = 'PLAN WORK COSTS' AND UPPER (v_InvoiceReceived) = 'INVOICE RECEIVED' AND UPPER (v_InvoicePosted) = 'INVOICE POSTED' - AND UPPER (v_ProjektManagerLogin) = 'PROJECTMANAGER NAME' -- Name niet opnemen + AND UPPER (v_ProjektManagerLogin) = 'PROJECT MANAGER' AND UPPER (v_SalesPersonNr) = 'SALES PERSON' AND UPPER (v_NameSalesPerson) = 'NAME SALES REPRESEN' THEN header_is_valid := 1; + ELSE + IF rec1.fac_imp_file_index = 1 + THEN + IF UPPER (v_KlantOmschrijving) <> 'DESCRIPTION' THEN v_aanduiding := CHR(10) || v_KlantOmschrijving || ' - DESCRIPTION'; END IF; + IF UPPER (v_WBSelement) <> 'WBS ELEMENT' THEN v_aanduiding := CHR(10) || v_aanduiding || v_WBSelement || ' - WBS ELEMENT'; END IF; + IF UPPER (v_Projectsoort) <> 'PROJECT TYPE' THEN v_aanduiding := CHR(10) || v_aanduiding || v_Projectsoort || ' - PROJECT TYPE'; END IF; + IF UPPER (v_Omschrijving) <> 'DESCRIPTION' THEN v_aanduiding := CHR(10) || v_aanduiding || v_Omschrijving || ' - DESCRIPTION'; END IF; + IF UPPER (v_Status) <> 'STATUS' THEN v_aanduiding := CHR(10) || v_aanduiding || v_Status || ' - STATUS'; END IF; + IF UPPER (v_Debiteur) <> 'CUSTOMER' THEN v_aanduiding := CHR(10) || v_aanduiding || v_Debiteur || ' - CUSTOMER'; END IF; + IF UPPER (v_PlanWorktime) <> 'PLAN WORKTIME' THEN v_aanduiding := CHR(10) || v_aanduiding || v_PlanWorktime || ' - PLAN WORKTIME'; END IF; + IF UPPER (v_ActualWorktime) <> 'ACTUAL WORKTIME' THEN v_aanduiding := CHR(10) || v_aanduiding || v_ActualWorktime || ' - ACTUAL WORKTIME'; END IF; + IF UPPER (v_ActualWorkCosts) <> 'ACTUAL WORK COSTS' THEN v_aanduiding := CHR(10) || v_aanduiding || v_ActualWorkCosts || ' - ACTUAL WORK COSTS'; END IF; + IF UPPER (v_PlanWorkCosts) <> 'PLAN WORK COSTS' THEN v_aanduiding := CHR(10) || v_aanduiding || v_PlanWorkCosts || ' - PLAN WORK COSTS'; END IF; + IF UPPER (v_InvoiceReceived) <> 'INVOICE RECEIVED' THEN v_aanduiding := CHR(10) || v_aanduiding || v_InvoiceReceived || ' - INVOICE RECEIVED'; END IF; + IF UPPER (v_InvoicePosted) <> 'INVOICE POSTED' THEN v_aanduiding := CHR(10) || v_aanduiding || v_InvoicePosted || ' - INVOICE POSTED'; END IF; + IF UPPER (v_ProjektManagerLogin) <> 'PROJECT MANAGER' THEN v_aanduiding := CHR(10) || v_aanduiding || v_ProjektManagerLogin || ' - PROJECT MANAGER'; END IF; + IF UPPER (v_SalesPersonNr) <> 'SALES PERSON' THEN v_aanduiding := CHR(10) || v_aanduiding || v_SalesPersonNr || ' - SALES PERSON'; END IF; + IF UPPER (v_NameSalesPerson) <> 'NAME SALES REPRESEN' THEN v_aanduiding := CHR(10) || v_aanduiding || v_NameSalesPerson || ' - NAME SALES REPRESEN'; END IF; + + fac.imp_writelog ( + p_import_key, + 'E', + 'Ongeldig importbestand', + 'Geen header of header niet volgens specificatie!' + || v_aanduiding); + END IF; END IF; ELSE v_count_tot := v_count_tot + 1; @@ -1250,43 +1276,7 @@ BEGIN AND prs_kostenplaatsgrp_key IN (22, 23) -- Nacalculatie, Fixed budget AND prs_kostenplaats_eind IS NULL; - IF header_is_valid = 0 - THEN - fac.imp_writelog ( - p_import_key, - 'E', - 'Ongeldig importbestand', - 'Geen header of header niet volgens specificatie!' - || '(' - || v_KlantOmschrijving - || '-' - || v_WBSelement - || '-' - || v_Projectsoort - || '-' - || v_Omschrijving - || '-' - || v_Status - || '-' - || v_Debiteur - || '-' - || v_ActualWorktime - || '-' - || v_ActualWorkCosts - || '-' - || v_PlanWorkCosts - || '-' - || v_InvoiceReceived - || '-' - || v_InvoicePosted - || '-' - || v_ProjektManagerLogin - || '-' - || v_SalesPersonNr - || '-' - || v_NameSalesPerson - || ')'); - END IF; + COMMIT;