FCLT#57144: Opdrachtkenmerken die gelden voor alle opdrachttypes.

svn path=/Database/trunk/; revision=42739
This commit is contained in:
Maykel Geerdink
2019-05-28 07:58:36 +00:00
parent d88f63d66c
commit 79343241ac
4 changed files with 56 additions and 29 deletions

View File

@@ -2237,11 +2237,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
mld_discipline d
WHERE s.mld_stdmelding_key = stdmkey
AND s.mld_ins_discipline_key = d.ins_discipline_key
AND ( (k.mld_stdmelding_key = s.mld_stdmelding_key AND k.mld_kenmerk_niveau = 'S')
OR (k.mld_stdmelding_key = s.mld_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_niveau = 'A' AND k.mld_stdmelding_key IS NULL)
OR (k.mld_kenmerk_niveau = 'S' AND k.mld_stdmelding_key = s.mld_stdmelding_key)
OR (k.mld_kenmerk_niveau = 'D' AND k.mld_stdmelding_key = s.mld_ins_discipline_key)
OR (k.mld_kenmerk_niveau = 'T' AND k.mld_stdmelding_key = d.ins_srtdiscipline_key))
AND k.mld_kenmerk_verwijder IS NULL
AND k.mld_srtkenmerk_key = t.mld_srtkenmerk_key
AND k.mld_kenmerk_default LIKE '%##SQL##%'
@@ -4004,12 +4003,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
AND sk.mld_srtkenmerk_key = k.mld_srtkenmerk_key
AND std.mld_stdmelding_key = defaultstdmelding
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_niveau = 'A' AND k.mld_stdmelding_key IS NULL)
OR (k.mld_kenmerk_niveau = 'S' AND k.mld_stdmelding_key = std.mld_stdmelding_key)
OR (k.mld_kenmerk_niveau = 'D' AND k.mld_stdmelding_key = d.ins_discipline_key)
OR (k.mld_kenmerk_niveau = 'T' AND k.mld_stdmelding_key = d.ins_srtdiscipline_key))
AND k.mld_kenmerk_verwijder IS NULL
AND NOT EXISTS
(SELECT mld_kenmerk_volgnummer
@@ -4024,15 +4021,10 @@ CREATE OR REPLACE PACKAGE BODY fac AS
defaultstdmelding
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_niveau = 'A' AND k1.mld_stdmelding_key IS NULL)
OR (k1.mld_kenmerk_niveau = 'S' AND k1.mld_stdmelding_key = std1.mld_stdmelding_key)
OR (k1.mld_kenmerk_niveau = 'D' AND k1.mld_stdmelding_key = d1.ins_discipline_key)
OR (k1.mld_kenmerk_niveau = 'T' AND k1.mld_stdmelding_key = d1.ins_srtdiscipline_key))
AND k1.mld_kenmerk_verwijder IS NULL
AND k1.mld_kenmerk_volgnummer >
k.mld_kenmerk_volgnummer);

View File

@@ -16910,8 +16910,9 @@ BEGIN
WHERE mld_srtkenmerk_key = v_srtkenmerk_key
AND mld_kenmerk_niveau = rec.kenmerk_niveau
AND mld_kenmerk_groep = rec.kenmerk_groep
AND ( mld_stdmelding_key = v_stdmelding_key
OR mld_typeopdr_key = v_typeopdr_key
AND (mld_stdmelding_key = v_stdmelding_key
OR mld_typeopdr_key = v_typeopdr_key
OR (mld_stdmelding_key IS NULL AND mld_typeopdr_key IS NULL)
);
IF (v_count = 0)

View File

@@ -3817,12 +3817,10 @@ AS
mld_melding m,
mld_stdmelding stdm,
mld_discipline d
WHERE ( (stdm.mld_ins_discipline_key = k.mld_stdmelding_key
AND k.mld_kenmerk_niveau = 'D')
OR (m.mld_stdmelding_key = k.mld_stdmelding_key
AND k.mld_kenmerk_niveau = 'S')
OR (d.ins_srtdiscipline_key = k.mld_stdmelding_key
AND k.mld_kenmerk_niveau = 'T'))
WHERE ((k.mld_kenmerk_niveau = 'A' AND k.mld_stdmelding_key IS NULL)
OR (k.mld_kenmerk_niveau = 'D' AND k.mld_stdmelding_key = stdm.mld_ins_discipline_key)
OR (k.mld_kenmerk_niveau = 'S' AND k.mld_stdmelding_key = m.mld_stdmelding_key)
OR (k.mld_kenmerk_niveau = 'T' AND k.mld_stdmelding_key = d.ins_srtdiscipline_key))
AND m.mld_melding_key = p_key
AND m.mld_stdmelding_key = stdm.mld_stdmelding_key
AND stdm.mld_ins_discipline_key = d.ins_discipline_key

View File

@@ -1781,6 +1781,24 @@ AS
AND grp.ins_discipline_verwijder IS NULL
AND stdm.mld_stdmelding_verwijder IS NULL
UNION
SELECT kmd.*,
kms.*,
km.*,
fut.fac_usrtab_naam,
'' ins_srtdiscipline_omschrijving,
'' ins_discipline_omschrijving,
'' mld_stdmelding_omschrijving,
'' mld_typeopdr_omschrijving
FROM mld_kenmerk km,
mld_srtkenmerk kms,
fac_kenmerkdomein kmd,
fac_usrtab fut
WHERE mld_kenmerk_niveau = 'A'
AND km.mld_stdmelding_key IS NULL
AND kms.mld_srtkenmerk_key = km.mld_srtkenmerk_key
AND kmd.fac_kenmerkdomein_key(+) = kms.fac_kenmerkdomein_key
AND fut.fac_usrtab_key(+) = kmd.fac_usrtab_key
UNION
SELECT kmd.*,
kms.*,
km.*,
@@ -1794,7 +1812,25 @@ AS
AND km.mld_typeopdr_key = opd.mld_typeopdr_key
AND kms.mld_srtkenmerk_key = km.mld_srtkenmerk_key
AND kmd.fac_kenmerkdomein_key(+) = kms.fac_kenmerkdomein_key
AND fut.fac_usrtab_key(+) = kmd.fac_usrtab_key);
AND fut.fac_usrtab_key(+) = kmd.fac_usrtab_key
UNION
SELECT kmd.*,
kms.*,
km.*,
fut.fac_usrtab_naam,
'' ins_srtdiscipline_omschrijving,
'' ins_discipline_omschrijving,
'' mld_stdmelding_omschrijving,
'' mld_typeopdr_omschrijving
FROM mld_kenmerk km,
mld_srtkenmerk kms,
fac_kenmerkdomein kmd,
fac_usrtab fut
WHERE mld_kenmerk_niveau = 'P'
AND km.mld_typeopdr_key IS NULL
AND kms.mld_srtkenmerk_key = km.mld_srtkenmerk_key
AND kmd.fac_kenmerkdomein_key(+) = kms.fac_kenmerkdomein_key
AND fut.fac_usrtab_key(+) = kmd.fac_usrtab_key);
CREATE_VIEW(fac_v_exp_flex_cnt, 0)
AS