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

SCHG#88197 Problemen met CNT-import SCHG in acceptatie-omgeving 2025.1

Browse Source 
svn path=/Database/trunk/; revision=68542
This commit is contained in:
Erik Groener
2025-03-26 09:27:09 +00:00
parent a179ba4827
commit 6bdf33fe19
4 changed files with 258 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

313
FAC/FAC_PACF.SRC
View File

@@ -20502,34 +20502,37 @@ AS
, fac_imp_csv_col24 TERMIJNBEDRAG
, fac_imp_csv_col25 UURTARIEF
, fac_imp_csv_col26 KORTING
, fac_imp_csv_col27 SCOPETYPE
, fac_imp_csv_col28 LOCATIEGEBOUW_CODE
, fac_imp_csv_col29 VERLENGEN
, fac_imp_csv_col30 flex_01
, fac_imp_csv_col31 flex_02
, fac_imp_csv_col32 flex_03
, fac_imp_csv_col33 flex_04
, fac_imp_csv_col34 flex_05
, fac_imp_csv_col35 flex_06
, fac_imp_csv_col36 flex_07
, fac_imp_csv_col37 flex_08
, fac_imp_csv_col38 flex_09
, fac_imp_csv_col39 flex_10
, fac_imp_csv_col40 flex_11
, fac_imp_csv_col41 flex_12
, fac_imp_csv_col42 flex_13
, fac_imp_csv_col43 flex_14
, fac_imp_csv_col44 flex_15
, fac_imp_csv_col45 flex_16
, fac_imp_csv_col46 flex_17
, fac_imp_csv_col47 flex_18
, fac_imp_csv_col48 flex_19
, fac_imp_csv_col49 flex_20
, fac_imp_csv_col50 flex_21
, fac_imp_csv_col51 flex_22
, fac_imp_csv_col52 flex_23
, fac_imp_csv_col53 flex_24
, fac_imp_csv_col54 flex_25
, fac_imp_csv_col27 LOCATIECODE
, fac_imp_csv_col28 TERREINCODE
, fac_imp_csv_col29 GEBOUWCODE
, fac_imp_csv_col30 VERDIEPINGCODE
, fac_imp_csv_col31 RUIMTECODE
, fac_imp_csv_col32 VERLENGEN
, fac_imp_csv_col33 flex_01
, fac_imp_csv_col34 flex_02
, fac_imp_csv_col35 flex_03
, fac_imp_csv_col36 flex_04
, fac_imp_csv_col37 flex_05
, fac_imp_csv_col38 flex_06
, fac_imp_csv_col39 flex_07
, fac_imp_csv_col40 flex_08
, fac_imp_csv_col41 flex_09
, fac_imp_csv_col42 flex_10
, fac_imp_csv_col43 flex_11
, fac_imp_csv_col44 flex_12
, fac_imp_csv_col45 flex_13
, fac_imp_csv_col46 flex_14
, fac_imp_csv_col47 flex_15
, fac_imp_csv_col48 flex_16
, fac_imp_csv_col49 flex_17
, fac_imp_csv_col50 flex_18
, fac_imp_csv_col51 flex_19
, fac_imp_csv_col52 flex_20
, fac_imp_csv_col53 flex_21
, fac_imp_csv_col54 flex_22
, fac_imp_csv_col55 flex_23
, fac_imp_csv_col56 flex_24
, fac_imp_csv_col57 flex_25
FROM fac_imp_csv
WHERE fac_imp_csv_index > 1
AND fac_import_key = p_import_key;
@@ -20572,8 +20575,11 @@ AS
v_bedrag_termijn cnt_contract.cnt_contract_termijnkosten%TYPE; --NUMBER(11,2)
v_uurtarief cnt_contract.cnt_contract_uurloon%TYPE; --NUMBER(6,2)
v_korting cnt_contract.cnt_contract_korting%TYPE; --NUMBER(5,2)
v_scope_type cnt_contract_plaats.cnt_alg_plaats_code%TYPE; --VARCHAR2(1) --> cnt_contract_plaats.cnt_alg_plaats_code
v_gebouwcode alg_gebouw.alg_gebouw_code%TYPE; --VARCHAR2(12) --> cnt_contract_plaats.cnt_alg_plaats_key
v_locatiecode alg_locatie.alg_locatie_code%TYPE; --VARCHAR2(10)
v_terreincode alg_terreinsector.alg_terreinsector_code%TYPE; --VARCHAR2(12)
v_gebouwcode alg_gebouw.alg_gebouw_code%TYPE; --VARCHAR2(12)
v_verdiepingcode alg_verdieping.alg_verdieping_volgnr%TYPE; --NUMBER(3)
v_ruimtecode alg_ruimte.alg_ruimte_nr%TYPE; --VARCHAR2(20)
v_verlengen cnt_contract.cnt_contract_verlenging%TYPE; --NUMBER(1)
v_cnt_kenmerk_01 fac_imp_cnt.flex1%TYPE; --VARCHAR2(255);
@@ -20607,7 +20613,9 @@ AS
|| 'EIGENAAR_EMAIL;BEHEERDER_EMAIL;OPMERKING;INGANGSDATUM;RAPPELDATUM;'
|| 'OPZEGDATUM;EINDDATUM;SOORT_CONTACTPARTIJ;BEDRIJFSNAAM;CONTACTNAAM;'
|| 'KOSTENPLAATSCODE;KOSTENSOORTCODE;CONTRACTBEDRAG;TERMIJNBEDRAG;UURTARIEF;'
|| 'KORTING;SCOPETYPE;LOCATIEGEBOUW_CODE;VERLENGEN';
|| 'KORTING;LOCATIECODE;TERREINCODE;GEBOUWCODE;VERDIEPINGCODE;'
|| 'RUIMTECODE;VERLENGEN';
v_header_csv VARCHAR2(500);
v_flex_naam_01 fac_imp_cnt.flex1%TYPE;
v_flex_naam_02 fac_imp_cnt.flex2%TYPE;
@@ -20744,13 +20752,14 @@ BEGIN
fac_imp_csv_col11 ||';'|| fac_imp_csv_col12 ||';'|| fac_imp_csv_col13 ||';'|| fac_imp_csv_col14 ||';'|| fac_imp_csv_col15 ||';'||
fac_imp_csv_col16 ||';'|| fac_imp_csv_col17 ||';'|| fac_imp_csv_col18 ||';'|| fac_imp_csv_col19 ||';'|| fac_imp_csv_col20 ||';'||
fac_imp_csv_col21 ||';'|| fac_imp_csv_col22 ||';'|| fac_imp_csv_col23 ||';'|| fac_imp_csv_col24 ||';'|| fac_imp_csv_col25 ||';'||
fac_imp_csv_col26 ||';'|| fac_imp_csv_col27 ||';'|| fac_imp_csv_col28 ||';'|| fac_imp_csv_col29
fac_imp_csv_col26 ||';'|| fac_imp_csv_col27 ||';'|| fac_imp_csv_col28 ||';'|| fac_imp_csv_col29 ||';'|| fac_imp_csv_col30 ||';'||
fac_imp_csv_col31 ||';'|| fac_imp_csv_col32
), ' ', '')
, fac_imp_csv_col30, fac_imp_csv_col31, fac_imp_csv_col32, fac_imp_csv_col33, fac_imp_csv_col34
, fac_imp_csv_col35, fac_imp_csv_col36, fac_imp_csv_col37, fac_imp_csv_col38, fac_imp_csv_col39
, fac_imp_csv_col40, fac_imp_csv_col41, fac_imp_csv_col42, fac_imp_csv_col43, fac_imp_csv_col44
, fac_imp_csv_col45, fac_imp_csv_col46, fac_imp_csv_col47, fac_imp_csv_col48, fac_imp_csv_col49
, fac_imp_csv_col50, fac_imp_csv_col51, fac_imp_csv_col52, fac_imp_csv_col53, fac_imp_csv_col54
, fac_imp_csv_col33, fac_imp_csv_col34, fac_imp_csv_col35, fac_imp_csv_col36, fac_imp_csv_col37
, fac_imp_csv_col38, fac_imp_csv_col39, fac_imp_csv_col40, fac_imp_csv_col41, fac_imp_csv_col42
, fac_imp_csv_col43, fac_imp_csv_col44, fac_imp_csv_col45, fac_imp_csv_col46, fac_imp_csv_col47
, fac_imp_csv_col48, fac_imp_csv_col49, fac_imp_csv_col50, fac_imp_csv_col51, fac_imp_csv_col52
, fac_imp_csv_col53, fac_imp_csv_col54, fac_imp_csv_col55, fac_imp_csv_col56, fac_imp_csv_col57
INTO v_header_csv -- standaard header
, v_flex_naam_01, v_flex_naam_02, v_flex_naam_03, v_flex_naam_04, v_flex_naam_05 -- kenmerk kolom namen
, v_flex_naam_06, v_flex_naam_07, v_flex_naam_08, v_flex_naam_09, v_flex_naam_10
@@ -21130,52 +21139,54 @@ BEGIN
);
END IF;
-- CSV-kolom AA: Controle ScopeType
IF TRIM(rec.locatiegebouw_code) IS NULL
-- CSV-kolom AA: Controle Locatiecode
v_locatiecode := SUBSTR(TRIM(rec.locatiecode), 1, 10);
IF LENGTH(TRIM(rec.locatiecode)) > 10
THEN
v_scope_type := NULL;
ELSE
v_scope_type := SUBSTR(TRIM(rec.scopetype), 1, 1);
IF v_scope_type IS NULL OR v_scope_type NOT IN ('L', 'G')
THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Locatiecode - Aangepast ivm lengte groter dan 10 voor locatie'
, rec.fac_imp_csv_index || ' - ' || rec.locatiecode || ' wordt: ' || v_locatiecode
);
END IF;
-- CSV-kolom AB: Controle Terreincode
v_terreincode := SUBSTR(TRIM(rec.terreincode), 1, 12);
IF LENGTH(TRIM(rec.terreincode)) > 12
THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Terreincode - Aangepast ivm lengte groter dan 12 voor terrein'
, rec.fac_imp_csv_index || ' - ' || rec.terreincode || ' wordt: ' || v_terreincode
);
END IF;
-- CSV-kolom AC: Controle Gebouwcode
v_gebouwcode := SUBSTR(TRIM(rec.gebouwcode), 1, 12);
IF LENGTH(TRIM(rec.gebouwcode)) > 12
THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Gebouwcode - Aangepast ivm lengte groter dan 12 voor gebouw'
, rec.fac_imp_csv_index || ' - ' || rec.gebouwcode || ' wordt: ' || v_gebouwcode
);
END IF;
-- CSV-kolom AD: Controle Verdiepingcode
BEGIN
v_verdiepingcode := fac.safe_to_number(rec.verdiepingcode);
EXCEPTION
WHEN OTHERS THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'ScopeType - Is niet aanwezig of ongeldig'
, rec.fac_imp_csv_index || ' - ' || v_scope_type || ', Regel wordt overgeslagen'
, v_aanduiding || 'Verdiepingcode - Aangepast ivm lengte groter dan 3 voor verdieping'
, rec.fac_imp_csv_index || ' - ' || rec.verdiepingcode || ' wordt: ' || v_verdiepingcode
);
v_ongeldig := 1;
END IF;
END IF;
-- CSV-kolom AB: Controle Locatiegebouw_code
IF v_scope_type IS NOT NULL
END;
-- CSV-kolom AE: Controle Ruimtecode
v_ruimtecode := SUBSTR(TRIM(rec.ruimtecode), 1, 20);
IF LENGTH(TRIM(rec.ruimtecode)) > 20
THEN
IF v_scope_type = 'L'
THEN
v_gebouwcode := SUBSTR(TRIM(rec.locatiegebouw_code), 1, 10);
IF LENGTH(TRIM(rec.locatiegebouw_code)) > 10
THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Locatiegebouw_code - Aangepast ivm lengte groter dan 10 voor locatie'
, rec.fac_imp_csv_index || ' - ' || rec.locatiegebouw_code || ' wordt: ' || v_gebouwcode
);
END IF;
END IF;
IF v_scope_type = 'G'
THEN
v_gebouwcode := SUBSTR(TRIM(rec.locatiegebouw_code), 1, 12);
IF LENGTH(TRIM(rec.locatiegebouw_code)) > 12
THEN
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Locatiegebouw_code - Aangepast ivm lengte groter dan 12 voor gebouw'
, rec.fac_imp_csv_index || ' - ' || rec.locatiegebouw_code || ' wordt: ' || v_gebouwcode
);
END IF;
END IF;
ELSE
v_gebouwcode := NULL;
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || 'Ruimtecode - Aangepast ivm lengte groter dan 20 voor ruimte'
, rec.fac_imp_csv_index || ' - ' || rec.ruimtecode || ' wordt: ' || v_ruimtecode
);
END IF;
-- CSV-kolom AC: Controle op geldige waarde voor verlengen
-- CSV-kolom AF: Controle op geldige waarde voor verlengen
v_verlengen := fac.safe_to_number(rec.verlengen);
IF v_verlengen NOT IN (0,1,2,3,5)
THEN
@@ -21251,8 +21262,11 @@ BEGIN
, bedrag_termijn
, uurtarief
, korting
, scope
, locatiecode
, terreincode
, gebouwcode
, verdiepingcode
, ruimtecode
, verlengen
, flex1, flex2, flex3, flex4, flex5
, flex6, flex7, flex8, flex9, flex10
@@ -21286,8 +21300,11 @@ BEGIN
, v_bedrag_termijn
, v_uurtarief
, v_korting
, v_scope_type
, v_locatiecode
, v_terreincode
, v_gebouwcode
, v_verdiepingcode
, v_ruimtecode
, v_verlengen
, v_cnt_kenmerk_01, v_cnt_kenmerk_02, v_cnt_kenmerk_03, v_cnt_kenmerk_04, v_cnt_kenmerk_05
, v_cnt_kenmerk_06, v_cnt_kenmerk_07, v_cnt_kenmerk_08, v_cnt_kenmerk_09, v_cnt_kenmerk_10
@@ -21373,8 +21390,11 @@ AS
, i.bedrag_termijn
, i.uurtarief
, i.korting
, i.scope
, i.locatiecode
, i.terreincode
, i.gebouwcode
, i.verdiepingcode
, i.ruimtecode
, i.verlengen
, disc.ins_discipline_key
, mntl.cnt_contract_key mantel_key
@@ -21470,10 +21490,11 @@ AS
, a.bedrag_termijn
, a.uurtarief
, a.korting
, a.scope locgeb_scope
, a.gebouwcode locgeb_code
, gg.plaats_scope
, gg.plaats_key
, a.locatiecode
, a.terreincode
, a.gebouwcode
, a.verdiepingcode
, a.ruimtecode
, a.verlengen
, a.flex1 cnt_kenmerkwaarde1
, a.flex2 cnt_kenmerkwaarde2
@@ -21503,21 +21524,9 @@ AS
FROM imp_cnt a
, cnt_disc_params dp
, prs_contactpersoon cp
, (SELECT 'L' plaats_scope
, alg_locatie_key plaats_key
, alg_locatie_code plaats_code
FROM alg_v_aanweziglocatie
UNION
SELECT 'G'
, alg_gebouw_key
, alg_gebouw_code
FROM alg_v_aanweziggebouw
) gg
WHERE a.ins_discipline_key = dp.cnt_ins_discipline_key
AND UPPER(a.contact_naam) = UPPER(TRIM(cp.prs_contactpersoon_email(+)))
AND a.prs_bedrijf_key = cp.prs_bedrijf_key(+)
AND a.scope = gg.plaats_scope(+)
AND a.gebouwcode = gg.plaats_code(+);
AND a.prs_bedrijf_key = cp.prs_bedrijf_key(+);
-- Constanten
c_contract_type NUMBER := 5; -- Leverancier (met scope)
@@ -21544,7 +21553,9 @@ AS
v_count_cntnew NUMBER;
v_count_cntupd NUMBER;
v_srtnoti_code VARCHAR2(6);
v_fulltext varchar2(2000);
v_scope_code VARCHAR2(1);
v_scope_key NUMBER(10);
v_scope_err VARCHAR2(100);
-- SUBPROC
PROCEDURE bepaal_termijn( p_start IN DATE
@@ -21796,6 +21807,92 @@ v_fulltext varchar2(2000);
);
END; -- SUBPROC upsert_cntkenmerk
-- SUBPROC
PROCEDURE onroerendgoed_to_scope( loc IN VARCHAR2 DEFAULT NULL
, ter IN VARCHAR2 DEFAULT NULL
, bld IN VARCHAR2 DEFAULT NULL
, flr IN NUMBER DEFAULT NULL
, room IN VARCHAR2 DEFAULT NULL
, scope_typ OUT VARCHAR2
, scope_key OUT NUMBER
, scope_err OUT VARCHAR2
)
AS
BEGIN
IF loc IS NOT NULL
THEN
BEGIN
SELECT alg_locatie_key
INTO scope_key
FROM alg_v_aanweziglocatie
WHERE alg_locatie_code = loc;
scope_typ := 'L';
IF ter IS NOT NULL
THEN
BEGIN
SELECT alg_terreinsector_key
INTO scope_key
FROM alg_v_aanwezigterreinsector
WHERE alg_locatie_key = scope_key
AND alg_terreinsector_code = ter;
scope_typ := 'T';
EXCEPTION
WHEN NO_DATA_FOUND THEN
scope_err := 'Onbekende terreinsector: ' || ter || ' in ' || loc;
END;
ELSE
BEGIN
IF bld IS NOT NULL
THEN
BEGIN
SELECT alg_gebouw_key
INTO scope_key
FROM alg_v_aanweziggebouw
WHERE alg_locatie_key = scope_key
AND alg_gebouw_code = bld;
scope_typ := 'G';
IF flr IS NOT NULL
THEN
BEGIN
SELECT alg_verdieping_key
INTO scope_key
FROM alg_v_aanwezigverdieping
WHERE alg_gebouw_key = scope_key
AND alg_verdieping_volgnr = flr;
scope_typ := 'V';
IF room IS NOT NULL
THEN
BEGIN
SELECT alg_ruimte_key
INTO scope_key
FROM alg_v_aanwezigruimte
WHERE alg_verdieping_key = scope_key
AND alg_ruimte_nr = room;
scope_typ := 'R';
EXCEPTION
WHEN NO_DATA_FOUND THEN
scope_err := 'Onbekende ruimte: ' || room || ' in ' || loc ||'-'|| bld ||'-'|| TO_CHAR(flr);
END;
END IF;
EXCEPTION
WHEN NO_DATA_FOUND THEN
scope_err := 'Onbekende verdieping: ' || TO_CHAR(flr) || ' in ' || loc ||'-'|| bld;
END;
END IF;
EXCEPTION
WHEN NO_DATA_FOUND THEN
scope_err := 'Onbekend gebouw: ' || bld || ' in ' || loc;
END;
END IF;
END;
END IF;
EXCEPTION
WHEN NO_DATA_FOUND THEN
scope_err := 'Onbekende locatie: ' || loc;
END;
END IF;
END; -- SUBPROC onroerendgoed_to_scope
BEGIN
v_count_tot := 0;
v_count_cntnew := 0;
@@ -21906,13 +22003,15 @@ BEGIN
v_geldig := 0;
END IF;
onroerendgoed_to_scope( rec.locatiecode, rec.terreincode, rec.gebouwcode, rec.verdiepingcode, rec.ruimtecode
, v_scope_code, v_scope_key, v_scope_err);
-- Locatie/gebouw (als meegegeven): moet bestaan en ook passen bij de
-- contractsoort (type_key 3=Ondersteuning of 5=Leverancier).
IF (rec.locgeb_scope IS NOT NULL)
IF (v_scope_code IS NOT NULL)
THEN
v_errormsg := 'Fout bij bepalen locatie/gebouw: ' || rec.locgeb_scope ||'|'|| rec.locgeb_code;
IF (rec.plaats_key IS NULL)
THEN -- Geen locatie/gebouw gevonden.
IF v_scope_err IS NOT NULL
THEN
v_errormsg := 'Fout bij bepalen scope: ' || v_scope_err;
fac.imp_writelog( p_import_key, 'W'
, v_aanduiding || v_errormsg
, 'Contract/scope wordt overgeslagen'
@@ -22231,14 +22330,14 @@ BEGIN
-- Zo niet, dan toevoegen (bij INSERT altijd toevoegen).
-- NB. Op deze manier kan een contract meerdere keren voorkomen in
-- het importbestand, met verschillende gebouwen.
IF (rec.plaats_key IS NOT NULL)
IF (v_scope_code IS NOT NULL)
THEN -- Komt deze scope al voor?
SELECT COUNT(*)
INTO v_count
FROM cnt_contract_plaats
WHERE cnt_contract_key = v_contract_key
AND cnt_alg_plaats_key = rec.plaats_key
AND cnt_alg_plaats_code = rec.plaats_scope;
AND cnt_alg_plaats_key = v_scope_key
AND cnt_alg_plaats_code = v_scope_code;
IF (v_count = 0) -- Scope komt nog niet voor, dus toevoegen.
THEN
@@ -22249,8 +22348,8 @@ BEGIN
, cnt_alg_plaats_code
)
VALUES ( v_contract_key
, rec.plaats_key
, rec.plaats_scope
, v_scope_key
, v_scope_code
);
END IF;
END IF;

5
FAC/FAC_TAB.SRC
View File

@@ -2197,8 +2197,11 @@ CREATE_TABLE(fac_imp_cnt, 0)
bedrag_termijn NUMBER (11,2),
uurtarief NUMBER (6,2),
korting NUMBER (4,2),
scope VARCHAR2 (1),
locatiecode VARCHAR2 (10),
terreincode VARCHAR2 (12),
gebouwcode VARCHAR2 (12),
verdiepingcode NUMBER (3),
ruimtecode VARCHAR2 (20),
verlengen VARCHAR2 (1),
versie VARCHAR2 (10),
dienst VARCHAR2 (60),

55
FAC/FAC_VIEEXP.SRC
View File

@@ -558,26 +558,27 @@ SELECT c.cnt_contract_nummer_intern ContractNr
, TO_CHAR(c.cnt_contract_termijnkosten) Termijnbedrag --X_termijnbedrag
, TO_CHAR(c.cnt_contract_uurloon) Uurtarief --Y_uurtarief
, TO_CHAR(c.cnt_contract_korting) Korting --Z_korting
, p.cnt_alg_plaats_code ScopeType --AA_scope
, (SELECT MIN(CASE WHEN p.cnt_alg_plaats_code = 'L' THEN alg_locatie_code
-- WHEN p.cnt_alg_plaats_code = 'T'
WHEN p.cnt_alg_plaats_code = 'G' THEN alg_gebouw_code
-- WHEN p.cnt_alg_plaats_code = 'V'
-- WHEN p.cnt_alg_plaats_code = 'R'
ELSE ''
END)
FROM alg_v_gebouw_gegevens
WHERE CASE WHEN p.cnt_alg_plaats_code = 'L' THEN alg_locatie_key
WHEN p.cnt_alg_plaats_code = 'G' THEN alg_gebouw_key
END = p.cnt_alg_plaats_key
) LocatieGebouw_code --AB_locatiegebouw
, c.cnt_contract_verlenging Verlengen --AC_verlengen
--, CASE WHEN c.cnt_contract_verlenging = 5
-- THEN cnt.cnt_getTermijndatum( c.cnt_contract_looptijd_tot
-- , c.cnt_contract_verleng_termijn
-- , 1)
-- ELSE NULL
-- END Verlengdatum
, CASE WHEN p.cnt_alg_plaats_code IN ('L','T','G','V','R')
THEN g.alg_locatie_code
ELSE NULL
END locatiecode --AA_locatiecode
, CASE WHEN p.cnt_alg_plaats_code IN ('T')
THEN g.alg_terreinsector_code
ELSE NULL
END terreincode --AB_terreincode
, CASE WHEN p.cnt_alg_plaats_code IN ('G','V','R')
THEN g.alg_gebouw_code
ELSE NULL
END gebouwcode --AC_gebouwcode
, CASE WHEN p.cnt_alg_plaats_code IN ('V','R')
THEN g.alg_verdieping_code
ELSE NULL
END verdiepingcode --AD_verdiepingcode
, CASE WHEN p.cnt_alg_plaats_code IN ('R')
THEN g.alg_ruimte_nr
ELSE NULL
END ruimtecode --AE_ruimtecode
, c.cnt_contract_verlenging Verlengen --AF_verlengen
FROM cnt_contract c
, (SELECT mm.cnt_contract_key
, mm.cnt_contract_nummer_intern
@@ -588,6 +589,20 @@ SELECT c.cnt_contract_nummer_intern ContractNr
AND md.cnt_srtcontract_type = 6
AND mm.cnt_contract_status != 1
) m
, (SELECT o.*, l.alg_locatie_code
FROM alg_v_onroerendgoed_gegevens o
, alg_locatie l
WHERE o.alg_locatie_key = l.alg_locatie_key
UNION
SELECT l.alg_locatie_key, NULL, NULL
, l.alg_locatie_code, NULL
, NULL, NULL, NULL
, NULL, NULL, NULL
, NULL, NULL, NULL
, NULL, NULL, NULL
, l.alg_locatie_key, 'L', l.alg_locatie_code
FROM alg_locatie l
) g
, cnt_contract_plaats p
, prs_afdeling a
, prs_v_aanwezigperslid b

13
_UP/DB50to51.src
View File

@@ -19,6 +19,19 @@ ALTER TABLE cnt_disc_params
NOT NULL
CONSTRAINT cnt_c_ins_disc_params_ks CHECK(cnt_disc_params_ksverplicht IN (0,1)); /* Kostensoort verplicht {0=niet verplicht (default), 1=verplicht} */
/////////////////////////////////////////////////////////////////////////////////////////// SCHG#88197
ALTER TABLE fac_imp_cnt
DROP COLUMN scope;
ALTER TABLE fac_imp_cnt
DROP COLUMN gebouwcode;
ALTER TABLE fac_imp_cnt
ADD ( locatiecode VARCHAR2 (10)
, terreincode VARCHAR2 (12)
, gebouwcode VARCHAR2 (12)
, verdiepingcode NUMBER (3)
, ruimtecode VARCHAR2 (20)
);
/////////////////////////////////////////////////////////////////////////////////////////// FCLT#00000
REGISTERONCE('$Id$')