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

ASFC#30390 -- Geldigheid bij inspecties ondersteunenen.

Browse Source 
svn path=/Customer/trunk/; revision=23371
This commit is contained in:
Arthur Egberink
2014-11-18 09:36:57 +00:00
parent 6f9a92e354
commit 7e9f96a7e0
1 changed files with 117 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
ASFC/asfc.sql
View File

@@ -148,7 +148,7 @@ BEGIN
END IF;
IF UPPER (v_newline) LIKE
'LOCATIECODE;GEBOUWCODE;BOUWLAAGVOLGNUMMER;RUIMTENUMMER;ELEMENTSOORT;ACTIVITEIT;ELEMENT;TAAK;FREQ AANTAL;FREQ PERIODE;MA;DI;WO;DO;VR;ZA;ZO%'
'%LOCATIECODE;%GEBOUWCODE;BOUWLAAGVOLGNUMMER;RUIMTENUMMER;ELEMENTSOORT;ACTIVITEIT;ELEMENT;TAAK;FREQ%AANTAL;FREQ%PERIODE;MA;DI;WO;DO;VR;ZA;ZO%'
THEN
-- Sla de kopregel over.
header_found := TRUE;
@@ -188,6 +188,13 @@ BEGIN
v_errorhint := 'Inlezen ruimtenummer.';
fac.imp_getfield (v_newline, v_fielddelimitor, v_dummy);
-- In de export/import routine wordt een _ voor het ruimtenummer geplaatst om problemen
-- met Excel te voorkomen.
IF SUBSTR(v_dummy, 1,1) = '_'
THEN
v_dummy := SUBSTR(v_dummy, 2);
END IF;
IF LENGTH (v_dummy) > 10
THEN
fac.imp_writelog (
@@ -368,6 +375,13 @@ BEGIN
v_srtcontrole_bits := v_srtcontrole_bits + 1;
END IF;
fac.imp_getfield (v_newline, v_fielddelimitor, v_dummy);
IF v_dummy = 1
THEN
v_srtcontrole_bits := v_srtcontrole_bits + 128;
END IF;
IF v_srtcontrole_eenheid = 3 -- maand
THEN
fac.imp_getfield (v_newline, v_fielddelimitor, v_dummy); -- inlezen rangorde
@@ -467,10 +481,15 @@ AS
v_oldcount NUMBER;
v_newcount NUMBER;
v_deel_key INS_DEEL.INS_DEEL_KEY%TYPE;
v_srtdeel_key INS_SRTDEEL.INS_SRTDEEL_KEY%TYPE;
v_srtcontrole_key INS_SRTCONTROLE.INS_SRTCONTROLE_KEY%TYPE;
v_srtcontroledl_xcp_key INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_KEY%TYPE;
v_deel_key INS_DEEL.INS_DEEL_KEY%TYPE;
v_srtdeel_key INS_SRTDEEL.INS_SRTDEEL_KEY%TYPE;
v_srtcontrole_key INS_SRTCONTROLE.INS_SRTCONTROLE_KEY%TYPE;
v_srtcontroledl_xcp_key INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_KEY%TYPE;
v_srtcontroledl_xcp_key_new INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_KEY%TYPE;
v_srtcontroledl_xcp_eenheid INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_EENHEID%TYPE;
v_srtcontroledl_xcp_periode INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_PERIODE%TYPE;
v_srtcontroledl_xcp_bits INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_BITS%TYPE;
v_srtcontroledl_xcp_groep INS_SRTCONTROLEDL_XCP.INS_SRTCONTROLEDL_XCP_GROEP%TYPE;
v_errormsg VARCHAR2 (1000);
v_error_hint VARCHAR2 (1000);
oracle_err_mes VARCHAR2 (1000);
@@ -592,19 +611,53 @@ BEGIN
-- afwijkende activiteit
BEGIN
SELECT ins_srtcontroledl_xcp_key
INTO v_srtcontroledl_xcp_key
SELECT ins_srtcontroledl_xcp_key,
ins_srtcontroledl_xcp_eenheid,
ins_srtcontroledl_xcp_periode,
ins_srtcontroledl_xcp_bits,
ins_srtcontroledl_xcp_groep
INTO v_srtcontroledl_xcp_key,
v_srtcontroledl_xcp_eenheid,
v_srtcontroledl_xcp_periode,
v_srtcontroledl_xcp_bits,
v_srtcontroledl_xcp_groep
FROM ins_srtcontroledl_xcp scx
WHERE scx.ins_deel_key = v_deel_key
AND scx.ins_srtcontrole_key = v_srtcontrole_key;
UPDATE ins_srtcontroledl_xcp
SET ins_srtcontroledl_xcp_eenheid = rec.ins_srtcontrole_eenheid,
ins_srtcontroledl_xcp_periode = rec.ins_srtcontrole_periode,
ins_srtcontroledl_xcp_bits = rec.ins_srtcontrole_bits,
ins_srtcontroledl_xcp_groep = rec.ins_srtcontroledl_xcp_groep
WHERE ins_srtcontroledl_xcp_key = v_srtcontroledl_xcp_key;
IF v_srtcontroledl_xcp_eenheid <> rec.ins_srtcontrole_eenheid
OR v_srtcontroledl_xcp_periode <> rec.ins_srtcontrole_periode
OR v_srtcontroledl_xcp_bits <> rec.ins_srtcontrole_bits
OR COALESCE(v_srtcontroledl_xcp_groep, 'Leeg') <> COALESCE(rec.ins_srtcontroledl_xcp_groep, 'Leeg')
THEN
-- Willen we een resultaat record aanmaken als start voor de nieuwe controle. Anders komt deze als initieel ver in het verleden te liggen.
-- SELECT MAX(ins_deelsrtcontrole_datum_org)
-- INTO v_deelsrtcontrole_datum_org
-- FROM ins_deelsrtcontrole
-- WHERE ins_deel_key = v_deel_key
-- AND ins_srtcontrole_key = v_srtcontrole_key;
-- set de vervaldatum bij het huidige record
UPDATE ins_srtcontroledl_xcp
SET ins_srtcontroledl_xcp_eind = SYSDATE
WHERE ins_srtcontroledl_xcp_key = v_srtcontroledl_xcp_key;
INSERT INTO ins_srtcontroledl_xcp (ins_deel_key,
ins_srtcontrole_key,
ins_srtcontroledl_xcp_eenheid,
ins_srtcontroledl_xcp_periode,
ins_srtcontroledl_xcp_bits,
ins_srtcontroledl_xcp_groep)
VALUES (v_deel_key,
v_srtcontrole_key,
rec.ins_srtcontrole_eenheid,
rec.ins_srtcontrole_periode,
rec.ins_srtcontrole_bits,
rec.ins_srtcontroledl_xcp_groep);
END IF;
-- geen else. Er is niets veranderd.
EXCEPTION WHEN NO_DATA_FOUND
THEN
INSERT INTO ins_srtcontroledl_xcp (ins_deel_key,
@@ -691,7 +744,7 @@ BEGIN
INTO v_count
FROM asfc_v_imp_bestek_del;
DELETE ins_srtcontroledl_xcp x
UPDATE ins_srtcontroledl_xcp x SET ins_srtcontroledl_xcp_eind = SYSDATE
WHERE x.ins_srtcontroledl_xcp_key IN (
SELECT ins_srtcontroledl_xcp_key FROM asfc_v_imp_bestek_del);
@@ -1019,7 +1072,8 @@ CREATE OR REPLACE VIEW asfc_v_rap_ruimte_bestek
vr,
za,
zo,
nf
nf,
rangorde
)
AS
SELECT alg_locatie_code,
@@ -1060,7 +1114,8 @@ AS
DECODE (BITAND (c.ins_srtcontroledl_xcp_bits, 32), 0, '', '1') vr,
DECODE (BITAND (c.ins_srtcontroledl_xcp_bits, 64), 0, '', '1') za,
DECODE (BITAND (c.ins_srtcontroledl_xcp_bits, 1), 0, '', '1') zo,
DECODE (BITAND (c.ins_srtcontroledl_xcp_bits, 128), 0, '', '1') nf
DECODE (BITAND (c.ins_srtcontroledl_xcp_bits, 128), 0, '', '1') nf,
BITAND (c.ins_srtcontroledl_xcp_bits, 1792)/256 rangorde
FROM alg_v_ruimte_gegevens r,
ins_deel d,
ins_srtcontroledl_xcp c,
@@ -1069,6 +1124,50 @@ AS
AND d.ins_deel_key = c.ins_deel_key
AND c.ins_srtcontrole_key = a.ins_srtcontrole_key;
CREATE OR REPLACE VIEW asfc_v_rap_imp_bestek
(
fclt_f_locatiecode,
fclt_f_gebouwcode,
bouwlaagvolgnummer,
ruimtenummer,
elementsoort,
activiteit,
element,
taak,
freq_aantal,
freq_periode,
ma,
di,
wo,
do,
vr,
za,
zo,
nf,
rangorde
)
AS
SELECT fclt_f_locatie,
fclt_f_gebouw,
verdieping,
ruimte,
'Schoonmaakobject',
fclt_f_werkzaamheden,
SUBSTR (element, INSTR (element, ' - ') + 3) element,
taak,
periode,
eenheid,
ma,
di,
wo,
do,
vr,
za,
zo,
nf,
rangorde
FROM asfc_v_rap_ruimte_bestek;
CREATE OR REPLACE VIEW asfc_v_rap_imp_bestek_dif
(
ruimte,
@@ -1513,7 +1612,7 @@ AS
WHERE eenheid > 2;
BEGIN fac.registercustversion('ASFC', 2); END;
BEGIN fac.registercustversion('ASFC', 3); END;
/
BEGIN adm.systrackscriptId('$Id$', 0); END;
/