FSN#40190: Aantal en eenheid overrulen in srtcontroledl_xcp record.

svn path=/Database/trunk/; revision=33954
This commit is contained in:
Maykel Geerdink
2017-05-22 14:17:31 +00:00
parent 05a154ff3c
commit 09b3cf77a6

View File

@@ -1499,6 +1499,7 @@ CREATE_VIEW(ins_v_defined_inspect, 0)
ins_deel_key,
ins_deel_aanmaak,
ins_deel_aantal,
ins_srtdeel_eenheid,
ins_alg_locatie_key,
ins_discipline_key,
ins_srtgroep_key,
@@ -1531,6 +1532,7 @@ AS
SELECT id.ins_deel_key,
id.ins_deel_aanmaak,
id.ins_deel_aantal,
s.ins_srtdeel_eenheid,
id.ins_alg_locatie_key,
id.ins_discipline_key,
s.ins_srtgroep_key,
@@ -1576,6 +1578,7 @@ CREATE_VIEW(ins_v_defined_inspect_xcp, 0)
ins_deel_key,
ins_deel_aanmaak,
ins_deel_aantal,
ins_srtdeel_eenheid,
ins_alg_locatie_key,
ins_discipline_key,
ins_srtgroep_key,
@@ -1609,6 +1612,10 @@ CREATE_VIEW(ins_v_defined_inspect_xcp, 0)
ins_srtcontroledl_xcp_perc,
ins_srtcontroledl_xcp_startdat,
ins_srtcontroledl_xcp_eind,
ins_srtcontroledl_xcp_groep,
ins_srtcontroledl_xcp_opmerk,
ins_srtcontroledl_xcp_aantal,
ins_srtcontroledl_xcp_aanteh,
ins_scenario_key,
ctr_discipline_key,
ctr_controle_type,
@@ -1617,7 +1624,8 @@ CREATE_VIEW(ins_v_defined_inspect_xcp, 0)
AS
SELECT di.ins_deel_key,
di.ins_deel_aanmaak,
di.ins_deel_aantal,
COALESCE (ins_srtcontroledl_xcp_aantal, di.ins_deel_aantal),
COALESCE (ins_srtcontroledl_xcp_aanteh, di.ins_srtdeel_eenheid),
di.ins_alg_locatie_key,
di.ins_discipline_key,
di.ins_srtgroep_key,
@@ -1625,10 +1633,8 @@ AS
di.ins_srtcontrole_key,
di.ins_srtcontrole_omschrijving,
di.ins_srtcontrole_mode,
COALESCE (ins_srtcontroledl_xcp_eenheid,
di.ins_srtcontrole_eenheid),
COALESCE (ins_srtcontroledl_xcp_periode,
di.ins_srtcontrole_periode),
COALESCE (ins_srtcontroledl_xcp_eenheid, di.ins_srtcontrole_eenheid),
COALESCE (ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode),
COALESCE (ins_srtcontroledl_xcp_bits, di.ins_srtcontrole_bits),
COALESCE (ins_srtcontroledl_xcp_kosten, di.ins_srtcontrole_kosten),
COALESCE (ins_srtcontroledl_xcp_kosten2, di.ins_srtcontrole_kosten2),
@@ -1653,6 +1659,10 @@ AS
ins_srtcontroledl_xcp_perc,
ins_srtcontroledl_xcp_startdat,
ins_srtcontroledl_xcp_eind,
ins_srtcontroledl_xcp_groep,
ins_srtcontroledl_xcp_opmerk,
ins_srtcontroledl_xcp_aantal,
ins_srtcontroledl_xcp_aanteh,
ins_scenario_key,
di.ctr_discipline_key,
di.ctr_controle_type,