MARX#58343: Import Buursema - Alert: sortering Instructionlines

svn path=/Website/branches/v2019.1/; revision=43702

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB.xsl

@@ -197,7 +197,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_4PS_soap.xsl

@@ -171,9 +171,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" data-type="number"/>
 							<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">

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_2016.2_soap.xsl

@@ -172,9 +172,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" data-type="number"/>
 								<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">
@@ -239,7 +245,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3"  xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015.xsl

@@ -162,9 +162,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" data-type="number"/>
 							<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">
@@ -228,7 +234,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_INSBOU001_nov2015_soap.xsl

@@ -165,9 +165,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" data-type="number"/>
 							<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">
@@ -231,7 +237,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.gs1.nl/onderhoudsopdracht/insbou/001">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005.xsl

@@ -165,9 +165,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" data-type="number"/>
 								<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">
@@ -231,7 +237,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005_etim.xsl

@@ -181,9 +181,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" data-type="number"/>
 								<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">
@@ -248,7 +254,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.ketenstandaard.nl/onderhoudsopdracht/SALES/005">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005_etim_cdata.xsl

@@ -181,9 +181,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" data-type="number"/>
 								<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">
@@ -248,7 +254,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.ketenstandaard.nl/onderhoudsopdracht/SALES/005">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_GetOnderhoudsOpdrachtSIDB_SALES005_soap.xsl

@@ -181,9 +181,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" data-type="number"/>
 								<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">
@@ -248,7 +254,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.ketenstandaard.nl/onderhoudsopdracht/SALES/005">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_SIDB_005.xsl

@@ -170,9 +170,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" data-type="number"/>
 								<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">
@@ -249,7 +255,7 @@
   </xsl:template>
   
   <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.ketenstandaard.nl/onderhoudsopdracht/SALES/005">
-    <xsl:for-each select="materialen">
+    <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----
 </xsl:for-each>

CUST/MARX/xsl/F_SIDB_005_1.0.xsl

@@ -180,7 +180,7 @@
 					<xsl:choose>
 						<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:for-each select="materialen">
 								<xsl:sort select="id" data-type="number"/>
 								<InstructionLine>
 								<xsl:call-template name="construct_instructionlines">
@@ -324,7 +324,7 @@
     </xsl:choose>
   </xsl:template>
   
-  <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.ketenstandaard.nl/onderhoudsopdracht/SALES/005">
+  <xsl:template name="construct_freetext_of_extra3" xmlns="http://www.ketenstandaard.nl/onderhoudsopdracht/SALES/005">
     <xsl:for-each select="materialen"><xsl:sort select="id" data-type="number"/>
 <xsl:value-of select="substring(id,1,6)"/>. <xsl:value-of select="substring(extra3,1,1000)"/>
 ----