diff --git a/HPJI/hpji.sql b/HPJI/hpji.sql index b89782497..c154e9e1f 100644 --- a/HPJI/hpji.sql +++ b/HPJI/hpji.sql @@ -44,21 +44,21 @@ CREATE OR REPLACE PACKAGE BODY HPJI AS PROCEDURE hpji_noti_per_controle AS - p_applname VARCHAR2 (50) := 'NOTIFICATIE_PLANNEN_TAAK'; + p_applname VARCHAR2 (50) := 'NOTIFICATIE_PLANNEN_TAAK'; oracle_err_num NUMBER; oracle_err_mes VARCHAR2 (200); v_errorhint VARCHAR2 (100); v_aanduiding VARCHAR2 (100); CURSOR c IS SELECT * FROM HPJI_V_NOTI_TAKEN; - BEGIN v_errorhint := 'init'; FOR rec IN c LOOP BEGIN - v_aanduiding := rec.taak_omschr || ' betreffende; ' || rec.betreft; + v_aanduiding := + rec.taak_omschr || ' betreffende; ' || rec.betreft; INSERT INTO fac_notificatie (fac_srtnotificatie_key, fac_notificatie_status, @@ -73,7 +73,10 @@ AS 2, rec.to_key, rec.to_email, - rec.taak_omschr || ' betreffende; ' || rec.betreft || ' in te plannen', + rec.taak_omschr + || ' betreffende; ' + || rec.betreft + || ' in te plannen', rec.ins_deel_key, 4, 2, @@ -88,7 +91,9 @@ AS EXCEPTION WHEN OTHERS THEN - v_errorhint := 'Toevoegen notificatie periodieke controle ' || rec.betreft; + v_errorhint := + 'Toevoegen notificatie periodieke controle ' + || rec.betreft; oracle_err_num := SQLCODE; oracle_err_mes := SUBSTR (SQLERRM, 1, 100); fac.writelog ( @@ -108,10 +113,11 @@ AS v_errorhint := 'Notificaties in te plannen periodieke taken'; oracle_err_num := SQLCODE; oracle_err_mes := SUBSTR (SQLERRM, 1, 100); - fac.writelog (p_applname, - 'E', - 'Error ' || oracle_err_num || '/' || oracle_err_mes, - v_errorhint); + fac.writelog ( + p_applname, + 'E', + 'Error ' || oracle_err_num || '/' || oracle_err_mes, + v_errorhint); END hpji_noti_per_controle; PROCEDURE rap_it_inventaris_jaar (user_key IN NUMBER, @@ -312,7 +318,7 @@ AS c.cnt_contract_nummer_intern, c.cnt_contract_omschrijving, b.prs_bedrijf_naam, - c.prs_perslid_key_beh AS accountmanager, + NULL AS accountmanager, c.prs_perslid_key_eig AS teamleider, NULL AS business_controller, 1421 AS stdmelding, @@ -325,11 +331,13 @@ AS AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -1) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -1)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 570 --bespreek contract UNION ALL --bespreek contract (Onderaanneming en Raamovereenkomst) @@ -339,7 +347,7 @@ AS c.cnt_contract_omschrijving, b.prs_bedrijf_naam, c.prs_perslid_key_beh AS accountmanager, - c.prs_perslid_key_eig AS teamleider, + NULL AS teamleider, NULL AS business_controller, 1403 AS stdmelding, 'Bespreek contract' AS taak @@ -351,11 +359,13 @@ AS AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -1) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -1)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 570 --bespreek contract UNION ALL --Indienen aanvraag @@ -364,7 +374,7 @@ AS c.cnt_contract_nummer_intern, c.cnt_contract_omschrijving, b.prs_bedrijf_naam, - c.prs_perslid_key_beh AS accountmanager, + NULL AS accountmanager, c.prs_perslid_key_eig AS teamleider, 109570 AS business_controller, 1404 AS stdmelding, @@ -373,18 +383,20 @@ AS cnt_kenmerkcontract d, cnt_kenmerk ck, prs_bedrijf b - WHERE c.ins_discipline_key IN (1821, - 1822, - 1842, - 1901) + WHERE c.ins_discipline_key IN (1821)--, --Subsidies + --1822, --Raamovereenkomst (moet deze ook?) + --1842, --Detacheringen (moet deze ook?) + --1901) --Onderaannemers (moet deze ook?) AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -2) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -2)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 571 --Indienen aanvraag UNION ALL -- Tussentijdse verantwoording (Subsidie) @@ -393,8 +405,8 @@ AS c.cnt_contract_nummer_intern, c.cnt_contract_omschrijving, b.prs_bedrijf_naam, - c.prs_perslid_key_beh AS accountmanager, - c.prs_perslid_key_eig AS teamleider, + NULL AS accountmanager, + c.prs_perslid_key_eig AS teamleider, NULL AS business_controller, 1406 AS stdmelding, 'Tussentijdse verantwoording' AS taak @@ -406,11 +418,13 @@ AS AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -2) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -2)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 572 --Tussentijdse verantwoording UNION ALL -- Tussentijdse verantwoording (Raamovereenkomst) @@ -432,11 +446,13 @@ AS AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -2) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -2)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 572 --Tussentijdse verantwoording UNION ALL --Indienen vaststelling @@ -445,8 +461,8 @@ AS c.cnt_contract_nummer_intern, c.cnt_contract_omschrijving, b.prs_bedrijf_naam, - c.prs_perslid_key_beh AS accountmanager, - c.prs_perslid_key_eig AS teamleider, + NULL AS accountmanager, + c.prs_perslid_key_eig AS teamleider, 109570 AS business_controller, 1405 AS stdmelding, 'Indienen vaststelling' AS taak @@ -454,18 +470,20 @@ AS cnt_kenmerkcontract d, cnt_kenmerk ck, prs_bedrijf b - WHERE c.ins_discipline_key IN (1821, - 1822, - 1842, - 1901) + WHERE c.ins_discipline_key IN (1821)--, --Subsidies + --1822, --Raamovereenkomst (moet deze ook?) + --1842, --Detacheringen (moet deze ook?) + --1901) --Onderaannemers (moet deze ook?) AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -2) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -2)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 567 --Indienen vaststelling UNION ALL --contract loopt af (Subsidie en Detachering) @@ -474,7 +492,7 @@ AS c.cnt_contract_nummer_intern, c.cnt_contract_omschrijving, b.prs_bedrijf_naam, - c.prs_perslid_key_beh AS accountmanager, + NULL AS accountmanager, c.prs_perslid_key_eig AS teamleider, NULL AS business_controller, 1402 AS stdmelding, @@ -483,25 +501,27 @@ AS cnt_kenmerkcontract d, cnt_kenmerk ck, prs_bedrijf b - WHERE c.ins_discipline_key IN (1821, 1842) + WHERE c.ins_discipline_key IN (1821, 1842) --Subsidies & Detacheringen AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -2) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -2)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 569 --contract loopt af UNION ALL - --contract loopt af (Raamovereenkomst) + --contract loopt af (Raamovereenkomst & onderaanneming) SELECT c.ins_discipline_key, c.cnt_contract_key, c.cnt_contract_nummer_intern, c.cnt_contract_omschrijving, b.prs_bedrijf_naam, c.prs_perslid_key_beh AS accountmanager, - c.prs_perslid_key_eig AS teamleider, + NULL AS teamleider, NULL AS business_controller, 1423 AS stdmelding, 'Contract loopt af' AS taak @@ -509,41 +529,17 @@ AS cnt_kenmerkcontract d, cnt_kenmerk ck, prs_bedrijf b - WHERE c.ins_discipline_key IN (1822) + WHERE c.ins_discipline_key IN (1822, 1901) -- Raamovereenkomst & Onderaanneming AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -3) = - SYSDATE - AND ck.cnt_srtkenmerk_key = 569 --contract loopt af - UNION ALL - --contract loopt af (Onderaanneming) - SELECT c.ins_discipline_key, - c.cnt_contract_key, - c.cnt_contract_nummer_intern, - c.cnt_contract_omschrijving, - b.prs_bedrijf_naam, - c.prs_perslid_key_beh AS accountmanager, - c.prs_perslid_key_eig AS teamleider, - NULL AS business_controller, - 1423 AS stdmelding, - 'Contract loopt af' AS taak - FROM cnt_contract c, - cnt_kenmerkcontract d, - cnt_kenmerk ck, - prs_bedrijf b - WHERE c.ins_discipline_key IN (1901) - AND c.cnt_contract_key = d.cnt_contract_key - AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key - AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -6) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -3)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 569 --contract loopt af UNION ALL --Accountantsverklaring @@ -561,18 +557,20 @@ AS cnt_kenmerkcontract d, cnt_kenmerk ck, prs_bedrijf b - WHERE c.ins_discipline_key IN (1821, - 1822, - 1842, - 1901) + WHERE c.ins_discipline_key IN (1821)--, --Subsidies + --1822, --Raamovereenkomst (moet deze ook?) + --1842, --Detacheringen (moet deze ook?) + --1901) --Onderaannemers (moet deze ook?) AND c.cnt_contract_key = d.cnt_contract_key AND d.cnt_kenmerk_key = ck.cnt_kenmerk_key AND c.cnt_prs_bedrijf_key = b.prs_bedrijf_key - AND ADD_MONTHS ( - fac.safe_to_date (d.cnt_kenmerkcontract_waarde, - 'dd-mm-yyyy'), - -3) = - SYSDATE + AND TRUNC ( + ADD_MONTHS ( + fac.safe_to_date ( + d.cnt_kenmerkcontract_waarde, + 'dd-mm-yyyy'), + -3)) = + TRUNC (SYSDATE) AND ck.cnt_srtkenmerk_key = 568; --Accountantsverklaring BEGIN v_uitvoerder := 4; --Standaard de persoon Facilitor @@ -583,11 +581,14 @@ AS BEGIN v_errorhint := 'init'; + v_accm := NULL; + v_teaml := NULL; + v_buscontr := NULL; -- Bepalen uitvoerder en kostenplaats v_errorhint := 'Bepalen uitvoerder en kostenplaats'; - SELECT MIN (p.prs_perslid_key), MIN (d.prs_kostenplaats_key) + SELECT NVL(MIN (p.prs_perslid_key),4), NVL(MIN (d.prs_kostenplaats_key),1910) INTO v_uitvoerder, v_kostenplaats FROM prs_perslid p, prs_afdeling d WHERE p.prs_afdeling_key = d.prs_afdeling_key @@ -608,7 +609,7 @@ AS v_errorhint := 'notificatie_accountmanager'; v_accm := rec.accountmanager; - IF v_accm <> NULL + IF v_accm IS NOT NULL THEN FAC.trackaction ( 'CNTMAI', @@ -648,7 +649,7 @@ AS || ' - ' || rec.cnt_contract_omschrijving || ')', - rec.taak, + rec.cnt_contract_key, NULL, 2); END IF; @@ -657,7 +658,7 @@ AS v_errorhint := 'notificatie_teamleider'; v_teaml := rec.teamleider; - IF v_teaml <> NULL + IF v_teaml IS NOT NULL THEN FAC.trackaction ( 'CNTMAI', @@ -688,7 +689,7 @@ AS 2, -- mail NULL, v_teaml, - 'Notificatie naar accountmanager, taak: ' + 'Notificatie naar teamleider/clustermanager, taak: ' || rec.taak || ' bij contract ' || rec.cnt_contract_key @@ -697,7 +698,7 @@ AS || ' - ' || rec.cnt_contract_omschrijving || ')', - rec.taak, + rec.cnt_contract_key, NULL, 2); END IF; @@ -706,7 +707,7 @@ AS v_errorhint := 'notificatie_businesscontrol'; v_buscontr := rec.business_controller; - IF v_buscontr <> NULL + IF v_buscontr IS NOT NULL THEN FAC.trackaction ( 'CNTMAI', @@ -737,7 +738,7 @@ AS 2, -- mail NULL, v_buscontr, - 'Notificatie naar accountmanager, taak: ' + 'Notificatie naar Business Controller, taak: ' || rec.taak || ' bij contract ' || rec.cnt_contract_key @@ -746,7 +747,7 @@ AS || ' - ' || rec.cnt_contract_omschrijving || ')', - rec.taak, + rec.cnt_contract_key, NULL, 2); END IF; @@ -821,7 +822,6 @@ AS 'Proces afgebroken!', v_errorhint); END hpji_acties_verkoopcontracten; - END; /