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

FZKH#87266 -- Implementatie - Aanpassingen Ultimo Kenmerken import

Browse Source 
svn path=/Customer/trunk/; revision=70524
This commit is contained in:
Norbert Wassink
2025-10-05 12:13:38 +00:00
parent d17e98b159
commit 4b2c412fdb
1 changed files with 181 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

227
FZKH/FZKH.sql
View File

@@ -1793,6 +1793,82 @@ BEGIN
END;
/
CREATE OR REPLACE PROCEDURE FZKH_IMPORT_MT_ASSET_AFDKENM (p_import_key IN NUMBER)
AS
BEGIN
NULL;
END;
/
CREATE OR REPLACE PROCEDURE FZKH_UPDATE_MT_ASSET_AFDKENM (p_import_key IN NUMBER)
AS
CURSOR sel
IS
SELECT fac_imp_csv_col01 ins_deel_omschrijving,
fac_imp_csv_col02 ins_kenmerk_waarde1,
fac_imp_csv_col03 ins_kenmerk_waarde2
FROM fac_imp_csv
WHERE fac_import_key=p_import_key
ORDER BY fac_imp_csv_key;
v_ins_deel_key NUMBER;
v_ins_deel_omschrijving VARCHAR2(50);
v_ins_kenmerk_key NUMBER;
v_kenmerk_waarde VARCHAR2(50);
v_errormsg VARCHAR2 (1000) := '-';
oracle_err_num NUMBER;
oracle_err_mes VARCHAR2 (200);
v_aanduiding VARCHAR2 (200);
BEGIN
v_aanduiding:='Ophalen afdelings kenmerk is mislukt';
SELECT ins_kenmerk_key
INTO v_ins_kenmerk_key
FROm ins_kenmerk
WHERE ins_kenmerk_verwijder IS null
AND ins_kenmerk_code='MIGRATIE_AFDELING';
FOR rec IN sel
LOOP
BEGIN
v_aanduiding:='Ophalen asset '||rec.ins_deel_omschrijving||' is mislukt';
SELECT ins_deel_key
INTO v_ins_deel_key
FROM ins_deel
WHERE ins_deel_omschrijving=rec.ins_deel_omschrijving
AND ins_deel_verwijder IS NULL;
v_kenmerk_waarde:= rec.ins_kenmerk_waarde2||'-'||rec.ins_kenmerk_waarde1;
flx.setflex('INS',v_ins_kenmerk_key,v_ins_deel_key,v_kenmerk_waarde);
EXCEPTION
WHEN NO_DATA_FOUND
THEN
fac.imp_writelog (p_import_key,
'W',
v_aanduiding,
'');
END;
END LOOP;
EXCEPTION
WHEN OTHERS
THEN
oracle_err_num := SQLCODE;
oracle_err_mes := SUBSTR (SQLERRM, 1, 150);
v_errormsg :=
v_errormsg || 'ORACLE (error ' || oracle_err_num || '/' || oracle_err_mes || ')';
fac.imp_writelog (p_import_key,
'E',
'Importproces MT Kenmerken afgebroken!',
v_errormsg);
END;
/
CREATE OR REPLACE PROCEDURE FZKH_IMPORT_MT_KENMERKEN (p_import_key IN NUMBER)
AS
@@ -1806,10 +1882,12 @@ AS
CURSOR sel
IS
SELECT fac_imp_csv_col01 ins_deel_omschrijving,
fac_imp_csv_col03 ins_kenmerk_label,
fac_imp_csv_col08 ins_kenmerk_waarde
fac_imp_csv_col04 ins_kenmerk_label,
fac_imp_csv_col05 ins_kenmerk_waarde
FROM fac_imp_csv
WHERE fac_import_key=p_import_key
AND fac_imp_csv_col01<>'equipmentCode'
AND fac_imp_csv_col05<>'NULL'
ORDER BY fac_imp_csv_key;
v_ins_deel_key NUMBER;
@@ -2391,7 +2469,7 @@ BEGIN
AND vg.ins_srtdiscipline_key = vgt.ins_srtdiscipline_key
AND UPPER(vg.INS_DISCIPLINE_OMSCHRIJVING)=UPPER('Intern (Ultimo)')
AND vg.ins_discipline_key = ms.mld_ins_discipline_key
AND UPPER(ms.mld_stdmelding_omschrijving)=UPPER('Storing')
AND UPPER(ms.mld_stdmelding_omschrijving)=UPPER(rec.mld_stdmelding)
AND ms.MLD_STDMELDING_VERWIJDER IS NULL;
EXCEPTION
@@ -4685,7 +4763,7 @@ CREATE OR REPLACE VIEW FZKH_V_MT_TEAMLEIDERS
AS
SELECT pf.prs_perslid_key, pf.prs_perslid_naam_full, pf.prs_perslid_naam_friendly, pf.prs_perslid_verwijder
FROM fac_gebruikersgroep gg, prs_perslid p, prs_v_perslid_fullnames_all pf
WHERE gg.fac_groep_key = 661 -- Alle MT-Teamleiders A=661 P=601
WHERE gg.fac_groep_key = 601 -- Alle MT-Teamleiders A=661 P=601
AND gg.prs_perslid_key = p.prs_perslid_key
AND p.prs_perslid_apikey IS NULL
AND p.prs_perslid_externid IS NOT NULL
@@ -4715,7 +4793,7 @@ CREATE OR REPLACE VIEW FZKH_V_TEAMLEIDERS_ALL
AS
SELECT pf.prs_perslid_key, pf.prs_perslid_naam_full, a.prs_afdeling_omschrijving, pf.prs_perslid_verwijder
FROM fac_gebruikersgroep gg, prs_perslid p, prs_v_perslid_fullnames_all pf, prs_afdeling a
WHERE gg.fac_groep_key = 701 -- Alle MT-Teamleiders A=701 P=
WHERE gg.fac_groep_key = 701 -- Alle FZKH Teamleiders
AND gg.prs_perslid_key = p.prs_perslid_key
AND p.prs_perslid_apikey IS NULL
AND p.prs_perslid_externid IS NOT NULL
@@ -5192,12 +5270,101 @@ AS
AND km.mld_kenmerkmelding_aanmaak > COALESCE (nj.fac_notificatie_job_lastrun, TRUNC (SYSDATE))
;
-- Notificaties MT
-- CUST09 naar teameldier afdeling bij afmelding acceptatie
-- Notificaties MT-Teamleider
-- CUST11 naar MT Teamleider die NOn-Conform moet goedkeuren,
-- CUST12 naar Teamledier die Non-Conform moet goedkeuren
CREATE OR REPLACE VIEW FZKH_V_NOTI_MT
CREATE OR REPLACE VIEW FZKH_V_NOTI_MT_TEAMLDR
(
code,
sender,
receiver,
text,
key,
par1,
par2,
xkey,
xemail,
xmobile,
fac_srtnotificatie_key,
attachments,
xsender,
prs_bedrijfadres_key
)
AS
SELECT sn.fac_srtnotificatie_code code,
NULL sender,
NULL receiver,
'Graag uw goedkeuring op Non-Conform aanvraag.' text,
m.mld_melding_key key,
NULL par1,
NULL par2,
NULL xkey,
p.prs_perslid_email||';medischetechniek@flevoziekenhuis.nl' xemail,
NULL xmobile,
NULL fac_srtnotificatie_key,
NULL attachments,
NULL xsender,
NULL prs_bedrijfadres_key
FROM mld_melding m,
mld_stdmelding sm,
mld_v_aanwezigkenmerkmelding km,
mld_v_aanwezigkenmerkmelding km2,
prs_perslid p,
fac_srtnotificatie sn,
fac_notificatie_job nj
WHERE m.mld_stdmelding_key = 503 -- Non_conform
AND m.mld_stdmelding_key = sm.mld_stdmelding_key
AND m.mld_melding_key = km.mld_melding_key
--AND km.mld_kenmerk_key = k.mld_kenmerk_key
--AND k.mld_srtkenmerk_key IN (-1)
AND km.mld_kenmerk_key = 885 -- Akkoord ophalen kenmerk
AND fac.safe_to_number(km.mld_kenmerkmelding_waarde)=61
AND m.mld_melding_key = km2.mld_melding_key
AND km2.mld_kenmerk_key=883 -- MT Teamleider
AND fac.safe_to_number(km2.mld_kenmerkmelding_waarde)=p.prs_perslid_key
AND sn.fac_srtnotificatie_code = 'CUST11'
AND nj.fac_notificatie_job_view = 'FZKH_V_NOTI_MT'
AND km.mld_kenmerkmelding_aanmaak > COALESCE (nj.fac_notificatie_job_lastrun, TRUNC (SYSDATE))
UNION
SELECT sn.fac_srtnotificatie_code code,
NULL sender,
NULL receiver,
'Graag uw goedkeuring op Afkeur object aanvraag.' text,
m.mld_melding_key key,
NULL par1,
NULL par2,
NULL xkey,
p.prs_perslid_email||';medischetechniek@flevoziekenhuis.nl' xemail,
NULL xmobile,
NULL fac_srtnotificatie_key,
NULL attachments,
NULL xsender,
NULL prs_bedrijfadres_key
FROM mld_melding m,
mld_stdmelding sm,
mld_v_aanwezigkenmerkmelding km,
mld_v_aanwezigkenmerkmelding km2,
prs_perslid p,
fac_srtnotificatie sn,
fac_notificatie_job nj
WHERE m.mld_stdmelding_key = 502 -- Afkeur object
AND m.mld_stdmelding_key = sm.mld_stdmelding_key
AND m.mld_melding_key = km.mld_melding_key
--AND km.mld_kenmerk_key = k.mld_kenmerk_key
--AND k.mld_srtkenmerk_key IN (-1)
AND km.mld_kenmerk_key = 893 -- Akkoord ophalen kenmerk
AND fac.safe_to_number(km.mld_kenmerkmelding_waarde)=61
AND m.mld_melding_key = km2.mld_melding_key
AND km2.mld_kenmerk_key=894 -- MT Teamleider
AND fac.safe_to_number(km2.mld_kenmerkmelding_waarde)=p.prs_perslid_key
AND sn.fac_srtnotificatie_code = 'CUST12'
AND nj.fac_notificatie_job_view = 'FZKH_V_NOTI_MT'
AND km.mld_kenmerkmelding_aanmaak > COALESCE (nj.fac_notificatie_job_lastrun, TRUNC (SYSDATE));
-- Notificatie naar Afdel Teamleiders
-- CUST09 naar MT team afdeling bij afmelding acceptatie
CREATE OR REPLACE VIEW FZKH_V_NOTI_MT_AFDTEAMLDR
(
code,
sender,
@@ -5248,43 +5415,7 @@ AS
AND ft.fac_srtnotificatie_key=47
AND sn.fac_srtnotificatie_code = 'CUST09'
AND fnj.FAC_NOTIFICATIE_JOB_VIEW='FZKH_V_NOTI_MT'
AND ft.FAC_TRACKING_DATUM> COALESCE (fnj.fac_notificatie_job_lastrun, TRUNC (SYSDATE));
UNION ALL
SELECT sn.fac_srtnotificatie_code code,
NULL sender,
NULL receiver,
'Graag uw goedkeuring op Non-Conform aanvraag.' text,
m.mld_melding_key key,
NULL par1,
NULL par2,
NULL xkey,
p.prs_perslid_email||';medischetechniek@flevoziekenhuis.nl' xemail,
NULL xmobile,
NULL fac_srtnotificatie_key,
NULL attachments,
NULL xsender,
NULL prs_bedrijfadres_key
FROM mld_melding m,
mld_stdmelding sm,
mld_v_aanwezigkenmerkmelding km,
mld_v_aanwezigkenmerkmelding km2,
prs_perslid p,
fac_srtnotificatie sn,
fac_notificatie_job nj
WHERE m.mld_stdmelding_key = 503 -- Non_conform
AND m.mld_stdmelding_key = sm.mld_stdmelding_key
AND m.mld_melding_key = km.mld_melding_key
--AND km.mld_kenmerk_key = k.mld_kenmerk_key
--AND k.mld_srtkenmerk_key IN (-1)
AND km.mld_kenmerk_key = 901 -- Akkoord ophalen kenmerk
AND fac.safe_to_number(km.mld_kenmerkmelding_waarde)=61
AND m.mld_melding_key = km2.mld_melding_key
AND km2.mld_kenmerk_key=921 -- MT Teamleider
AND fac.safe_to_number(km2.mld_kenmerkmelding_waarde)=p.prs_perslid_key
AND sn.fac_srtnotificatie_code = 'CUST11'
AND nj.fac_notificatie_job_view = 'FZKH_V_NOTI_MT'
AND km.mld_kenmerkmelding_aanmaak > COALESCE (nj.fac_notificatie_job_lastrun, TRUNC (SYSDATE));
AND ft.FAC_TRACKING_DATUM> COALESCE (fnj.fac_notificatie_job_lastrun, TRUNC (SYSDATE));
-- Object overzicjt per afdefling
-- Alleen actieve en niet vervallen objecten.
@@ -5429,7 +5560,9 @@ AS
'#000000'
END kleur
FROM INS_V_DEEL_GEGEVENS iv, ins_deelsrtcontrole ids, ins_srtcontrole isc
WHERE ids.INS_DEEL_KEY = iv.INS_DEEL_KEY
WHERE ids.INS_DEEL_KEY = iv.INS_DEEL_KEY
AND UPPER (iv.INS_DISCIPLINE_OMSCHRIJVING) =
UPPER ('Medische Techniek')
AND ids.INS_DEELSRTCONTROLE_STATUS IN (0,1,2) -- Ingepland, gestart of ter uitvoering
AND isc.INS_SRTCONTROLE_KEY = ids.INS_SRTCONTROLE_KEY
UNION
@@ -5456,6 +5589,8 @@ AS
END kleur
FROM INS_V_DEEL_GEGEVENS iv, ins_deelsrtcontrole ids, ins_srtcontrole isc, mld_melding m, mld_melding_object mmo
WHERE ids.INS_DEEL_KEY = iv.INS_DEEL_KEY
AND UPPER (iv.INS_DISCIPLINE_OMSCHRIJVING) =
UPPER ('Medische Techniek')
AND ids.INS_DEELSRTCONTROLE_STATUS IN (0,1,2) -- Ingepland, gestart of ter uitvoering
AND isc.INS_SRTCONTROLE_KEY = ids.INS_SRTCONTROLE_KEY
AND mmo.INS_DEEL_KEY = ids.INS_DEEL_KEY