reflex/reflex-wms-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

Revert "SCPN1-9640"

Browse Source 
This reverts commit 894031cc496634f5f5d2a63d043f4cc7a72b0613.
This commit is contained in:
Laurie MONTANT 2025-11-10 14:45:26 +01:00
parent bf365ba170
commit a151a0b655
1 changed files with 10 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
View File

@ -15,11 +15,9 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ActorID": "${carrier_apt.physical_depot}", "ActorID": "${carrier_apt.physical_depot}",
"AppointmentID": "${carrier_apt.appointment_reference}",
"TimeZone":"${time_zone_rfx}",
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
<#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime,time_zone_rfx) /> <#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime,time_zone_rfx) />
<#else> <#else>
<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" > <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION>
@ -29,37 +27,17 @@
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_BOTH>
<#assign duration = 0 /> <#-- à confirmer --> <#assign duration = 0 /> <#-- à confirmer -->
<#else> <#else>
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
<#assign duration = 0 /> <#-- à confirmer --> <#assign duration = 0 /> <#-- à confirmer -->
</#if> </#if>
</#if> </#if>
</#if> </#if>
"ProjectID": "${projectRP}",
"Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer -->
"Reason": "no commission", <#-- à confirmer -->
"CarrierName": "${carrier_apt.planned_carrier}",
"AppointmentType": "${appointmentType}", "AppointmentType": "${appointmentType}",
"Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer --> "AppointmentID": "${carrier_apt.appointment_reference}",
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)>
"Commissions": [
<#list carrier_apt.physical_receipt_list as physical_receipt>
{
"ActorID": "${carrier_apt.physical_depot}",
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
"ProjectID": "${projectRP}",
"Quantities": [
{
"UnitID": "PAL", <#-- à changer -->
"Value": 1 <#-- à changer -->
}
]
}<#sep>,</#sep>
</#list>
]
<#else>
"ProjectID": "${projectRP}",
"Reason": "no commission", <#-- à confirmer -->
</#if>
<#if carrier_apt.planned_carrier?? && carrier_apt.planned_carrier!="">
"CarrierName": "${carrier_apt.planned_carrier}",
</#if>
"Slots": [{ "Slots": [{
<#-- calcul de de la durée en fonction des start et end time--> <#-- calcul de de la durée en fonction des start et end time-->
"DurationInSeconds": "${duration}", "DurationInSeconds": "${duration}",
@ -70,7 +48,7 @@
"StartDateTime": "${carrier_apt.planned_load_start_datetime}" "StartDateTime": "${carrier_apt.planned_load_start_datetime}"
<#else> <#else>
<#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_load_start_datetime,time_zone_rfx) /> <#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_load_start_datetime,time_zone_rfx) />
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
<#if duration >= 0> <#if duration >= 0>
"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
<#else> <#else>