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

MARX#35981: Complexnummer, Pandnummer en VGE nummer

Browse Source 
svn path=/Website/branches/v2016.1/; revision=29895
This commit is contained in:
Marcel Bourseau
2016-06-29 14:21:20 +00:00
parent b6b3b565ae
commit df4055e132
5 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CUST/MARX/xsl/A_GetOpdrachten.xsl
View File

@@ -12,10 +12,10 @@
<xsl:apply-templates select="s:Envelope/s:Body"/>
</xsl:template>
<xsl:template match="s:Body">exec_code;ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum;mld_opdr_mat_linenr;mld_opdr_mat_naam;mld_opdr_mat_eenheidcode;mld_opdr_mat_eenheid;mld_opdr_mat_prijs;mld_opdr_mat_aantal;mld_opdr_mat_btwperc;mld_opdr_mat_totaal
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custStreet"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="b:registrationDate"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="b:deadlineDate"/>;;;;;;;;
2;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;;<xsl:value-of select="b:companyId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:supervisorName"/></xsl:call-template>;;;;;;;;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="descendant::*/b:SupplierTaskSpec/b:SupplierPurchLines/b:SupplierPurchLine">3;<xsl:value-of select="../../b:vendAccountNum"/>;<xsl:value-of select="../../b:requestId"/>;;<xsl:value-of select="../../b:companyId"/>;;;;;;;;;;;;<xsl:value-of select="../../b:purchId"/>;<xsl:value-of select="../../b:taskId"/>;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="b:lineNum"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:name"/></xsl:call-template>;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="b:purchUnitGS1"/></xsl:call-template>;<xsl:value-of select="b:purchUnit"/>;<xsl:value-of select="b:purchPrice"/>;<xsl:value-of select="b:qtyOrdered"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="b:taxItemGroup"/></xsl:call-template>;<xsl:value-of select="b:lineAmount"/>;&#10;</xsl:for-each>
<xsl:template match="s:Body">exec_code;ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;complexnummer;pandnummer;VGEnummer;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum;mld_opdr_mat_linenr;mld_opdr_mat_naam;mld_opdr_mat_eenheidcode;mld_opdr_mat_eenheid;mld_opdr_mat_prijs;mld_opdr_mat_aantal;mld_opdr_mat_btwperc;mld_opdr_mat_totaal
<xsl:for-each select="descendant::*/b:SupplierTaskSpec">1;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:description"/></xsl:call-template>;<xsl:value-of select="b:companyId"/>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custName"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custStreet"/></xsl:call-template>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custZipCode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custCity"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custPhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:custMobilePhone"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:objectDescription"/></xsl:call-template>;;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="substring(b:memo,1,3000)"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;<xsl:value-of select="b:registrationDate"/>;<xsl:call-template name="mld_opdr_plandatum"><xsl:with-param name="p_task_status" select="b:taskStatus"/><xsl:with-param name="p_plan_datum" select="b:startDateTime"/></xsl:call-template>;<xsl:value-of select="b:deadlineDate"/>;;;;;;;;
2;<xsl:value-of select="b:vendAccountNum"/>;<xsl:value-of select="b:requestId"/>;;<xsl:value-of select="b:companyId"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:supervisorName"/></xsl:call-template>;;;;;;;;;;;<xsl:value-of select="b:objectId"/>;;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:purchId"/></xsl:call-template>;<xsl:value-of select="b:taskId"/>;;;;;;;;;;;&#10;</xsl:for-each>
<xsl:for-each select="descendant::*/b:SupplierTaskSpec/b:SupplierPurchLines/b:SupplierPurchLine">3;<xsl:value-of select="../../b:vendAccountNum"/>;<xsl:value-of select="../../b:requestId"/>;;<xsl:value-of select="../../b:companyId"/>;;;;;;;;;;;;;;;<xsl:value-of select="../../b:purchId"/>;<xsl:value-of select="../../b:taskId"/>;;;;<xsl:call-template name="Materiaal_regel"><xsl:with-param name="p_linenr" select="b:lineNum"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="b:name"/></xsl:call-template>;<xsl:call-template name="Materiaal_eenheidSidB"><xsl:with-param name="p_unit" select="b:purchUnitGS1"/></xsl:call-template>;<xsl:value-of select="b:purchUnit"/>;<xsl:value-of select="b:purchPrice"/>;<xsl:value-of select="b:qtyOrdered"/>;<xsl:call-template name="Mareon_btwperc"><xsl:with-param name="p_btwperc" select="b:taxItemGroup"/></xsl:call-template>;<xsl:value-of select="b:lineAmount"/>;&#10;</xsl:for-each>
</xsl:template>
@@ -99,5 +99,6 @@
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

4
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB.xsl
View File

@@ -101,9 +101,9 @@
<!-- SIDB - Uniek nummer ter identificatie van een woningcorporatie complex. Optioneel, C(17) -->
<!-- <ComplexNumber></ComplexNumber> -->
<!-- SIDB - Uniek nummer ter identificatie van een pand. Optioneel, C(17) -->
<!-- <PremisesNumber></PremisesNumber> -->
<PremisesNumber><xsl:value-of select="kenmerk[@key='15']"/></PremisesNumber>
<!-- SIDB - Uniek nummer ter identificatie van een vastgoedeenheid. Optioneel, C(17) -->
<!-- <RealEstateUnitNumber></RealEstateUnitNumber>-->
<RealEstateUnitNumber><xsl:value-of select="kenmerk[@key='16']"/></RealEstateUnitNumber>
<!-- SIDB - Tekstveld met straatnaam en huisnummer van het adres van de lokatie. Mandatory, C(35) -->
<!-- Melding kenmerk key 2 is adres, deze is vervangen door kenmerken straatnaam (key 9) en huisnr (key 10) -->
<StreetAndNumber><xsl:value-of select="melding/kenmerk[@key='9']"/><xsl:text> </xsl:text><xsl:value-of select="melding/kenmerk[@key='10']"/></StreetAndNumber>

4
CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015.xsl
View File

@@ -101,9 +101,9 @@
<!-- SIDB - Uniek nummer ter identificatie van een woningcorporatie complex. Optioneel, C(17) -->
<!-- <ComplexNumber></ComplexNumber> -->
<!-- SIDB - Uniek nummer ter identificatie van een pand. Optioneel, C(17) -->
<!-- <PremisesNumber></PremisesNumber> -->
<PremisesNumber><xsl:value-of select="kenmerk[@key='15']"/></PremisesNumber>
<!-- SIDB - Uniek nummer ter identificatie van een vastgoedeenheid. Optioneel, C(17) -->
<!-- <RealEstateUnitNumber></RealEstateUnitNumber>-->
<RealEstateUnitNumber><xsl:value-of select="kenmerk[@key='16']"/></RealEstateUnitNumber>
<!-- SIDB - Tekstvelden met straatnaam en huisnummer van het adres van de lokatie. Mandatory, C(35) -->
<!-- Melding kenmerk key 9 is straatnaam -->
<Street><xsl:value-of select="melding/kenmerk[@key='9']"/></Street>

14
CUST/MARX/xsl/T_GetOpdrachten.xsl
View File

@@ -10,8 +10,8 @@
<xsl:apply-templates select="soap:Envelope/soap:Body"/>
</xsl:template>
<xsl:template match="soap:Body">ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum
<xsl:for-each select="descendant::*/Bon"><xsl:value-of select="CrediteurNummer"/>;<xsl:value-of select="BonNummer"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="BonOmschrijving"/></xsl:call-template>;1;<xsl:call-template name="Tobias_SkipGeen"><xsl:with-param name="p_str" select="OpzichterNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuurderNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="StraatNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuisNummer"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Toevoegsel"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Postcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Woonplaats"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Telefoon"/></xsl:call-template>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_objectDescription"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_memo"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="concat(BonNummer,'.',BonVolgNummer)"/></xsl:call-template>;<xsl:value-of select="BonId"/>;<xsl:value-of select="substring(BonDatumOpdracht,1,10)"/>;;<xsl:call-template name="Tobias_UitersteDatumGereed"><xsl:with-param name="p_datum" select="substring(UitersteDatumGereed,1,10)"/></xsl:call-template>;&#10;</xsl:for-each>
<xsl:template match="soap:Body">ax_supplier_id;mld_melding_externnr;mld_melding_omschrijving;prs_afdeling_externnr;mld_opdr_opzichter;mld_melding_cust_name;mld_melding_cust_straat;mld_melding_cust_huisnr;mld_melding_cust_huisnr2;mld_melding_cust_postcode;mld_melding_cust_plaats;mld_melding_cust_telefoonnr;mld_melding_cust_mobielnr;mld_melding_cust_object_omschr;complexnummer;pandnummer;VGEnummer;mld_melding_memo;mld_opdr_externnr;mld_opdr_ordernr;mld_opdr_datumbegin;mld_opdr_datum_plan;mld_opdr_einddatum
<xsl:for-each select="descendant::*/Bon"><xsl:value-of select="CrediteurNummer"/>;<xsl:value-of select="BonNummer"/>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="BonOmschrijving"/></xsl:call-template>;1;<xsl:call-template name="Tobias_SkipGeen"><xsl:with-param name="p_str" select="OpzichterNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuurderNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="StraatNaam"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="HuisNummer"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Toevoegsel"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Postcode"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Woonplaats"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="Telefoon"/></xsl:call-template>;;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_objectDescription"/></xsl:call-template>;;<xsl:value-of select="ToeNummer"/>;<xsl:call-template name="VGEnummer"><xsl:with-param name="p_str1" select="ClusterKode"/><xsl:with-param name="p_str2" select="PerceelNummerToe"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="xxx_memo"/></xsl:call-template>;<xsl:call-template name="vrije_tekst"><xsl:with-param name="p_string" select="concat(BonNummer,'.',BonVolgNummer)"/></xsl:call-template>;<xsl:value-of select="BonId"/>;<xsl:value-of select="substring(BonDatumOpdracht,1,10)"/>;;<xsl:call-template name="Tobias_UitersteDatumGereed"><xsl:with-param name="p_datum" select="substring(UitersteDatumGereed,1,10)"/></xsl:call-template>;&#10;</xsl:for-each>
</xsl:template>
<xsl:template name="vrije_tekst">
@@ -58,4 +58,14 @@
</xsl:choose>
</xsl:template>
<xsl:template name="VGEnummer">
<xsl:param name="p_str1"/>
<xsl:param name="p_str2"/>
<xsl:choose>
<xsl:when test="$p_str1 != '0' and $p_str1 != ''"><xsl:value-of select="$p_str1"/></xsl:when>
<xsl:when test="$p_str2 != '0' and $p_str2 != ''"><xsl:value-of select="$p_str2"/></xsl:when>
<xsl:otherwise></xsl:otherwise>
</xsl:choose>
</xsl:template>
</xsl:stylesheet>

17
CUST/MARX/xsl/mareon.xsl
View File

@@ -225,6 +225,21 @@
</td>
</tr>
<tr>
<td align="right">
<b>Pandnummer:</b>
</td>
<td>
<xsl:value-of select="kenmerk[@key='15']"/>
</td>
<td align="right">
<b>VGE nummer:</b>
</td>
<td>
<xsl:value-of select="kenmerk[@key='16']"/>
</td>
</tr>
<tr>
<td align="right">
<b>Opzichter:</b>
@@ -233,6 +248,8 @@
<xsl:value-of select="kenmerk[@key=13]"/>
</td>
</tr>
<tr>
<td align="right" valign="top">