SCPN1-10100

This commit is contained in:
2026-01-28 11:51:58 +01:00
parent 264257fcd0
commit 04a72fcda4
3 changed files with 22 additions and 3 deletions

View File

@@ -75,6 +75,14 @@
{
"Key": "carrier",
"Value": "${carrier_apt.planned_carrier?json_string}"
},
{
"Key": "loading",
"Value": "${carrier_apt.load_appointment?json_string}"
},
{
"Key": "unloading",
"Value": "${carrier_apt.unloading_appointment?json_string}"
}
],
<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,

View File

@@ -77,6 +77,14 @@
{
"Key": "carrier",
"Value": "${carrier_apt.planned_carrier?json_string}"
},
{
"Key": "loading",
"Value": "${carrier_apt.load_appointment?json_string}"
},
{
"Key": "unloading",
"Value": "${carrier_apt.unloading_appointment?json_string}"
}
],
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
@@ -94,8 +102,8 @@
}<#sep>,</#sep>
</#list>
],
</#if>
<#--<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
<#else>
<#--<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
<#else>
<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
@@ -108,6 +116,8 @@
</#if>
</#if>
</#if>-->
</#if>
"Slots": [{
<#-- calcul de de la durée en fonction des start et end time-->
"DurationInSeconds": "${duration}",

View File

@@ -84,9 +84,10 @@
</#if>
]
<#break>
<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated ******************** -->
<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated or ReasonUpdated******************** -->
<#case "SlotUpdated">
<#case "CarrierInformationUpdated">
<#case "ReasonUpdated">
<#assign appointment = eventRP.data />
[
<#if eventRP.appointmentCustomFields?has_content>