admin/Customer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FSN#37619 Deprecated ins_srtcontroledl_xcp_respijt (LOGI15)

Browse Source 
svn path=/Customer/trunk/; revision=30594
This commit is contained in:
Maarten van der Heide
2016-09-06 15:25:38 +00:00
parent eddadaecc9
commit 1b80c7aeb0
1 changed files with 52 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

121
LOGI/logi.sql
View File

@@ -2056,21 +2056,13 @@ AS
AND sc.ins_srtinstallatie_key = d.ins_discipline_key))
SELECT 1 rn, -- NOG GEEN INSPECTIES GEWEEST!
di.ins_deel_key,
COALESCE (
xcp.ins_srtcontroledl_xcp_respijt,
fac.nextcyclusdate (
di.ins_deel_aanmaak,
di.ins_srtcontrole_mode,
COALESCE (
xcp.ins_srtcontroledl_xcp_eenheid,
di.ins_srtcontrole_eenheid),
COALESCE (
xcp.ins_srtcontroledl_xcp_periode,
di.ins_srtcontrole_periode),
COALESCE (
xcp.ins_srtcontroledl_xcp_bits,
di.ins_srtcontrole_bits),
1))
fac.nextcyclusdate (
di.ins_deel_aanmaak,
di.ins_srtcontrole_mode,
COALESCE (xcp.ins_srtcontroledl_xcp_eenheid, di.ins_srtcontrole_eenheid),
COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode),
COALESCE (xcp.ins_srtcontroledl_xcp_bits, di.ins_srtcontrole_bits),
1)
inspectie_next,
di.ins_srtcontrole_omschrijving
FROM defined_inspect di, ins_srtcontroledl_xcp xcp
@@ -2089,25 +2081,17 @@ AS
ORDER BY ins_deelsrtcontrole_datum DESC)
rn,
di.ins_deel_key,
COALESCE (
xcp.ins_srtcontroledl_xcp_respijt,
fac.nextcyclusdate (
CASE
WHEN di.ins_srtcontrole_mode = 0
THEN dsc.ins_deelsrtcontrole_datum_org
ELSE dsc.ins_deelsrtcontrole_datum
END,
di.ins_srtcontrole_mode,
COALESCE (
xcp.ins_srtcontroledl_xcp_eenheid,
di.ins_srtcontrole_eenheid),
COALESCE (
xcp.ins_srtcontroledl_xcp_periode,
di.ins_srtcontrole_periode),
COALESCE (
xcp.ins_srtcontroledl_xcp_bits,
di.ins_srtcontrole_bits),
1))
fac.nextcyclusdate (
CASE
WHEN di.ins_srtcontrole_mode = 0
THEN dsc.ins_deelsrtcontrole_datum_org
ELSE dsc.ins_deelsrtcontrole_datum
END,
di.ins_srtcontrole_mode,
COALESCE (xcp.ins_srtcontroledl_xcp_eenheid, di.ins_srtcontrole_eenheid),
COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode),
COALESCE (xcp.ins_srtcontroledl_xcp_bits, di.ins_srtcontrole_bits),
1)
inspectie_next,
di.ins_srtcontrole_omschrijving
FROM ins_deelsrtcontrole dsc, defined_inspect di, ins_srtcontroledl_xcp xcp
@@ -2178,21 +2162,28 @@ AS
AND sc.ins_srtinstallatie_key = d.ins_discipline_key))
SELECT 1 rn, -- NOG GEEN INSPECTIES GEWEEST!
di.ins_deel_key,
COALESCE (
xcp.ins_srtcontroledl_xcp_respijt,
fac.nextcyclusdate (
di.ins_deel_aanmaak,
di.ins_srtcontrole_mode,
COALESCE (
xcp.ins_srtcontroledl_xcp_eenheid,
di.ins_srtcontrole_eenheid),
COALESCE (
xcp.ins_srtcontroledl_xcp_periode,
di.ins_srtcontrole_periode),
COALESCE (
xcp.ins_srtcontroledl_xcp_bits,
di.ins_srtcontrole_bits),
1))
--COALESCE (
-- xcp.ins_srtcontroledl_xcp_respijt,
-- fac.nextcyclusdate (
-- di.ins_deel_aanmaak,
-- di.ins_srtcontrole_mode,
-- COALESCE (
-- xcp.ins_srtcontroledl_xcp_eenheid,
-- di.ins_srtcontrole_eenheid),
-- COALESCE (
-- xcp.ins_srtcontroledl_xcp_periode,
-- di.ins_srtcontrole_periode),
-- COALESCE (
-- xcp.ins_srtcontroledl_xcp_bits,
-- di.ins_srtcontrole_bits),
-- 1))
fac.nextcyclusdate (
di.ins_deel_aanmaak,
di.ins_srtcontrole_mode,
COALESCE (xcp.ins_srtcontroledl_xcp_eenheid, di.ins_srtcontrole_eenheid),
COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode),
COALESCE (xcp.ins_srtcontroledl_xcp_bits, di.ins_srtcontrole_bits),
1)
inspectie_next,
di.ins_srtcontrole_omschrijving
FROM defined_inspect di, ins_srtcontroledl_xcp xcp
@@ -2211,25 +2202,17 @@ AS
ORDER BY ins_deelsrtcontrole_datum DESC)
rn,
di.ins_deel_key,
COALESCE (
xcp.ins_srtcontroledl_xcp_respijt,
fac.nextcyclusdate (
CASE
WHEN di.ins_srtcontrole_mode = 0
THEN dsc.ins_deelsrtcontrole_datum_org
ELSE dsc.ins_deelsrtcontrole_datum
END,
di.ins_srtcontrole_mode,
COALESCE (
xcp.ins_srtcontroledl_xcp_eenheid,
di.ins_srtcontrole_eenheid),
COALESCE (
xcp.ins_srtcontroledl_xcp_periode,
di.ins_srtcontrole_periode),
COALESCE (
xcp.ins_srtcontroledl_xcp_bits,
di.ins_srtcontrole_bits),
1))
fac.nextcyclusdate (
CASE
WHEN di.ins_srtcontrole_mode = 0
THEN dsc.ins_deelsrtcontrole_datum_org
ELSE dsc.ins_deelsrtcontrole_datum
END,
di.ins_srtcontrole_mode,
COALESCE (xcp.ins_srtcontroledl_xcp_eenheid, di.ins_srtcontrole_eenheid),
COALESCE (xcp.ins_srtcontroledl_xcp_periode, di.ins_srtcontrole_periode),
COALESCE (xcp.ins_srtcontroledl_xcp_bits, di.ins_srtcontrole_bits),
1)
inspectie_next,
di.ins_srtcontrole_omschrijving
FROM ins_deelsrtcontrole dsc, defined_inspect di, ins_srtcontroledl_xcp xcp
@@ -2257,7 +2240,7 @@ AS
BEGIN adm.systrackscriptId('$Id$', 0); END;
/
BEGIN fac.registercustversion('LOGI', 14); END;
BEGIN fac.registercustversion('LOGI', 15); END;
/
COMMIT;
spool off