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

MARX#54121: De status VER - verlengen (het gaat langer duren)

Browse Source 
svn path=/Website/branches/v2018.1/; revision=38626
This commit is contained in:
Marcel Bourseau
2018-07-24 13:07:46 +00:00
parent accb7a1b68
commit e2340a7487
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CUST/MARX/xsl/F_PutOpdrachtSIDB.xsl
View File

@@ -70,7 +70,10 @@
<status><xsl:apply-templates select="InstructionData/Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<xsl:if test="InstructionData/Status = 'VER'">
<plandatum2><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="InstructionData/Status = 'GER'">
<mut_datum><xsl:apply-templates select="InstructionData/DateReady"/></mut_datum>
@@ -88,7 +91,10 @@
<status><xsl:apply-templates select="sales005:InstructionData/sales005:Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<xsl:if test="sales005:InstructionData/sales005:Status = 'VER'">
<plandatum2><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="sales005:InstructionData/sales005:Status = 'GER'">
<mut_datum><xsl:apply-templates select="sales005:InstructionData/sales005:DateReady"/></mut_datum>

9
CUST/MARX/xsl/F_PutOpdrachtSIDB_SALES005_1.0.xsl
View File

@@ -70,7 +70,11 @@
<status><xsl:apply-templates select="InstructionData/Status"/></status>
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<plandatum><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/RequiredDeliveryTime"/></plandatum>
<!-- MARX#54121: De status VER - verlengen (het gaat langer duren -->
<xsl:if test="InstructionData/Status = 'VER'">
<plandatum2><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="InstructionData/AppointmentDateTimeInformation/DeliveryTimeFrame/DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="InstructionData/Status = 'GER'">
<mut_datum><xsl:apply-templates select="InstructionData/DateReady"/></mut_datum>
@@ -89,6 +93,9 @@
<!-- Plandatum en tijd van opdracht -->
<!-- In INSBOU001 Release nov-2015 hiervoor node AppointmentDateTimeInformation gebruiken, daarvoor node CompletionDateTimeInformation -->
<plandatum><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryDate"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:RequiredDeliveryTime"/></plandatum>
<xsl:if test="sales005:InstructionData/sales005:Status = 'VER'">
<plandatum2><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryDateLatest"/><xsl:text> </xsl:text><xsl:value-of select="sales005:InstructionData/sales005:AppointmentDateTimeInformation/sales005:DeliveryTimeFrame/sales005:DeliveryTimeLatest"/></plandatum2>
</xsl:if>
<!-- Afwijkende gereeddatum (<> SYSDATE) kan via mut_datum, de werking is wel afhankelijk van -->
<xsl:if test="sales005:InstructionData/sales005:Status = 'GER'">
<mut_datum><xsl:apply-templates select="sales005:InstructionData/sales005:DateReady"/></mut_datum>