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

PIVP#86217 -- Aanpassingen export naar exact op basis van nieuwe kenmerken

Browse Source 
svn path=/Customer/trunk/; revision=69044
This commit is contained in:
Norbert Wassink
2025-05-16 13:15:57 +00:00
parent cd8cb14797
commit 646da8a10a
1 changed files with 11 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
PIVP/PIVP.sql
View File

@@ -2779,7 +2779,7 @@ AS
mld_kenmerk mk,
mld_srtkenmerk msk,
mld_kenmerkmelding mkm
WHERE msk.mld_srtkenmerk_upper = 'FACTUURBEDRAG'
WHERE msk.mld_srtkenmerk_upper = 'FACTUUR_BEDRAG'
and mk.mld_srtkenmerk_key = msk.mld_srtkenmerk_key
and mkm.mld_kenmerk_key = mk.mld_kenmerk_key
and mkm.mld_melding_key = m.mld_melding_key(+)
@@ -2929,7 +2929,7 @@ AS
SELECT NULL sender,
NULL receiver,
'Reservering '||rrr.res_reservering_key||'/'||rrr.RES_RSV_RUIMTE_VOLGNR||' heeft een afwijkende opstelling.' text,
'CUST03' code,
'CUST04' code,
rrr.res_reservering_key key,
rrr.res_rsv_ruimte_key xkey,
(SELECT listagg(p.prs_perslid_email, ';' ) within group (order by p.prs_perslid_email)
@@ -3084,22 +3084,7 @@ AS
FROM mld_kenmerk mk1, mld_kenmerkmelding mkm1
WHERE UPPER(mk1.mld_kenmerk_omschrijving)='P2P ORDERNR'
AND mkm1.mld_kenmerk_key = mk1.MLD_KENMERK_KEY
AND mkm1.mld_melding_key = m.mld_melding_key) p2pordernr,
(SElECT mkm1.MLD_KENMERKMELDING_WAARDE
FROM mld_kenmerk mk1, mld_kenmerkmelding mkm1
WHERE UPPER(mk1.mld_kenmerk_code)='SOFT_COSTS_INTERN'
AND mkm1.mld_kenmerk_key = mk1.MLD_KENMERK_KEY
AND mkm1.mld_melding_key = m.mld_melding_key) softcosts_intern,
(SElECT mkm1.MLD_KENMERKMELDING_WAARDE
FROM mld_kenmerk mk1, mld_kenmerkmelding mkm1
WHERE UPPER(mk1.mld_kenmerk_code)='SOFT_COSTS_EXTERN'
AND mkm1.mld_kenmerk_key = mk1.MLD_KENMERK_KEY
AND mkm1.mld_melding_key = m.mld_melding_key) softcosts_extern,
(SElECT mkm1.MLD_KENMERKMELDING_WAARDE
FROM mld_kenmerk mk1, mld_kenmerkmelding mkm1
WHERE UPPER(mk1.mld_kenmerk_code)='HARD_COSTS'
AND mkm1.mld_kenmerk_key = mk1.MLD_KENMERK_KEY
AND mkm1.mld_melding_key = m.mld_melding_key) hardcosts_extern,
AND mkm1.mld_melding_key = m.mld_melding_key) p2pordernr,
m.mld_melding_externsyncdate extern_syncdate
FROM mld_melding m ,
prs_perslid p,
@@ -3119,7 +3104,7 @@ AS
AND md.ins_discipline_key= msm.mld_ins_discipline_key
AND isd.ins_srtdiscipline_key = md.ins_srtdiscipline_key
-- AND m.mld_melding_einddatum BETWEEN TO_DATE('01-08-2022','dd-mm-yyyy') AND SYSDATE
AND UPPER(mk.mld_kenmerk_omschrijving)='FACTUUR BEDRAG'
AND UPPER(mk.mld_kenmerk_code)='FACTUUR_BEDRAG'
AND mkm.mld_melding_key = m.mld_melding_key
AND mkm.mld_kenmerk_key=mk.mld_kenmerk_key
AND fac.safe_to_number(mkm.mld_kenmerkmelding_waarde)>0
@@ -4098,80 +4083,14 @@ BEGIN
pivp.add_xml_element (v_bestand, 'Date', TO_CHAR(rec_regel.afmelddatum, 'YYYY-MM-DD') );
pivp.add_xml_row (v_bestand, '</Delivery>');
pivp.add_xml_row (v_bestand, '</InvoiceLine>');
IF rec_regel.softcosts_intern >0 THEN
pivp.add_xml_row (v_bestand, '<InvoiceLine lineNo="' || v_sub_count || '" type="N" subtype="N">');
pivp.add_xml_row (v_bestand, '<Warehouse code=""/>'); -- vaste waarde
pivp.add_xml_row (v_bestand, '<Costcenter code=""/>');
pivp.add_xml_row (v_bestand, '<Costunit code=""/>');
pivp.add_xml_row (v_bestand, '<Project code=""/>');
pivp.add_xml_element (v_bestand, 'Text', 'Soft costs intern');
pivp.add_xml_element (v_bestand, 'Description', 'P2P ordernr.:'||rec_regel.p2pordernr);
pivp.add_xml_row (v_bestand, '<Item code="FM-701"/>');
pivp.add_xml_element (v_bestand, 'Quantity', '1' );
pivp.add_xml_row (v_bestand, '<Price>');
pivp.add_xml_row (v_bestand, '<Currency code="EUR"/>');
pivp.add_xml_element (v_bestand, 'Value', rec_regel.softcosts_intern);
pivp.add_xml_row (v_bestand, '</Price>');
pivp.add_xml_row (v_bestand, '<Delivery>');
pivp.add_xml_element (v_bestand, 'Date', TO_CHAR(rec_regel.afmelddatum, 'YYYY-MM-DD') );
pivp.add_xml_row (v_bestand, '</Delivery>');
pivp.add_xml_row (v_bestand, '</InvoiceLine>');
END IF;
IF rec_regel.softcosts_extern >0 THEN
pivp.add_xml_row (v_bestand, '<InvoiceLine lineNo="' || v_sub_count || '" type="N" subtype="N">');
pivp.add_xml_row (v_bestand, '<Warehouse code=""/>'); -- vaste waarde
pivp.add_xml_row (v_bestand, '<Costcenter code=""/>');
pivp.add_xml_row (v_bestand, '<Costunit code=""/>');
pivp.add_xml_row (v_bestand, '<Project code=""/>');
pivp.add_xml_element (v_bestand, 'Text', 'Soft costs extern');
pivp.add_xml_element (v_bestand, 'Description', 'P2P ordernr.:'||rec_regel.p2pordernr);
pivp.add_xml_row (v_bestand, '<Item code="FM-702"/>');
pivp.add_xml_element (v_bestand, 'Quantity', '1' );
pivp.add_xml_row (v_bestand, '<Price>');
pivp.add_xml_row (v_bestand, '<Currency code="EUR"/>');
pivp.add_xml_element (v_bestand, 'Value', rec_regel.softcosts_intern);
pivp.add_xml_row (v_bestand, '</Price>');
pivp.add_xml_row (v_bestand, '<Delivery>');
pivp.add_xml_element (v_bestand, 'Date', TO_CHAR(rec_regel.afmelddatum, 'YYYY-MM-DD') );
pivp.add_xml_row (v_bestand, '</Delivery>');
pivp.add_xml_row (v_bestand, '</InvoiceLine>');
END IF;
-- Nu de hardcosts toevoegen als deze >0 zijn
IF rec_regel.hardcosts_extern >0 THEN
pivp.add_xml_row (v_bestand, '<InvoiceLine lineNo="' || v_sub_count || '" type="N" subtype="N">');
pivp.add_xml_row (v_bestand, '<Warehouse code=""/>'); -- vaste waarde
pivp.add_xml_row (v_bestand, '<Costcenter code=""/>');
pivp.add_xml_row (v_bestand, '<Costunit code=""/>');
pivp.add_xml_row (v_bestand, '<Project code=""/>');
pivp.add_xml_element (v_bestand, 'Text', 'Hard costs extern');
pivp.add_xml_element (v_bestand, 'Description', 'P2P ordernr.:'||rec_regel.p2pordernr);
pivp.add_xml_row (v_bestand, '<Item code="FM-703"/>');
pivp.add_xml_element (v_bestand, 'Quantity', '1' );
pivp.add_xml_row (v_bestand, '<Price>');
pivp.add_xml_row (v_bestand, '<Currency code="EUR"/>');
pivp.add_xml_element (v_bestand, 'Value', rec_regel.hardcosts_extern);
pivp.add_xml_row (v_bestand, '</Price>');
pivp.add_xml_row (v_bestand, '<Delivery>');
pivp.add_xml_element (v_bestand, 'Date', TO_CHAR(rec_regel.afmelddatum, 'YYYY-MM-DD') );
pivp.add_xml_row (v_bestand, '</Delivery>');
pivp.add_xml_row (v_bestand, '</InvoiceLine>');
END IF;
-- Vrij velden tbv de soft/hard costs
pivp.add_xml_row (v_bestand, '<FreeFields>');
pivp.add_xml_row (v_bestand, '<FreeTexts>');
pivp.add_xml_row (v_bestand, '<FreeText number="1" label="Sequence number">'||v_factuurnr||'</FreeText>');
pivp.add_xml_row (v_bestand, '<FreeText number="2" label="PO nummer">'||rec_regel.ponummer||'</FreeText>');
pivp.add_xml_row (v_bestand, '</FreeTexts>');
pivp.add_xml_row (v_bestand, '</FreeFields>');
pivp.add_xml_row (v_bestand, '<FreeTexts>');
pivp.add_xml_row (v_bestand, '<FreeText number="1" label="Sequence number">'||v_factuurnr||'</FreeText>');
pivp.add_xml_row (v_bestand, '<FreeText number="2" label="PO nummer">'||rec_regel.ponummer||'</FreeText>');
pivp.add_xml_row (v_bestand, '</FreeTexts>');
pivp.add_xml_row (v_bestand, '</FreeFields>');