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

Merge branch 'develop-rdz' into 'develop'

Browse Source 
modif sur les rdz

See merge request r-d-technique/tiers/reflex-wms-connector!182
This commit is contained in:
Francis REAT 2025-11-25 12:47:28 +00:00
commit d3ffb379b6
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
RFXtoRP_HsaLstCarSta.ftl
View File

@ -21,8 +21,6 @@
<#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)> <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)>
[ [
{ {
<#switch carrier_apt_status.status.carrier_status_code> <#switch carrier_apt_status.status.carrier_status_code>
<#case "010"> <#-- Transporteur attendu --> <#case "010"> <#-- Transporteur attendu -->
<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> <#-- à revoir --> <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> <#-- à revoir -->
@ -37,16 +35,16 @@
<#include "RFXtoRP_HsaLstCarSta_CarrierArrived.ftl"> <#include "RFXtoRP_HsaLstCarSta_CarrierArrived.ftl">
<#break> <#break>
<#case "040"> <#-- Déchargement commencé --> <#case "040"> <#-- Déchargement commencé -->
<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentReceptionStarted> <#-- à revoir --> <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted> <#-- à revoir -->
"apiReflexPlatformID" : "${apiReflexPlatformID}", "apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" : "datas" :
<#include "RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl"> <#include "RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl">
<#break> <#break>
<#case "050"> <#-- Déchargement terminé--> <#case "050"> <#-- Déchargement terminé-->
<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentReceptionStarted> <#-- à revoir --> <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted> <#-- à revoir -->
"apiReflexPlatformID" : "${apiReflexPlatformID}", "apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" : "datas" :
<#include "RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl"> <#include "RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl">
<#break> <#break>
<#default> <#default>

0
RFXtoRP_HsaLstCarSta_ReceptionUnloaded.ftl → RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl
View File

0
RFXtoRP_HsaLstCarSta_ReceptionStarted.ftl → RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl
View File

4
RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
View File

@ -18,7 +18,7 @@
<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")> <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-")>
<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" > <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
</#if> </#if>
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING>
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) /> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) />
<#if (duration <= 0)> <#if (duration <= 0)>
<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" > <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
@ -28,7 +28,7 @@
<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") || carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-")> <#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") || carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-")>
<#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
</#if> </#if>
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_EXPEDITION> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING>
<#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) />
<#if (duration <= 0)> <#if (duration <= 0)>
<#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" > <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >

4
RPtoRFX_CarrierAppointmentCreated.ftl
View File

@ -10,7 +10,7 @@
"appointment_reference": "${eventRP.refid?json_string}", "appointment_reference": "${eventRP.refid?json_string}",
<#switch appointment.AppointmentType> <#switch appointment.AppointmentType>
<#case "APPOINTMENT_TYPE_EXPEDITION"> <#case "APPOINTMENT_TYPE_LOADING">
"unloading_appointment" : "false", "unloading_appointment" : "false",
"load_appointment" : "true", "load_appointment" : "true",
@ -19,7 +19,7 @@
<#break> <#break>
<#case "APPOINTMENT_TYPE_RECEPTION"> <#case "APPOINTMENT_TYPE_UNLOADING">
"unloading_appointment" : "true", "unloading_appointment" : "true",
"load_appointment" : "false", "load_appointment" : "false",
"planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}", "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",

4
RPtoRFX_CarrierAppointmentUpdated.ftl
View File

@ -9,7 +9,7 @@
"payload" : "payload" :
{ {
<#switch appointment.AppointmentType> <#switch appointment.AppointmentType>
<#case "APPOINTMENT_TYPE_EXPEDITION"> <#case "APPOINTMENT_TYPE_LOADING">
"unloading_appointment" : "false", "unloading_appointment" : "false",
"load_appointment" : "true", "load_appointment" : "true",
@ -18,7 +18,7 @@
<#break> <#break>
<#case "APPOINTMENT_TYPE_RECEPTION"> <#case "APPOINTMENT_TYPE_UNLOADING">
"unloading_appointment" : "true", "unloading_appointment" : "true",
"load_appointment" : "false", "load_appointment" : "false",
"planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}", "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(appointment.Slot.StartDateTime,time_zone_rfx)}",