From a0474a520f1787783495266669929cae065ac653 Mon Sep 17 00:00:00 2001 From: Norbert Wassink Date: Thu, 8 Jul 2021 12:59:26 +0000 Subject: [PATCH] LOGC#66278 -- aanpassing aanroep logc_monthly zonder parameters svn path=/Customer/trunk/; revision=52266 --- LOGC/logc.sql | 52 +++++++++++++++++++-------------------------------- 1 file changed, 19 insertions(+), 33 deletions(-) diff --git a/LOGC/logc.sql b/LOGC/logc.sql index ffbfcb01d..3e7c7e392 100644 --- a/LOGC/logc.sql +++ b/LOGC/logc.sql @@ -17,21 +17,19 @@ SET DEFINE OFF ------ payload begin ------ CREATE OR REPLACE PACKAGE LOGC AS - PROCEDURE tsk_emailrapport (p_applname IN VARCHAR2, - p_applrun IN VARCHAR2); + PROCEDURE tsk_emailrapport (p_applname IN VARCHAR2); END; / CREATE OR REPLACE PACKAGE BODY LOGC AS - PROCEDURE tsk_emailrapport (p_applname IN VARCHAR2, - p_applrun IN VARCHAR2) + PROCEDURE tsk_emailrapport (p_applname IN VARCHAR2) AS v_errorhint VARCHAR2 (1000); v_errormsg VARCHAR2 (1000); oracle_err_num NUMBER; - oracle_err_mes VARCHAR2 (200); + oracle_err_mes VARCHAR2 (200); v_today VARCHAR2 (10); v_bijlage VARCHAR2(4000); v_lastRun VARCHAR2 (20); @@ -46,7 +44,7 @@ AS THEN v_bijlage := '/../../Fplace5i/CUST/LOGC/export/mld_export/MLD_LogC_'||to_char(SYSDATE, 'yyyymmdd')||'.csv'; --v_bijlage := '../../Branch20202/CUST/LOGC/export/mld_export/MLD_LogC_'||to_char(SYSDATE, 'yyyymmdd')||'.csv'; - + INSERT INTO fac_notificatie (fac_srtnotificatie_key, prs_perslid_key_sender, fac_notificatie_status, @@ -56,8 +54,8 @@ AS fac_notificatie_prioriteit, fac_notificatie_attachments) VALUES ( - v_notiKey, - 3, + v_notiKey, + 3, 2, 'gerard.mensink@aareon.nl', 'LogCentre meldingen per '|| TO_CHAR(SYSDATE,'DD-MM-YYYY'), @@ -66,7 +64,7 @@ AS v_bijlage); COMMIT; END IF; - + END IF; EXCEPTION WHEN OTHERS @@ -79,32 +77,20 @@ AS 'Email rapport task afgebroken!: ' || v_errormsg, v_errorhint); COMMIT; - + END; END; / -CREATE OR REPLACE PROCEDURE logc_monthly (p_applname IN VARCHAR2, - p_applrun IN VARCHAR2) +CREATE OR REPLACE PROCEDURE logc_monthly AS v_errorhint VARCHAR2 (1000); v_errormsg VARCHAR2 (1000); oracle_err_num NUMBER; oracle_err_mes VARCHAR2 (200); BEGIN - logc.tsk_emailrapport(p_applname, p_applrun); -EXCEPTION - WHEN OTHERS - THEN - oracle_err_num := SQLCODE; - oracle_err_mes := SUBSTR (SQLERRM, 1, 200); - v_errormsg := v_errormsg || ' ORACLE (error ' || oracle_err_num || '/' || oracle_err_mes || ')'; - fac.writelog (p_applname, - 'E', - 'Monthly task afgebroken!: ' || v_errormsg, - v_errorhint); - COMMIT; + logc.tsk_emailrapport('LOGC_MONTHLY'); END; / @@ -903,7 +889,7 @@ BEGIN AND UPPER (v_Projectsoort) = 'PROJECTSOORT' AND UPPER (v_Omschrijving) = 'OMSCHRIJVING' AND UPPER (v_Status) = 'STATUS' - AND UPPER (v_Debiteur) = 'DEBITEUR' + AND UPPER (v_Debiteur) = 'KLANT' AND UPPER (v_PlanWorktime) = 'PLAN WORKTIME' AND UPPER (v_ActualWorktime) = 'ACTUAL WORKTIME' AND UPPER (v_ActualWorkCosts) = 'ACTUAL WORK COSTS' @@ -2423,8 +2409,8 @@ CREATE OR REPLACE VIEW logc_v_rap_emmen ) AS SELECT - distinct melding_key, - (SELECT ud.fac_usrdata_omschr + distinct melding_key, + (SELECT ud.fac_usrdata_omschr FROM mld_srtkenmerk sk, mld_kenmerk k, mld_kenmerkmelding km, @@ -2437,7 +2423,7 @@ AS AND ud.fac_usrdata_key = km.mld_kenmerkmelding_waarde AND ut.fac_usrtab_key = ud.fac_usrtab_key AND ut.fac_usrtab_key = 1 - AND km.mld_melding_key = melding_key) module, + AND km.mld_melding_key = melding_key) module, kostenplaats_oms, subproductgroep, subproductgroepgroep, @@ -2459,7 +2445,7 @@ AS onderwerp, melding_opmerking, afdeling_omschrijving, - melding_einddatum_std + melding_einddatum_std FROM ( SELECT melding_key, kostenplaats_oms, @@ -2484,8 +2470,8 @@ AS melding_opmerking, afdeling_omschrijving, melding_einddatum_std - FROM logc_v_mld_emmen mld - WHERE mld.MELDING_DATUM< TO_DATE('01-01-'||to_char(SYSDATE-365,'YYYY'), 'DD-MM-YYYY') + FROM logc_v_mld_emmen mld + WHERE mld.MELDING_DATUM< TO_DATE('01-01-'||to_char(SYSDATE-365,'YYYY'), 'DD-MM-YYYY') AND mld.MELDING_AFGEMELD > TO_DATE('01-01-'||to_char(SYSDATE-365,'YYYY'), 'DD-MM-YYYY') UNION SELECT melding_key, @@ -2522,8 +2508,8 @@ CREATE OR REPLACE VIEW logc_v_export_open_mld AS -- SELECT 'Melding key;Kostenplaat oms;Subproductgroep;Subproductgroepgroep;Melding status;Melding datum;Melding accepted;Plan uitvoertijd sla;Melding afgemeld;Sla Werkdgn;Doorlooptijd werkdgn;Doorlooptijd_uren_gepland;Doorlooptijd_uren;uitvoering_sal_optijd;melder;productgroep;Prioriteittxt;Vertantw_behandelgroep;behandelaar;Onderwerp;Melding opmerking;Afdeling_omschrijving;melding_einddatum_stdring sla', FROM dual -- UNION - SELECT - melding_key||';'|| + SELECT + melding_key||';'|| kostenplaats_oms ||';'|| subproductgroep ||';'|| subproductgroepgroep ||';'||