From c875d6b25b20cf7a82c788fa2ce4306774e69d6d Mon Sep 17 00:00:00 2001 From: Maarten van der Heide Date: Fri, 29 Sep 2023 10:26:58 +0000 Subject: [PATCH] MNNL#80040 SF-export/Alleen afgesproken vakgroeptypen svn path=/Customer/trunk/; revision=61976 --- MNNL/mnnl.sql | 53 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 10 deletions(-) diff --git a/MNNL/mnnl.sql b/MNNL/mnnl.sql index a130535ed..957c66389 100644 --- a/MNNL/mnnl.sql +++ b/MNNL/mnnl.sql @@ -8442,7 +8442,13 @@ AS TO_CHAR (m.mld_melding_parentkey) parentmelding, TO_CHAR (x.melding_start_key) startmelding FROM mld_v_udr_melding x, mld_melding m - WHERE x.melding_key = m.mld_melding_key; + WHERE x.melding_key = m.mld_melding_key + AND EXISTS -- MNNL#80040: Filteren op vakgroeptypen tbv. MN zelf (itt. huurders van MN)! + (SELECT 1 + FROM mld_stdmelding sm, mld_discipline md + WHERE sm.mld_ins_discipline_key = md.ins_discipline_key + AND md.ins_srtdiscipline_key IN (1, 21, 22, 23, 41, 61, 81, 101, 121, 141, 201, 221, 241, 261, 321, 341, 381) + AND sm.mld_stdmelding_key = m.mld_stdmelding_key); CREATE OR REPLACE VIEW mnnl_v_export_sf_mld ( @@ -8568,7 +8574,13 @@ AS FROM mld_melding m, mld_v_aanwezigkenmerkmelding km, mld_kenmerk k, mld_srtkenmerk sk WHERE m.mld_melding_key = km.mld_melding_key(+) AND km.mld_kenmerk_key = k.mld_kenmerk_key(+) - AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key(+); + AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key(+) + AND EXISTS -- MNNL#80040: Filteren op vakgroeptypen tbv. MN zelf (itt. huurders van MN)! + (SELECT 1 + FROM mld_stdmelding sm, mld_discipline md + WHERE sm.mld_ins_discipline_key = md.ins_discipline_key + AND md.ins_srtdiscipline_key IN (1, 21, 22, 23, 41, 61, 81, 101, 121, 141, 201, 221, 241, 261, 321, 341, 381) + AND sm.mld_stdmelding_key = m.mld_stdmelding_key); CREATE OR REPLACE VIEW mnnl_v_export_sf_mld_kmk ( @@ -8708,11 +8720,18 @@ AS CREATE OR REPLACE VIEW mnnl_v_rap_sf_mld_ins AS - SELECT mld_melding_object_key, - mld_melding_key, - ins_deel_key, - mld_melding_object_aanmaak - FROM mld_melding_object; + SELECT mo.mld_melding_object_key, + mo.mld_melding_key, + mo.ins_deel_key, + mo.mld_melding_object_aanmaak + FROM mld_melding_object mo, mld_melding m + WHERE mo.mld_melding_key = m.mld_melding_key + AND EXISTS -- MNNL#80040: Filteren op vakgroeptypen tbv. MN zelf (itt. huurders van MN)! + (SELECT 1 + FROM mld_stdmelding sm, mld_discipline md + WHERE sm.mld_ins_discipline_key = md.ins_discipline_key + AND md.ins_srtdiscipline_key IN (1, 21, 22, 23, 41, 61, 81, 101, 121, 141, 201, 221, 241, 261, 321, 341, 381) + AND sm.mld_stdmelding_key = m.mld_stdmelding_key); CREATE OR REPLACE VIEW mnnl_v_export_sf_mld_ins ( @@ -8772,7 +8791,14 @@ AS o.opdracht_verstrektdatum, o.opdracht_lev_doorloopdagen, o.opdracht_lev_doorloopuren - FROM mld_v_udr_opdracht o; + FROM mld_v_udr_opdracht o, mld_melding m + WHERE o.melding_key = m.mld_melding_key + AND EXISTS -- MNNL#80040: Filteren op vakgroeptypen tbv. MN zelf (itt. huurders van MN)! + (SELECT 1 + FROM mld_stdmelding sm, mld_discipline md + WHERE sm.mld_ins_discipline_key = md.ins_discipline_key + AND md.ins_srtdiscipline_key IN (1, 21, 22, 23, 41, 61, 81, 101, 121, 141, 201, 221, 241, 261, 321, 341, 381) + AND sm.mld_stdmelding_key = m.mld_stdmelding_key); CREATE OR REPLACE VIEW mnnl_v_export_sf_ord ( @@ -8869,10 +8895,17 @@ AS 'S', fac.getdomeinwaarde (sk.fac_kenmerkdomein_key, ko.mld_kenmerkopdr_waarde), ko.mld_kenmerkopdr_waarde) kenmerkwaarde - FROM mld_opdr o, mld_v_aanwezigkenmerkopdr ko, mld_kenmerk k, mld_srtkenmerk sk + FROM mld_opdr o, mld_v_aanwezigkenmerkopdr ko, mld_kenmerk k, mld_srtkenmerk sk, mld_melding m WHERE o.mld_opdr_key = ko.mld_opdr_key(+) AND ko.mld_kenmerk_key = k.mld_kenmerk_key(+) - AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key(+); + AND k.mld_srtkenmerk_key = sk.mld_srtkenmerk_key(+) + AND o.mld_melding_key = m.mld_melding_key + AND EXISTS -- MNNL#80040: Filteren op vakgroeptypen tbv. MN zelf (itt. huurders van MN)! + (SELECT 1 + FROM mld_stdmelding sm, mld_discipline md + WHERE sm.mld_ins_discipline_key = md.ins_discipline_key + AND md.ins_srtdiscipline_key IN (1, 21, 22, 23, 41, 61, 81, 101, 121, 141, 201, 221, 241, 261, 321, 341, 381) + AND sm.mld_stdmelding_key = m.mld_stdmelding_key); CREATE OR REPLACE VIEW mnnl_v_export_sf_ord_kmk (