From d573b108461683489acc836ca3a58e8fcacd1ed0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 19 Dec 2025 11:22:06 +0100 Subject: [PATCH 01/11] RDV --- ..._HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl index df69038..81fefce 100644 --- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl +++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl @@ -17,7 +17,8 @@ } "Payload": { "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", - "MetaData": [ + <#--To configure--> +<#-- "MetaData": [ { "Key": "string", "Value": { @@ -33,4 +34,5 @@ ] } } -] \ No newline at end of file +] +--> \ No newline at end of file From fed3cf4311dfc1b9d0c0b928a37d7cde6e724c18 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 10:22:53 +0100 Subject: [PATCH 02/11] RDV --- RFXtoRP_HsrPrepa.ftl | 1 + ...xecutionflowMetaDataUpdatedToConfigure.ftl | 27 +++++++++++++++++++ ..._HsrPrepa_ExecutionflowMetadataUpdated.ftl | 10 +++++++ 3 files changed, 38 insertions(+) create mode 100644 RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl create mode 100644 RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 5b5507c..b1919f8 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -26,6 +26,7 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl"> }, + <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl"> { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl new file mode 100644 index 0000000..51892f8 --- /dev/null +++ b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl @@ -0,0 +1,27 @@ +<#-- +{ + "Header": { + "ProjectID": "${projectRP}" + }, + "ID":{ + "RefID": "${OrderOriginReference}" + }, + "Payload":{ + "MetaData": [ + { + "Key": "string", + "Value": { + "Bool": "true / false", + "Float": 3.1415, + "Int": 42, + "String": "Hello World !", + "Timestamp": { + "AuthorTimeZone": "Europe/Paris", + "DateTime": "2023-01-01T00:00:00Z" + } + } + } + ] + } +} +--> \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl new file mode 100644 index 0000000..93a3827 --- /dev/null +++ b/RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl @@ -0,0 +1,10 @@ + <#-- A décommenter si besoin de les utiliser--> + <#-- Uncomment if you need to use them--> +<#-- +{ + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowMetaDataUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl"> + }, +--> \ No newline at end of file From 055ff16537dd4db8d5ab37143a83a1a59140a92f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 10:23:17 +0100 Subject: [PATCH 03/11] RDV --- ...rCarrierApt_AppointmentMetadataUpdated.ftl | 45 ++++--------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl index 81fefce..8769708 100644 --- a/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl +++ b/RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl @@ -1,38 +1,9 @@ -<#-- - [ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - "RefID": "${carrier_apt.appointment_reference?json_string}", - <#else> - <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> - "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", - <#else> - "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", - - - } - "Payload": { - "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", - <#--To configure--> -<#-- "MetaData": [ - { - "Key": "string", - "Value": { - "Bool": "true / false", - "Float": 3.1415, - "Int": 42, - "String": "Hello World !", - "Timestamp": { - "AuthorTimeZone": "Europe/Paris", - "DateTime": "2023-01-01T00:00:00Z" - } - } - ] - } -} -] + <#-- A décommenter si besoin de les utiliser--> + <#-- Uncomment if you need to use them--> + <#--{ + <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentMetaDataUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl"> + }, --> \ No newline at end of file From e1c65e7efc3a05f0176842715c5350c65a04a50d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 10:27:57 +0100 Subject: [PATCH 04/11] RDV --- RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl index 51892f8..3cf29a6 100644 --- a/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl +++ b/RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${OrderOriginReference}" + "RefID": "${Your_Object_ID}" }, "Payload":{ "MetaData": [ From 9bf87976ea2ae2eb474147ab9b7148b33b4f7b3f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 22 Dec 2025 16:03:14 +0100 Subject: [PATCH 05/11] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 22 +++++++++++----- ..._CarrierAppointmentSlotUpdatedByNumber.ftl | 26 +++++++++++++------ ...RFX_CarrierAppointmentSlotUpdatedByRef.ftl | 26 +++++++++++++------ 3 files changed, 52 insertions(+), 22 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 017cee7..820c79d 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -12,15 +12,25 @@ <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + <#if appointment.TimeZone?? && appointment.TimeZone!=""> + "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", + "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#else> + "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", + "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", + + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> "unloading_appointment" : "true", "load_appointment" : "false", - "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + <#if appointment.TimeZone?? && appointment.TimeZone!=""> + "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#else> + "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", + + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl index efd5dfc..d362dfe 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl @@ -13,15 +13,25 @@ <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + <#if appointment.TimeZone?? && appointment.TimeZone!=""> + "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", + "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#else> + "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", + "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", + + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> - "unloading_appointment" : "true", - "load_appointment" : "false", - "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + "unloading_appointment" : "true", + "load_appointment" : "false", + <#if appointment.TimeZone?? && appointment.TimeZone!=""> + "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#else> + "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", + + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > diff --git a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl index b7f102d..49b4579 100644 --- a/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl +++ b/RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl @@ -12,15 +12,25 @@ <#case "APPOINTMENT_TYPE_LOADING"> "unloading_appointment" : "false", "load_appointment" : "true", - "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + <#if appointment.TimeZone?? && appointment.TimeZone!=""> + "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", + "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#else> + "planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", + "planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", + + <#break> <#case "APPOINTMENT_TYPE_UNLOADING"> - "unloading_appointment" : "true", - "load_appointment" : "false", - "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", - "planned_unloading_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", - <#break> + "unloading_appointment" : "true", + "load_appointment" : "false", + <#if appointment.TimeZone?? && appointment.TimeZone!=""> + "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}", + <#else> + "planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}", + "planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}", + + <#break> <#default> <#stop "appointment.AppointmentType not implemented" > From 2c5df0ae88cf2548141ac266339e4a0c22dcb060 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 08:42:42 +0100 Subject: [PATCH 06/11] RDV --- RPtoRFX_AppointmentEvent.ftl | 29 ++++++++++--------- ...mentPhysicalReceiptAssociationByNumber.ftl | 13 ++++----- ...intmentPhysicalReceiptAssociationByRef.ftl | 13 ++++----- 3 files changed, 26 insertions(+), 29 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 21be0c7..0ee48cc 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -27,21 +27,24 @@ <#case "CommissionsUpdated"> <#assign appointment = eventRP.data /> [ + <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as commission> <#if eventRP.appointmentCustomFields?has_content> - { - <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> - "apiRestReflexID" : "${apiRestReflexID}", - "datas" : - <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl"> - } - <#else> - { - <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref> - "apiRestReflexID" : "${apiRestReflexID}", - "datas" : - <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> - } + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl"> + } + <#else> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> + } + <#sep>, + ] <#break> <#-- *********************************************** Action = SlotUpdated ******************** --> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index 3a6ba80..c992b1f 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -12,16 +12,13 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { - "receipt_activity": "${custom.value.activity_code?json_string}", - "originator_code": "${custom.value.originator_code?json_string}", - "physical_receipt_reference": "${custom.value.reference?json_string}", - "receipt_year": "${custom.value.order_year?json_string}", - "receipt_number": "${custom.value.order_number?json_string}" + "receipt_activity": "${commission.value.activity_code?json_string}", + "originator_code": "${commission.value.originator_code?json_string}", + "physical_receipt_reference": "${commission.value.reference?json_string}", + "receipt_year": "${commission.value.order_year?json_string}", + "receipt_number": "${commission.value.order_number?json_string}" } - <#sep>, - ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl index e5b91cf..1ec4382 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl @@ -11,16 +11,13 @@ <#if appointment.Commissions??> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [ - <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom> { - "receipt_activity": "${custom.value.activity_code?json_string}", - "originator_code": "${custom.value.originator_code?json_string}", - "physical_receipt_reference": "${custom.value.reference?json_string}", - "receipt_year": "${custom.value.order_year?json_string}", - "receipt_number": "${custom.value.order_number?json_string}" + "receipt_activity": "${commission.value.activity_code?json_string}", + "originator_code": "${commission.value.originator_code?json_string}", + "physical_receipt_reference": "${commission.value.reference?json_string}", + "receipt_year": "${commission.value.order_year?json_string}", + "receipt_number": "${commission.value.order_number?json_string}" } - <#sep>, - ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> From 5dd35ca77e8690513160081c7eb031a30d856014 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 09:33:19 +0100 Subject: [PATCH 07/11] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 820c79d..df8f4f4 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -57,8 +57,6 @@ <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> <#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!=""> - "appointment_designation":"LOADING", - <#else> "appointment_designation":"${(appointment.Reason!"")?json_string}", From 7579ff4e68caab770ab2d1e0fbea64951422ca5b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 14:05:16 +0100 Subject: [PATCH 08/11] RDV --- RFXtoRP_HsrCarrierApt.ftl | 24 +++++------- ...HsrCarrierApt_SiteForceBookAppointment.ftl | 38 +++++++++++++------ RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl | 32 ++++++++++------ ...RP_HsrCarrierApt_UpdateSlotAppointment.ftl | 14 ++++++- 4 files changed, 67 insertions(+), 41 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index e957ae1..0a7bf34 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -24,12 +24,6 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl"> }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl"> - }, { <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -120,15 +114,15 @@ } ] <#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"> - } - ] + <#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"))> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl"> + } + ] <#else> [ { diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 34a0b14..34d6cf6 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -8,7 +8,7 @@ "AppointmentID": "${carrier_apt.appointment_reference?json_string}", <#else> <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> - "AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", + "AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.appointment_reference?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo --> <#else> "AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}", @@ -25,7 +25,7 @@ <#else> <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" > - <#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" > <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING> @@ -35,10 +35,17 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> - <#assign duration = 0 /> <#-- à confirmer --> + <#assign duration = 0 /> @@ -76,11 +83,10 @@ "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", <#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!=""> "OrderID": "${physical_receipt.physical_receipt_reference?json_string}", - "ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}", <#else> - "OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}", - "ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", + "OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}", + "ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", "ProjectID": "${projectRP}", <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> }<#sep>, @@ -94,10 +100,14 @@ <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> } ], - <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> - "Reason": "${carrier_apt.appointment_designation?json_string}", + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + "Reason": "LOAD AND UNLOADING / ${carrier_apt.appointment_designation?json_string}", <#else> - "Reason": "No commission", + <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> + "Reason": "${carrier_apt.appointment_designation?json_string}", + <#else> + "Reason": "No commission", + "Slots": [{ @@ -107,7 +117,6 @@ <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")> <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > - "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" <#else> <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true"> @@ -116,7 +125,12 @@ "StartDateTime": "${carrier_apt.planned_load_start_datetime}" <#else> - <#stop "Not managed"> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")> + <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > + + "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" + }] diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl index 0517881..8e424ff 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -35,10 +35,19 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> - <#else> - <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> - <#assign duration = 0 /> <#-- à confirmer --> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + + <#else> + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> + <#assign duration = 0 /> <#-- à confirmer --> + @@ -70,14 +79,13 @@ <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt> { "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", - <#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!=""> - "OrderID": "${physical_receipt.physical_receipt_reference?json_string}", - "ExecutionflowID":"${physical_receipt.physical_receipt_reference?json_string}", - <#else> - "OrderID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", - "ExecutionflowID": "${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", - - "ProjectID": "${projectRP}" + <#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!=""> + "OrderID": "${physical_receipt.physical_receipt_reference?json_string}", + <#else> + "OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}", + + "ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", + "ProjectID": "${projectRP}" }<#sep>, ], diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl index ba02b47..4c5b120 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl @@ -35,7 +35,14 @@ <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") > + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" > + + <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> + <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> + <#if (duration <= 0)> + <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#assign duration = 0 /> <#-- à confirmer --> @@ -58,7 +65,10 @@ "StartDateTime": "${carrier_apt.planned_load_start_datetime}" <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> - <#stop "Not managed"> + <#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")> + <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > + + "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" From 6853819d49c9215b7c7ca82bd86e6668419c3a32 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 14:54:14 +0100 Subject: [PATCH 09/11] RDV --- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 2 +- ...RFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl | 2 +- RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 34d6cf6..7bfc9a3 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -100,7 +100,7 @@ <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl"> } ], - <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> + <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> "Reason": "LOAD AND UNLOADING / ${carrier_apt.appointment_designation?json_string}", <#else> <#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl index c992b1f..fd9e237 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl @@ -22,7 +22,7 @@ ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> - "appointment_designation":"LOADING" + "appointment_designation":"${appointment.Reason!""?json_string}" diff --git a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl index 1ec4382..223b1cb 100644 --- a/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl +++ b/RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl @@ -21,7 +21,7 @@ ] <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> - "appointment_designation":"LOADING" + "appointment_designation":"${appointment.Reason!""?json_string}" From a314097423ebf68fb12e511551b7bf4788ee15ed Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 15:17:33 +0100 Subject: [PATCH 10/11] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index df8f4f4..2ba27e6 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -56,9 +56,7 @@ <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> - <#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!=""> "appointment_designation":"${(appointment.Reason!"")?json_string}", - From ef2ae50b6201f9b76f6ac5e858228d051dcbed30 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Dec 2025 15:23:35 +0100 Subject: [PATCH 11/11] RDV --- RPtoRFX_CarrierAppointmentCreated.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 2ba27e6..820c79d 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -56,7 +56,11 @@ <#else> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> + <#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!=""> + "appointment_designation":"LOADING", + <#else> "appointment_designation":"${(appointment.Reason!"")?json_string}", +