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

Merge branch 'develop' into develop-rdz

Browse Source 
# Conflicts:
#	RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
This commit is contained in:
Francis REAT 2025-11-12 17:14:12 +01:00
commit a2fd6f1145
2 changed files with 31 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
RFXtoRP_HsaProStatus.ftl
View File

@ -65,7 +65,7 @@
</#if> </#if>
</#if> </#if>
<#else> <#else>
<#stop> <#stop >
</#if> </#if>
] ]
<#break> <#break>

41
RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
View File

@ -1,20 +1,15 @@
<#include "HfRpConfig.ftl"> <#include "HfRpConfig.ftl">
<#include "ReflexUtils.ftl"> <#include "ReflexUtils.ftl">
<#-- à quoi correspond ID du transporteur dans l'API a voir avec Vincent--> <#-- à quoi correspond ID du transporteur dans l'API a voir avec Vincent-->
[ [
{ {
<#assign appointment_reception_start_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.planned_unloading_start_datetime,time_zone_rfx) />
<#assign appointment_expedition_start_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.planned_load_start_datetime,time_zone_rfx) />
<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
"Header":{ "Header":{
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ActorID": "${carrier_apt.physical_depot}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
"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 = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso,time_zone_rfx) /> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso,time_zone_rfx) />
@ -32,12 +27,32 @@
</#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}",
"AppointmentID": "${carrier_apt.appointment_reference}", "Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer -->
<#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": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"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}",