From 832f394d94cdc67913b27ab8ccf2e8fa767627ee Mon Sep 17 00:00:00 2001 From: Sander Schepers Date: Sun, 15 May 2022 21:08:46 +0000 Subject: [PATCH] WELK#66143 Herinrichting meldingenstructuur en koppeling Valuemation svn path=/Customer/trunk/; revision=55899 --- WELK/welk.sql | 210 ++++++++++++++++++++++++-------------------------- 1 file changed, 99 insertions(+), 111 deletions(-) diff --git a/WELK/welk.sql b/WELK/welk.sql index 3dccbca86..2196bd40b 100644 --- a/WELK/welk.sql +++ b/WELK/welk.sql @@ -317,7 +317,7 @@ CREATE OR REPLACE VIEW welk_v_noti_receptie par2, xkey ) -AS +AS SELECT sn.fac_srtnotificatie_code, fac.gettrackinguserkey ('MLDNEW', m.mld_melding_key), DECODE (std.mld_ins_discipline_key, 361, 1541, 1181), @@ -328,23 +328,25 @@ AS NULL FROM mld_melding m, mld_stdmelding std, + ins_tab_discipline d, fac_notificatie_job nj, fac_srtnotificatie sn WHERE sn.fac_srtnotificatie_code = 'CUST01' AND m.mld_stdmelding_key = std.mld_stdmelding_key AND m.mld_melding_status = 2 AND nj.fac_notificatie_job_key = 41 + AND d.ins_discipline_key = std.mld_ins_discipline_key + AND d.ins_srtdiscipline_key = 1 AND fac.gettrackingdate ('MLDNEW', m.mld_melding_key) >= nj.fac_notificatie_job_nextrun - (nj.fac_notificatie_job_interval / 24); -CREATE OR REPLACE PROCEDURE welk_processemail ( - pfrom IN VARCHAR2, - pto IN VARCHAR2, - psubject IN VARCHAR2, - pbody IN VARCHAR2, - psessionid IN VARCHAR2, - pemailkey IN NUMBER) +CREATE OR REPLACE PROCEDURE welk_processemail (pfrom IN VARCHAR2, + pto IN VARCHAR2, + psubject IN VARCHAR2, + pbody IN VARCHAR2, + psessionid IN VARCHAR2, + pemailkey IN NUMBER) AS sender prs_perslid.prs_perslid_key%TYPE; mldkey mld_melding.mld_melding_key%TYPE; @@ -377,9 +379,9 @@ AS v_attachorigin mld_kenmerk.mld_kenmerk_key%TYPE; BEGIN v_errormsg := '(0x143)' || v_mldkey || psubject || v_actie; - sender := 4; --Standaard de persoon Facilitor + sender := 4; --Standaard de persoon Facilitor v_mailorigin := 410; --Kenmerk_key originele mail-bijlage - v_attachorigin := 411; --Kenmerk_key bijlage + v_attachorigin := 411; --Kenmerk_key bijlage -- Verwijder de Bounce Address Tag Validation IF pfrom LIKE 'prvs=%' @@ -940,23 +942,15 @@ BEGIN VALUES ( v_opdrkey, SUBSTR ( - psubject - || CHR (13) - || CHR (10) - || REPLACE ( - SUBSTR ( - pbody, - 1, - 4000 - - ( LENGTH ( - psubject) - + 2)), - CHR (13) - || CHR (10) - || CHR (13) - || CHR (10), - CHR (13) - || CHR (10)), + REPLACE ( + SUBSTR (pbody, + 1, + 4000), + CHR (13) + || CHR (10) + || CHR (13) + || CHR (10), + CHR (13) || CHR (10)), 1, 4000), -- Verwijder onnodige witregels sender); @@ -1539,23 +1533,15 @@ BEGIN VALUES ( v_opdrkey, SUBSTR ( - psubject - || CHR (13) - || CHR (10) - || REPLACE ( - SUBSTR ( - pbody, - 1, - 4000 - - ( LENGTH ( - psubject) - + 2)), - CHR (13) - || CHR (10) - || CHR (13) - || CHR (10), - CHR (13) - || CHR (10)), + REPLACE ( + SUBSTR (pbody, + 1, + 4000), + CHR (13) + || CHR (10) + || CHR (13) + || CHR (10), + CHR (13) || CHR (10)), 1, 4000), -- Verwijder onnodige witregels sender); @@ -1584,72 +1570,72 @@ BEGIN END IF; -- -- Zoek het laagste bijlagen kenmerk om de bijlagen onder te stoppen --- -- v_errormsg := 'Fout bij zoeken naar kenmerkbijlage'; --- -- --- -- SELECT MIN (mld_kenmerk_key) --- -- INTO v_kenmerk_key --- -- FROM mld_kenmerk k, --- -- mld_srtkenmerk sk, --- -- mld_stdmelding std, --- -- ins_tab_discipline d --- -- WHERE mld_srtkenmerk_kenmerktype = 'M' --- -- AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key --- -- AND std.mld_stdmelding_key = stdmelding --- -- AND std.mld_ins_discipline_key = d.ins_discipline_key --- -- AND ( (k.mld_stdmelding_key = std.mld_stdmelding_key --- -- AND k.mld_kenmerk_niveau = 'S') --- -- OR (k.mld_stdmelding_key = d.ins_discipline_key --- -- AND k.mld_kenmerk_niveau = 'D') --- -- OR (k.mld_stdmelding_key = d.ins_srtdiscipline_key --- -- AND k.mld_kenmerk_niveau = 'T')) --- -- AND k.mld_kenmerk_verwijder IS NULL --- -- AND NOT EXISTS --- -- (SELECT mld_kenmerk_volgnummer --- -- FROM mld_kenmerk k1, --- -- mld_srtkenmerk sk1, --- -- mld_stdmelding std1, --- -- ins_tab_discipline d1 --- -- WHERE sk1.mld_srtkenmerk_kenmerktype = 'M' --- -- AND sk1.mld_srtkenmerk_key = --- -- k1.mld_srtkenmerk_key --- -- AND std1.mld_stdmelding_key = stdmelding --- -- AND std1.mld_ins_discipline_key = --- -- d1.ins_discipline_key --- -- AND ( (k1.mld_stdmelding_key = --- -- std1.mld_stdmelding_key --- -- AND k1.mld_kenmerk_niveau = 'S') --- -- OR (k1.mld_stdmelding_key = --- -- d1.ins_discipline_key --- -- AND k1.mld_kenmerk_niveau = 'D') --- -- OR (k1.mld_stdmelding_key = --- -- d1.ins_srtdiscipline_key --- -- AND k1.mld_kenmerk_niveau = 'T')) --- -- AND k1.mld_kenmerk_verwijder IS NULL --- -- AND k1.mld_kenmerk_volgnummer > --- -- k.mld_kenmerk_volgnummer); --- -- --- -- IF v_opdrkey IS NOT NULL --- -- THEN --- -- Bijlagen toevoegen uit email --- v_errormsg := --- '(0x601)' || v_mldkey || psubject || v_actie; --- --- INSERT INTO fac_result (fac_result_sessionid, --- fac_result_naam, --- fac_result_waarde) --- VALUES ( --- psessionid, --- 'kenmerkpath', --- 'MLD\O' --- || TO_CHAR (TRUNC (v_opdrkey / 1000), --- 'FM0000') --- || '___\O' --- || v_opdrkey --- || '\' --- || v_attachorigin --- || '\'); --- --- -- END IF; + -- v_errormsg := 'Fout bij zoeken naar kenmerkbijlage'; + -- + -- SELECT MIN (mld_kenmerk_key) + -- INTO v_kenmerk_key + -- FROM mld_kenmerk k, + -- mld_srtkenmerk sk, + -- mld_stdmelding std, + -- ins_tab_discipline d + -- WHERE mld_srtkenmerk_kenmerktype = 'M' + -- AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key + -- AND std.mld_stdmelding_key = stdmelding + -- AND std.mld_ins_discipline_key = d.ins_discipline_key + -- AND ( (k.mld_stdmelding_key = std.mld_stdmelding_key + -- AND k.mld_kenmerk_niveau = 'S') + -- OR (k.mld_stdmelding_key = d.ins_discipline_key + -- AND k.mld_kenmerk_niveau = 'D') + -- OR (k.mld_stdmelding_key = d.ins_srtdiscipline_key + -- AND k.mld_kenmerk_niveau = 'T')) + -- AND k.mld_kenmerk_verwijder IS NULL + -- AND NOT EXISTS + -- (SELECT mld_kenmerk_volgnummer + -- FROM mld_kenmerk k1, + -- mld_srtkenmerk sk1, + -- mld_stdmelding std1, + -- ins_tab_discipline d1 + -- WHERE sk1.mld_srtkenmerk_kenmerktype = 'M' + -- AND sk1.mld_srtkenmerk_key = + -- k1.mld_srtkenmerk_key + -- AND std1.mld_stdmelding_key = stdmelding + -- AND std1.mld_ins_discipline_key = + -- d1.ins_discipline_key + -- AND ( (k1.mld_stdmelding_key = + -- std1.mld_stdmelding_key + -- AND k1.mld_kenmerk_niveau = 'S') + -- OR (k1.mld_stdmelding_key = + -- d1.ins_discipline_key + -- AND k1.mld_kenmerk_niveau = 'D') + -- OR (k1.mld_stdmelding_key = + -- d1.ins_srtdiscipline_key + -- AND k1.mld_kenmerk_niveau = 'T')) + -- AND k1.mld_kenmerk_verwijder IS NULL + -- AND k1.mld_kenmerk_volgnummer > + -- k.mld_kenmerk_volgnummer); + -- + -- IF v_opdrkey IS NOT NULL + -- THEN + -- Bijlagen toevoegen uit email + v_errormsg := + '(0x601)' || v_mldkey || psubject || v_actie; + + INSERT INTO fac_result (fac_result_sessionid, + fac_result_naam, + fac_result_waarde) + VALUES ( + psessionid, + 'kenmerkpath', + 'MLD\O' + || TO_CHAR (TRUNC (v_opdrkey / 1000), + 'FM0000') + || '___\O' + || v_opdrkey + || '\' + || v_attachorigin + || '\'); + + -- END IF; -- Originele email wordt opgeslagen bij de opdracht v_errormsg := @@ -1672,11 +1658,12 @@ BEGIN END IF; END; ELSE + v_errormsg := '(0x900)' || v_mldkey || psubject || v_actie || ' - geen pto herkend'; INSERT INTO fac_result (fac_result_sessionid, fac_result_naam, fac_result_waarde) VALUES (psessionid, - 'maillog - geen pto herkend', + 'maillog', v_errormsg); END CASE; EXCEPTION @@ -1706,6 +1693,7 @@ EXCEPTION END; / + CREATE OR REPLACE PROCEDURE welk_export_valuemation ( p_applname IN VARCHAR2, p_applrun IN VARCHAR2,