From a3283f55314b4f771f981325d456b1f2c557639e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 17 Dec 2025 17:23:59 +0100 Subject: [PATCH] RDV --- RFXtoRP_HsrCarrierApt.ftl | 92 +++++++++++++++++--- RFXtoRP_HsrCarrierApt_CarrierArrived.ftl | 10 +-- RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl | 12 +-- RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl | 12 +-- RFXtoRP_HsrCarrierApt_LoadingStarted.ftl | 12 +-- RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl | 12 +-- RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl | 12 +-- 7 files changed, 114 insertions(+), 48 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 6d19796..fca7621 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -59,24 +59,90 @@ } ] <#else> - <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)> + <#if carrier_apt.status?? && carrier_apt.status.status_code=="100"> <#--Carrier Arrived--> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierArrived> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_CarrierArrived.ftl"> } ] <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> - } - ] + <#if carrier_apt.status?? && carrier_apt.status.status_code=="210"> <#--Unloading Started --> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingStarted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl"> + } + ] + <#else> + <#if carrier_apt.status?? && carrier_apt.status.status_code=="290"><#--Unloading Completed--> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentUnloadingCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl"> + } + ] + <#else> + <#if carrier_apt.status?? && carrier_apt.status.status_code=="310"><#--Loading Started--> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingStarted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_LoadingStarted.ftl"> + } + ] + <#else> + <#if carrier_apt.status?? && carrier_apt.status.status_code=="390"><#--Loading Completed--> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentLoadingCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl"> + } + ] + <#else> + <#if carrier_apt.status?? && carrier_apt.status.status_code=="500"><#--Carrier Departed--> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierDeparted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl"> + } + ] + <#else> + <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> + } + ] + <#else> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl"> + } + ] + + + + + + ] diff --git a/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl b/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl index 256ab68..afdefe6 100644 --- a/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl +++ b/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl @@ -1,14 +1,14 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> - "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}", "RefDate": { "DateTime": "${ref_datetime}", @@ -16,7 +16,7 @@ } }, "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt_status.physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" } } ] \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl b/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl index c39c0c3..afdefe6 100644 --- a/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl +++ b/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl @@ -1,22 +1,22 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> - "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}", - "RefDate": { + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt_status.physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" } } ] \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl b/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl index c39c0c3..afdefe6 100644 --- a/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl +++ b/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl @@ -1,22 +1,22 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> - "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}", - "RefDate": { + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt_status.physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" } } ] \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl b/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl index c39c0c3..afdefe6 100644 --- a/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl +++ b/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl @@ -1,22 +1,22 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> - "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}", - "RefDate": { + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt_status.physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" } } ] \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl b/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl index c39c0c3..afdefe6 100644 --- a/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl +++ b/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl @@ -1,22 +1,22 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> - "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}", - "RefDate": { + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt_status.physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" } } ] \ No newline at end of file diff --git a/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl b/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl index c39c0c3..afdefe6 100644 --- a/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl +++ b/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl @@ -1,22 +1,22 @@ [ - <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !=""> + "RefID": "${carrier_apt.appointment_reference?json_string}", <#else> - "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}", - "RefDate": { + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload":{ - "ActorID": "${RFXtoRPprefixDepot(carrier_apt_status.physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" } } ] \ No newline at end of file