SGGR#65855: Meterstanden lopen niet door
svn path=/Customer/trunk/; revision=49814
This commit is contained in:
Suzan Wiegerinck
143
SGGR/sggr.sql
143
SGGR/sggr.sql
@@ -1,4 +1,3 @@
|
||||
/* Formatted on 25-2-2019 14:32:10 (QP5 v5.336) */
|
||||
--
|
||||
-- $Id$
|
||||
--
|
||||
@@ -567,9 +566,11 @@ AS
|
||||
FROM cnt_v_aanwezigcontract
|
||||
WHERE cnt_contract_nummer_intern =
|
||||
c.cnt_contract_nummer_intern
|
||||
AND to_number(cnt_contract_versie) >
|
||||
to_number(COALESCE (c.cnt_contract_versie,
|
||||
'0')))) x
|
||||
AND TO_NUMBER (cnt_contract_versie) >
|
||||
TO_NUMBER (
|
||||
COALESCE (
|
||||
c.cnt_contract_versie,
|
||||
'0')))) x
|
||||
LEFT JOIN
|
||||
(SELECT cnt_contract_key,
|
||||
fac.safe_to_date (cnt_kenmerkcontract_waarde,
|
||||
@@ -683,9 +684,9 @@ BEGIN
|
||||
FROM cnt_v_aanwezigcontract
|
||||
WHERE cnt_contract_nummer_intern =
|
||||
rc.cnt_contract_nummer_intern
|
||||
AND to_number(cnt_contract_versie) >
|
||||
to_number(COALESCE (rc.cnt_contract_versie, '0'));
|
||||
EXCEPTION
|
||||
AND TO_NUMBER (cnt_contract_versie) >
|
||||
TO_NUMBER (COALESCE (rc.cnt_contract_versie, '0'));
|
||||
EXCEPTION
|
||||
WHEN NO_DATA_FOUND
|
||||
THEN
|
||||
-- Er is blijkbaar niet gesplitst (waarschijnlijk dat contract begint pas op of na splitsdatum)
|
||||
@@ -788,7 +789,8 @@ BEGIN
|
||||
FROM cnt_contract
|
||||
WHERE cnt_contract_key = v_new_contract_key;
|
||||
|
||||
DBMS_OUTPUT.PUT_LINE ('newtermijn ' || TO_CHAR (newtermijnkosten));
|
||||
DBMS_OUTPUT.PUT_LINE (
|
||||
'newtermijn ' || TO_CHAR (newtermijnkosten));
|
||||
|
||||
--c.ins_discipline_key IN (481, 482, 501) -- SaaS/Onderhoud/Care = termijn per maand/jaar/maand
|
||||
v_errorhint := 'Fout bij bijwerken jaarbedrag.';
|
||||
@@ -815,12 +817,11 @@ BEGIN
|
||||
|
||||
IF rc.ins_discipline_key = 481 -- FACILITOR SaaS
|
||||
THEN
|
||||
upsert_cntkenmerk (v_new_contract_key,
|
||||
481, -- Totaal contractbedrag/mnd
|
||||
newtermijnkosten);
|
||||
upsert_cntkenmerk (v_new_contract_key,
|
||||
482, -- Totaal contractbedrag/jaar
|
||||
12 * newtermijnkosten);
|
||||
upsert_cntkenmerk (v_new_contract_key, 481, -- Totaal contractbedrag/mnd
|
||||
newtermijnkosten);
|
||||
upsert_cntkenmerk (v_new_contract_key,
|
||||
482, -- Totaal contractbedrag/jaar
|
||||
12 * newtermijnkosten);
|
||||
END IF;
|
||||
|
||||
v_errorhint := 'Fout bij bijwerken index-tracking (CNTUPD).';
|
||||
@@ -861,11 +862,7 @@ EXCEPTION
|
||||
oracle_err_num := SQLCODE;
|
||||
oracle_err_mes := SUBSTR (SQLERRM, 1, 200);
|
||||
v_errormsg :=
|
||||
'Error '
|
||||
|| oracle_err_num
|
||||
|| '/'
|
||||
|| oracle_err_mes
|
||||
|| ')';
|
||||
'Error ' || oracle_err_num || '/' || oracle_err_mes || ')';
|
||||
fac.writelog (p_applname,
|
||||
'E',
|
||||
'Proces INDEXWERK afgebroken!',
|
||||
@@ -1773,23 +1770,30 @@ AS
|
||||
'SGGR_V_NOTI_MANAGER')
|
||||
UNION ALL
|
||||
SELECT DISTINCT
|
||||
NULL sender,
|
||||
NULL receiver,
|
||||
REPLACE (n.fac_srtnotificatie_oms, '##NAAM##', aanvr.prs_perslid_naam_friendly),
|
||||
NULL
|
||||
sender,
|
||||
NULL
|
||||
receiver,
|
||||
REPLACE (n.fac_srtnotificatie_oms,
|
||||
'##NAAM##',
|
||||
aanvr.prs_perslid_naam_friendly),
|
||||
fac_srtnotificatie_code,
|
||||
n.fac_srtnotificatie_key,
|
||||
m.mld_melding_key,
|
||||
NULL xkey,
|
||||
mgr.prs_perslid_email xemail,
|
||||
NULL xmobile
|
||||
FROM fac_tracking t,
|
||||
mld_melding m,
|
||||
fac_srtnotificatie n,
|
||||
prs_perslid p,
|
||||
prs_v_perslid_fullnames aanvr,
|
||||
prs_kenmerklink kl,
|
||||
prs_perslid mgr,
|
||||
mld_stdmelding sm
|
||||
NULL
|
||||
xkey,
|
||||
mgr.prs_perslid_email
|
||||
xemail,
|
||||
NULL
|
||||
xmobile
|
||||
FROM fac_tracking t,
|
||||
mld_melding m,
|
||||
fac_srtnotificatie n,
|
||||
prs_perslid p,
|
||||
prs_v_perslid_fullnames aanvr,
|
||||
prs_kenmerklink kl,
|
||||
prs_perslid mgr,
|
||||
mld_stdmelding sm
|
||||
WHERE t.fac_tracking_refkey = m.mld_melding_key
|
||||
AND m.mld_stdmelding_key = sm.mld_stdmelding_key
|
||||
AND t.fac_srtnotificatie_key = 26
|
||||
@@ -2049,7 +2053,7 @@ AS
|
||||
SELECT *
|
||||
FROM fac_tracking t, ins_deel d
|
||||
WHERE fac_tracking_refkey = d.ins_deel_key
|
||||
AND d.ins_srtdeel_key in (481, 621) -- pool autos 481 , later samengevoegd: lease/poolauto's
|
||||
AND d.ins_srtdeel_key IN (481, 621) -- pool autos 481 , later samengevoegd: lease/poolauto's
|
||||
AND fac_srtnotificatie_key IN (96, 97) -- uitgifte (insout) en inname (insinn)
|
||||
ORDER BY ins_deel_key, fac_tracking_datum;
|
||||
|
||||
@@ -2139,7 +2143,6 @@ BEGIN
|
||||
END IF;
|
||||
END;
|
||||
END LOOP;
|
||||
|
||||
END;
|
||||
/
|
||||
|
||||
@@ -2182,6 +2185,7 @@ AS
|
||||
WHERE a.ins_deel_key = d.ins_deel_key;
|
||||
|
||||
-- SGGR#40017 inzicht in hotelreserveringen
|
||||
|
||||
CREATE OR REPLACE VIEW SGGR_V_RAPP_HOTELAANVRAGEN
|
||||
(
|
||||
HTML_AANVRAAG_NR,
|
||||
@@ -2761,7 +2765,7 @@ AS
|
||||
THEN
|
||||
''
|
||||
END;
|
||||
|
||||
|
||||
CREATE OR REPLACE VIEW SGGR_V_RAPP_HOTELAANVRAGEN_ALL
|
||||
(
|
||||
HTML_AANVRAAG_NR,
|
||||
@@ -3358,7 +3362,7 @@ AS
|
||||
verbr,
|
||||
meterstanden.ins_kmdeelsrtcontr_waarde
|
||||
meterstand,
|
||||
(SELECT MAX (msp.ins_kmdeelsrtcontr_waarde)
|
||||
(SELECT MAX (fac.safe_to_number (msp.ins_kmdeelsrtcontr_waarde))
|
||||
FROM ins_v_deel_gegevens mp,
|
||||
ins_deelsrtcontrole cp,
|
||||
ins_kmdeelsrtcontr msp,
|
||||
@@ -3374,8 +3378,9 @@ AS
|
||||
AND cp.ins_deelsrtcontrole_datum <
|
||||
c.ins_deelsrtcontrole_datum)
|
||||
AS prev_meterstand,
|
||||
( meterstanden.ins_kmdeelsrtcontr_waarde
|
||||
- (SELECT MAX (msp.ins_kmdeelsrtcontr_waarde)
|
||||
( fac.safe_to_number (meterstanden.ins_kmdeelsrtcontr_waarde)
|
||||
- (SELECT MAX (
|
||||
fac.safe_to_number (msp.ins_kmdeelsrtcontr_waarde))
|
||||
FROM ins_v_deel_gegevens mp,
|
||||
ins_deelsrtcontrole cp,
|
||||
ins_kmdeelsrtcontr msp,
|
||||
@@ -3392,9 +3397,11 @@ AS
|
||||
c.ins_deelsrtcontrole_datum))
|
||||
AS berekend_verbruik,
|
||||
COALESCE (
|
||||
TO_NUMBER (verbruik.ins_kmdeelsrtcontr_waarde),
|
||||
( meterstanden.ins_kmdeelsrtcontr_waarde
|
||||
- (SELECT MAX (msp.ins_kmdeelsrtcontr_waarde)
|
||||
fac.safe_to_number (verbruik.ins_kmdeelsrtcontr_waarde),
|
||||
( fac.safe_to_number (meterstanden.ins_kmdeelsrtcontr_waarde)
|
||||
- (SELECT MAX (
|
||||
fac.safe_to_number (
|
||||
msp.ins_kmdeelsrtcontr_waarde))
|
||||
FROM ins_v_deel_gegevens mp,
|
||||
ins_deelsrtcontrole cp,
|
||||
ins_kmdeelsrtcontr msp,
|
||||
@@ -3442,15 +3449,17 @@ AS
|
||||
CUST,
|
||||
(SELECT cnt_kenmerkcontract_waarde
|
||||
FROM cnt_kenmerkcontract ck
|
||||
WHERE cnt_kenmerk_key = 26 AND cc.cnt_contract_key = ck.cnt_contract_key)
|
||||
WHERE cnt_kenmerk_key = 26
|
||||
AND cc.cnt_contract_key = ck.cnt_contract_key)
|
||||
licenced_keyuser,
|
||||
(SELECT cnt_kenmerkcontract_waarde
|
||||
FROM cnt_kenmerkcontract ck
|
||||
WHERE cnt_kenmerk_key = 27 AND cc.cnt_contract_key = ck.cnt_contract_key)
|
||||
WHERE cnt_kenmerk_key = 27
|
||||
AND cc.cnt_contract_key = ck.cnt_contract_key)
|
||||
licenced_frontend
|
||||
FROM cnt_contract cc
|
||||
WHERE ins_discipline_key = 481 -- FACILITOR SaaS
|
||||
AND cnt_contract_looptijd_tot > SYSDATE
|
||||
WHERE ins_discipline_key = 481 -- FACILITOR SaaS
|
||||
AND cnt_contract_looptijd_tot > SYSDATE
|
||||
ORDER BY cnt_contract_omschrijving;
|
||||
|
||||
CREATE OR REPLACE VIEW sggr_v_axi_nrs
|
||||
@@ -3459,16 +3468,16 @@ CREATE OR REPLACE VIEW sggr_v_axi_nrs
|
||||
axi_nr
|
||||
)
|
||||
AS
|
||||
SELECT m.mld_melding_key,
|
||||
sd.ins_srtdiscipline_prefix || m.mld_melding_key meldingnummer
|
||||
FROM mld_melding m,
|
||||
mld_stdmelding sm,
|
||||
ins_tab_discipline d,
|
||||
ins_srtdiscipline sd
|
||||
WHERE m.mld_stdmelding_key IN (523, 524)
|
||||
AND m.mld_stdmelding_key = sm.mld_stdmelding_key
|
||||
AND d.ins_discipline_key = sm.mld_ins_discipline_key
|
||||
AND sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key;
|
||||
SELECT m.mld_melding_key,
|
||||
sd.ins_srtdiscipline_prefix || m.mld_melding_key meldingnummer
|
||||
FROM mld_melding m,
|
||||
mld_stdmelding sm,
|
||||
ins_tab_discipline d,
|
||||
ins_srtdiscipline sd
|
||||
WHERE m.mld_stdmelding_key IN (523, 524)
|
||||
AND m.mld_stdmelding_key = sm.mld_stdmelding_key
|
||||
AND d.ins_discipline_key = sm.mld_ins_discipline_key
|
||||
AND sd.ins_srtdiscipline_key = d.ins_srtdiscipline_key;
|
||||
|
||||
CREATE OR REPLACE VIEW SGGR_V_RAP_CONTROLE_LEASEDOC
|
||||
(
|
||||
@@ -3655,9 +3664,25 @@ AS
|
||||
fac.getSetting ('ins_occupationsensors_srtgroep_key'))
|
||||
deel,
|
||||
alg_ruimte r
|
||||
WHERE r.alg_ruimte_key = deel.ins_alg_ruimte_key(+)
|
||||
AND (deel.res_deel_vervaldatum > SYSDATE or deel.res_deel_vervaldatum IS NULL);
|
||||
|
||||
WHERE r.alg_ruimte_key = deel.ins_alg_ruimte_key(+)
|
||||
AND ( deel.res_deel_vervaldatum > SYSDATE
|
||||
OR deel.res_deel_vervaldatum IS NULL);
|
||||
|
||||
|
||||
|
||||
CREATE OR REPLACE VIEW SGGR_V_AFDELINGTEAMS
|
||||
(
|
||||
TEAM_KEY,
|
||||
AFDELING_TEAM
|
||||
)
|
||||
AS
|
||||
SELECT t.prs_afdeling_key,
|
||||
p.prs_afdeling_omschrijving
|
||||
|| ' - '
|
||||
|| t.prs_afdeling_omschrijving
|
||||
FROM prs_afdeling p, prs_afdeling t
|
||||
WHERE t.prs_afdeling_parentkey = p.prs_afdeling_key;
|
||||
|
||||
------ payload end ------
|
||||
|
||||
SET DEFINE OFF
|
||||
|
||||
Reference in New Issue
Block a user