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

MARX#53353: HaagWonen wil LEDO informatie beschikbaar stellen voor leverancier II

Browse Source 
svn path=/Website/branches/v2018.1/; revision=38871
This commit is contained in:
Marcel Bourseau
2018-08-20 15:25:20 +00:00
parent 1b4e90fb69
commit 0aea3b37ee
2 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
CUST/MARX/xsl/F_SIDB_005_1.0.xsl
View File

@@ -177,9 +177,15 @@
<xsl:when test="count(materialen) &gt; 0">
<!-- Mareon opdracht MET materiaalregels, die gaan we stuk voor stuk langs (Mareon AX-opdrachten voor MARX07) -->
<xsl:for-each select="materialen">
<xsl:sort select="id"/>
<InstructionLine>
<xsl:call-template name="construct_instructionlines">
<xsl:with-param name="p_LineNumber" select="position()"/>
<xsl:with-param name="p_LineNumber">
<xsl:choose>
<xsl:when test="id != ''"><xsl:value-of select="substring(id,1,6)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="position()"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_Quantity" select="aantal"/>
<!-- MARX#38434: default met PCE doorsturen, indien AX leeg wordt aangeleverd. -->
<xsl:with-param name="p_MeasurementUnitQuantity">
@@ -193,9 +199,12 @@
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_NormPriceCode" select="substring(normalize-space(code),1,17)"/>
<xsl:with-param name="p_LEDOInformation" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_LEDO_Locatie" select="substring(groep,1,70)"/>
<xsl:with-param name="p_LEDO_Element" select="substring(extra2,1,70)"/>
<xsl:with-param name="p_LEDO_Defect" select="substring(extra3,1,1000)"/>
<xsl:with-param name="p_LEDO_Oorzaak" select="substring(extra4,1,70)"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_LongDescription" select="substring(info,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
</xsl:call-template>
<xsl:call-template name="construct_instruction_pricelines">
@@ -210,7 +219,7 @@
</xsl:call-template>
</xsl:otherwise>
</xsl:choose>
</xsl:with-param>
</xsl:with-param>
</xsl:call-template>
</InstructionLine>
</xsl:for-each>
@@ -223,13 +232,16 @@
<xsl:with-param name="p_Quantity" select="'1'"/>
<xsl:with-param name="p_MeasurementUnitQuantity" select="'PCE'"/>
<xsl:with-param name="p_NormPriceCode" select="''"/>
<xsl:with-param name="p_LEDOInformation">
<xsl:with-param name="p_LEDO_Locatie" select="''"/>
<xsl:with-param name="p_LEDO_Element" select="''"/>
<xsl:with-param name="p_LEDO_Defect">
<!-- als memo veld (key 12) is gevuld, dan gaan we die tonen, anders de opdrachtomschrijving (waar de memo ook in zit, dit is alleen bij oude opdrachten van voor release MARX07 -->
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key=12],1,1000)"/></xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:with-param>
<xsl:with-param name="p_LEDO_Oorzaak" select="''"/>
<xsl:with-param name="p_ShortDescription" select="substring(omschrijving,1,35)"/>
<xsl:with-param name="p_LongDescription" select="substring(omschrijving,1,70)"/>
<xsl:with-param name="p_FreeText" select="substring(melding/kenmerk[@key='6'],1,1000)"/>
@@ -302,7 +314,10 @@
<xsl:param name="p_Quantity"/>
<xsl:param name="p_MeasurementUnitQuantity"/>
<xsl:param name="p_NormPriceCode"/>
<xsl:param name="p_LEDOInformation"/>
<xsl:param name="p_LEDO_Locatie"/>
<xsl:param name="p_LEDO_Element"/>
<xsl:param name="p_LEDO_Defect"/>
<xsl:param name="p_LEDO_Oorzaak"/>
<xsl:param name="p_ShortDescription"/>
<xsl:param name="p_LongDescription"/>
<xsl:param name="p_FreeText"/>
@@ -324,8 +339,11 @@
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'LongDescription'"/><xsl:with-param name="p_value" select="$p_LongDescription"/></xsl:call-template>
<!-- SIDB: Tekstveld met de beschrijving van de ruimte waar het onderhoud moet plaats vinden, Optioneel, C(35). -->
<!-- Melding kenmerk key 6 is objectomschrijving uit Tobias, hier maar voorlopig in gebruiken aan gebrek aan beter -->
<LEDOInformation>
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'Defect'"/><xsl:with-param name="p_value" select="$p_LEDOInformation"/></xsl:call-template>
<LEDOInformation>
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'Location'"/><xsl:with-param name="p_value" select="$p_LEDO_Locatie"/></xsl:call-template>
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'Element'"/><xsl:with-param name="p_value" select="$p_LEDO_Element"/></xsl:call-template>
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'Defect'"/><xsl:with-param name="p_value" select="$p_LEDO_Defect"/></xsl:call-template>
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'Cause'"/><xsl:with-param name="p_value" select="$p_LEDO_Oorzaak"/></xsl:call-template>
</LEDOInformation>
<!-- SIDB - Voor de rest optioneel, onderstaande gegevens nog niet bekend via Mareon -->
<xsl:call-template name="XMLnode_IfNotEmpty_sales005"><xsl:with-param name="p_nodename" select="'FreeText'"/><xsl:with-param name="p_value" select="$p_FreeText"/></xsl:call-template>

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

@@ -330,6 +330,10 @@
<td colspan="4">
<table cellpadding="2" cellspacing="0" border="1" bordercolor="#303030" width="100%">
<tr>
<td><b>Nr.</b></td>
<td><b>Locatie</b></td>
<td><b>Element</b></td>
<td><b>Oorzaak</b></td>
<td><b>Code</b></td>
<td width="30%"><b>Omschrijving</b></td>
<td><b>Eenheid</b></td>
@@ -970,6 +974,10 @@
<xsl:for-each select="//facilitor/opdracht/materialen[extra1=$p_extra1]">
<xsl:sort select="volgnr" data-type="number"/>
<tr>
<td><xsl:value-of select="id"/></td>
<td><xsl:value-of select="groep"/></td>
<td><xsl:value-of select="extra2"/></td>
<td><xsl:value-of select="extra4"/></td>
<td><xsl:value-of select="code"/></td>
<td><xsl:value-of select="omschrijving"/></td>
<td><xsl:value-of select="eenheid"/></td>