MARX#57092: Opdrachtten van Alliantie missen cruciale informatie

svn path=/Website/branches/v2019.1/; revision=41754
This commit is contained in:
Marcel Bourseau
2019-03-22 14:37:04 +00:00
parent 68cb8dd080
commit 6e15f48d16
4 changed files with 77 additions and 19 deletions

View File

@@ -106,10 +106,7 @@
<!-- SIDB - Tekstveld met de inhoud van aanvullende informatie. Optioneel, C(70) -->
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<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:call-template name="construct_freetext_opdr_nivo"/>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
<ContractReference></ContractReference>
@@ -229,8 +226,25 @@
</MaintenanceInstruction>
</etim>
</xsl:template>
<xsl:template name="construct_freetext_opdr_nivo" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:when test="count(materialen) &gt; 0">
<xsl:variable name="l_freetext"><xsl:call-template name="construct_freetext_of_extra3"/></xsl:variable>
<xsl:value-of select="substring($l_freetext,1,1000)"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="construct_freetext_of_extra3" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
<xsl:for-each select="materialen">
----
<xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
</xsl:for-each>
</xsl:template>
<xsl:template name="construct_instructionlines" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
<xsl:param name="p_LineNumber"/>
<xsl:param name="p_Quantity"/>

View File

@@ -96,10 +96,7 @@
<!-- SIDB - Tekstveld met de inhoud van aanvullende informatie. Optioneel, C(70) -->
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<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:call-template name="construct_freetext_opdr_nivo"/>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
<ContractReference></ContractReference>
@@ -218,7 +215,25 @@
</InstructionData>
</MaintenanceInstruction>
</xsl:template>
<xsl:template name="construct_freetext_opdr_nivo">
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:when test="count(materialen) &gt; 0">
<xsl:variable name="l_freetext"><xsl:call-template name="construct_freetext_of_extra3"/></xsl:variable>
<xsl:value-of select="substring($l_freetext,1,1000)"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="construct_freetext_of_extra3">
<xsl:for-each select="materialen">
----
<xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
</xsl:for-each>
</xsl:template>
<xsl:template name="construct_instructionlines">
<xsl:param name="p_LineNumber"/>
<xsl:param name="p_Quantity"/>

View File

@@ -99,10 +99,7 @@
<!-- SIDB - Tekstveld met de inhoud van aanvullende informatie. Optioneel, C(70) -->
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<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:call-template name="construct_freetext_opdr_nivo"/>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
<ContractReference></ContractReference>
@@ -222,6 +219,24 @@
</MaintenanceInstruction>
</xsl:template>
<xsl:template name="construct_freetext_opdr_nivo" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:when test="count(materialen) &gt; 0">
<xsl:variable name="l_freetext"><xsl:call-template name="construct_freetext_of_extra3"/></xsl:variable>
<xsl:value-of select="substring($l_freetext,1,1000)"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="construct_freetext_of_extra3" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
<xsl:for-each select="materialen">
----
<xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
</xsl:for-each>
</xsl:template>
<xsl:template name="construct_instructionlines" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
<xsl:param name="p_LineNumber"/>
<xsl:param name="p_Quantity"/>

View File

@@ -99,10 +99,7 @@
<!-- SIDB - Tekstveld met de inhoud van aanvullende informatie. Optioneel, C(70) -->
<!-- Zie MARX#37078: Opdrachtomschrijving ook in de node in InstructionData/FreeText -->
<FreeText>
<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:call-template name="construct_freetext_opdr_nivo"/>
</FreeText>
<!-- SIDB - Gegevens waarmee gerefereerd wordt aan een contract. Optioneel -->
<ContractReference></ContractReference>
@@ -221,7 +218,24 @@
</InstructionData>
</MaintenanceInstruction>
</xsl:template>
<xsl:template name="construct_freetext_opdr_nivo">
<xsl:choose>
<xsl:when test="kenmerk[@key=12] != ''"><xsl:value-of select="substring(kenmerk[@key='12'],1,1000)"/></xsl:when>
<xsl:when test="count(materialen) &gt; 0">
<xsl:variable name="l_freetext"><xsl:call-template name="construct_freetext_of_extra3"/></xsl:variable>
<xsl:value-of select="substring($l_freetext,1,1000)"/>
</xsl:when>
<xsl:otherwise><xsl:value-of select="substring(omschrijving,1,1000)"/></xsl:otherwise>
</xsl:choose>
</xsl:template>
<xsl:template name="construct_freetext_of_extra3">
<xsl:for-each select="materialen">
----
<xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
</xsl:for-each>
</xsl:template>
<xsl:template name="construct_instructionlines">
<xsl:param name="p_LineNumber"/>