From a6fec0c33329e6cd6f9db7bd8c675edc127d6ce6 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 8 Jan 2026 15:29:01 +0100 Subject: [PATCH 01/20] SCPN1-9943 --- RPtoRFX_AppointmentEvent.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 2c88da1..69ea68f 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -27,7 +27,7 @@ <#case "CommissionsUpdated"> <#assign appointment = eventRP.data /> [ <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> - <#if eventRP.addedCommissions?? && eventRP.addedCommissions!=""> + <#if eventRP.addedCommissions?? && eventRP.addedCommissions!=""> <#if eventRP.appointmentCustomFields?has_content> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> @@ -45,6 +45,10 @@ <#if eventRP.removedCommissions?? && eventRP.removedCommissions!=""> + <#if eventRP.addedCommissions?? && eventRP.addedCommissions!=""> + , + + <#if eventRP.appointmentCustomFields?has_content> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number> From f5c8640d11f044a4ed27b002275435effb405df9 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 9 Jan 2026 15:37:25 +0100 Subject: [PATCH 02/20] The loading and unloading appointment is not yet managed. (cherry picked from commit 7e57d91cb63c44699f3e2f60298bb8d75a283f4d) --- RFXtoRP_HsrCarrierApt.ftl | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index df68af9..33f75dc 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message RFX --> +<#-- input : message HARDIS-WMS --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> <#include "ActorPrefix.ftl"> @@ -12,11 +12,16 @@ <#assign aDateTime = .now> +<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> +<#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)> + +<#if (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true")> + <#stop "The loading and unloading appointment is not yet managed." > + + <#switch cloudEventMsg.action> <#case "C"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> - <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment> @@ -39,8 +44,6 @@ <#break> <#case "U"> <#-- *********************************************** Action = Update ********************--> - <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated> @@ -149,8 +152,6 @@ <#break> <#case "D"> <#-- *********************************************** Action = Delete ******************** --> - <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)> [ <#-- Ajout des lignes--> { From e03da2db8da1bf85f2792e6996d2a26346b3671e Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 13 Jan 2026 18:01:25 +0100 Subject: [PATCH 03/20] hsrAntRec (cherry picked from commit 4496a4a2ce4de3653a264b25bcab2bf1b0ee2174) --- RFXtoRP_HliAntRecLr.ftl | 49 +++++++++++++++++++++++++++++++++++++++ RFXtoRP_HsrAntRec.ftl | 51 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 RFXtoRP_HliAntRecLr.ftl create mode 100644 RFXtoRP_HsrAntRec.ftl diff --git a/RFXtoRP_HliAntRecLr.ftl b/RFXtoRP_HliAntRecLr.ftl new file mode 100644 index 0000000..3833300 --- /dev/null +++ b/RFXtoRP_HliAntRecLr.ftl @@ -0,0 +1,49 @@ +<#-- **** input parameters ***** --> +<#-- input : message HARDIS WMS --> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> + <#case "C"> + <#-- *********************************************** Action = CREATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)> + [ + { + <#stop create anticipated receipt line> + } + ] + <#break> + <#case "U"> + <#-- *********************************************** Action = UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)> + [ + { + <#stop update anticipated receipt line> + } + ] + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)> + [ + { + <#stop delete anticipated receipt line> + } + ] + <#break> + + + <#default> + <#stop > + + diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl new file mode 100644 index 0000000..10c2bb3 --- /dev/null +++ b/RFXtoRP_HsrAntRec.ftl @@ -0,0 +1,51 @@ +<#-- **** input parameters ***** --> +<#-- input : message HARDIS WMS --> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> + <#case "C"> + <#-- *********************************************** Action = CREATE ******************** --> + + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> + [ + { + <#stop creation anticipated receipt> + } + ] + <#break> + <#case "U"> + <#-- *********************************************** Action = UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> + [ + { + <#stop update anticipated receipt> + } + ] + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> + [ + { + + <#stop delete anticipated receipt> + } + ] + <#break> + + + <#default> + <#stop > + + From efddfdc821856f599d160e5071a8e872b419c4c4 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 13 Jan 2026 18:09:02 +0100 Subject: [PATCH 04/20] hsrAntRec --- RFXtoRP_HliAntRecLr.ftl | 6 +++--- RFXtoRP_HsrAntRec.ftl | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HliAntRecLr.ftl b/RFXtoRP_HliAntRecLr.ftl index 3833300..295e220 100644 --- a/RFXtoRP_HliAntRecLr.ftl +++ b/RFXtoRP_HliAntRecLr.ftl @@ -16,7 +16,7 @@ <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop create anticipated receipt line> + <#stop "create anticipated receipt line"> } ] <#break> @@ -26,7 +26,7 @@ <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop update anticipated receipt line> + <#stop "update anticipated receipt line"> } ] <#break> @@ -37,7 +37,7 @@ <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop delete anticipated receipt line> + <#stop "delete anticipated receipt line"> } ] <#break> diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl index 10c2bb3..e0555d0 100644 --- a/RFXtoRP_HsrAntRec.ftl +++ b/RFXtoRP_HsrAntRec.ftl @@ -17,7 +17,7 @@ <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop creation anticipated receipt> + <#stop "creation anticipated receipt"> } ] <#break> @@ -27,7 +27,7 @@ <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop update anticipated receipt> + <#stop "update anticipated receipt"> } ] <#break> @@ -39,7 +39,7 @@ [ { - <#stop delete anticipated receipt> + <#stop "delete anticipated receipt"> } ] <#break> From 3e3091f194694cf201eec61435bc1adec6096446 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 14 Jan 2026 11:56:56 +0100 Subject: [PATCH 05/20] SCPN1-9991 --- RFXtoRP_HsrCarrierApt.ftl | 11 ------- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 26 ++++++++++++++++ ...P_HsrReceiptList_ExecutionflowDetected.ftl | 26 ++++++++++++++++ ...iptList_TransfertExecutionflowDetected.ftl | 30 +++++++++++++++++++ 4 files changed, 82 insertions(+), 11 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 33f75dc..11ff3ff 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -29,17 +29,6 @@ "datas" : <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl"> } - <#if (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" && (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-"))) || (carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" && (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-"))) || (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && (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 "One of the datetime fields of appointment is not initialized" > - <#else> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl"> - } - ] <#break> <#case "U"> diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index f2b4ca9..32d421c 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -9,6 +9,32 @@ "ProjectID": "${projectRP}" }, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + "Value": "${preparation_order.physical_depot_code?trim?json_string}" + }, + { + "Key": "activity_code", + "Value": "${preparation_order.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${preparation_order.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${preparation_order.originator_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${preparation_order.preparation_order_year}" + }, + { + "Key": "order_number", + "Value": "${preparation_order.preparation_order_number}" + } + ], <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", <#else> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index b8b8924..d340648 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,6 +9,32 @@ "ProjectID": "${projectRP}" }, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + "Value": "${receipt.physical_depot_code?trim?json_string}" + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + } + ], "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", "RefDate": { "DateTime": "${receipt_creation_datetime}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 55ae697..bffb8ec 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -9,6 +9,36 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "Value": "${receipt.origin_order_line_depot?trim?json_string}" + <#else> + "Value": "${receipt.physical_depot_code?trim?json_string}" + + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + } + ], <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> From 46260b82411bcfecd3272089730ee45dd70e4d3c Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 15 Jan 2026 09:31:58 +0100 Subject: [PATCH 06/20] rollback (cherry picked from commit 0a34359e1240232c51a57431b9a4b8f95d717db3) --- RFXtoRP_HsrCarrierApt.ftl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 11ff3ff..d96a39e 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -15,10 +15,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)> -<#if (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true")> - <#stop "The loading and unloading appointment is not yet managed." > - - <#switch cloudEventMsg.action> <#case "C"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> From cff6c1fd3f505daf966e8ad73819367df26d3090 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 15 Jan 2026 15:27:29 +0100 Subject: [PATCH 07/20] SCPN1-10040 --- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 2 ++ RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl | 7 ++++++- RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl | 10 ++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index cbe7549..781e568 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -138,6 +138,8 @@ <#stop "planned_unloading_start_datetime field of appointmend is not initialized" > "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" + <#else> + <#stop "Appointment type not supported" > diff --git a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl index d9fb6f5..1ffc660 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -133,7 +133,12 @@ "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}" + <#else> + <#stop "Appointment type not supported" > diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl index b8a1d02..1db1cc0 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl @@ -69,10 +69,12 @@ "StartDateTime": "${carrier_apt.planned_load_start_datetime}" <#else> <#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}" + <#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> + <#stop "Appointment type not supported" > From e8bcece299fc74295bc9d4eb9c7801712c578347 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 16 Jan 2026 16:20:16 +0100 Subject: [PATCH 08/20] SCPN1-10047 --- RFXtoRP_HsrAntRec.ftl | 11 ++- RFXtoRP_HsrAntRec_Created.ftl | 80 +++++++++++++++++++ RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl | 19 +++++ RFXtoRP_HsrAntRec_Created_LineMetadata.ftl | 10 +++ ...oRP_HsrAntRec_Created_SegmentationKeys.ftl | 47 +++++++++++ 5 files changed, 163 insertions(+), 4 deletions(-) create mode 100644 RFXtoRP_HsrAntRec_Created.ftl create mode 100644 RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl create mode 100644 RFXtoRP_HsrAntRec_Created_LineMetadata.ftl create mode 100644 RFXtoRP_HsrAntRec_Created_SegmentationKeys.ftl diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl index e0555d0..c04b66a 100644 --- a/RFXtoRP_HsrAntRec.ftl +++ b/RFXtoRP_HsrAntRec.ftl @@ -17,9 +17,12 @@ <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop "creation anticipated receipt"> - } - ] + <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCreated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrAntRec_Created.ftl"> + } + ] <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> @@ -29,7 +32,7 @@ { <#stop "update anticipated receipt"> } - ] + ] <#break> <#case "D"> diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl new file mode 100644 index 0000000..9ed2a18 --- /dev/null +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -0,0 +1,80 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> +[ + { + <#assign creationDate = RfxDateTimetoUTCWithTimezone(dataRfx.time,time_zone_rfx) /> + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "CustomFields": [ + { + "Key": "anticipated_receipt_reference", + "Value": "${ancReceipt.anticipated_receipt_reference?json_string}" + }, + { + "Key": "anticipated_receipt_year", + "Value": "${ancReceipt.anticipated_receipt_year?json_string}" + }, + { + "Key": "anticipated_receipt_number", + "Value": "${ancReceipt.anticipated_receipt_number?json_string}" + }, + { + "Key": "originator_code", + "Value": "${ancReceipt.originator_code?json_string}" + }, + { + "Key": "activity_code", + "Value": "${ancReceipt.activity_code?json_string}" + }, + { + "Key": "depot_code", + "Value": "${ancReceipt.depot_code?json_string}" + } + ], + "RefID": "${ancReceipt.anticipated_receipt_reference?json_string}" + }, + "Payload": { + "ShipFrom": { + "ActorID": "${RFXtoRPprefixSupplier(ancReceipt.original_code?json_string)}" + }, + "ShipTo": { + "ActorID": "${RFXtoRPprefixDepot(ancReceipt.depot_code?json_string)}" + }, + "CreationDateTime": { + "DateTime": "${creationDate}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + <#-- Header Metadata inclusion --> + <#include "RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl">, + "Lines": [ + <#list ancReceipt.line_list?filter(l -> l??) as line> + { + <#if line.anticipated_receipt_reference_line_no?? && line.anticipated_receipt_reference_line_no!=""> + "LineID": ${line.anticipated_receipt_reference_line_no}, + <#else> + "LineID": ${line.anticipated_receipt_line_number}, + + <#-- Line Metadata inclusion --> + <#include "RFXtoRP_HsrAntRec_Created_LineMetadata.ftl">, + "RequestedContent":{ + "Goods":{ + "ItemID":"${line.item_code?trim?json_string!"0"}", + "LVBranchID":"${line.item_lv_code?trim?json_string!"0"}", + <#-- Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrAntRec_Created_SegmentationKeys.ftl"> + }, + "Quantity" : + { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": "${line.planned_quantity_in_base_lv!0}" + } + } + }<#sep>, + + ] + } +} +] diff --git a/RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl b/RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl new file mode 100644 index 0000000..40f44a9 --- /dev/null +++ b/RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl @@ -0,0 +1,19 @@ +<#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names --> + +<#-- +<#-- Best practices: + If the SK is of type: + - string: add ?json_string (e.g. "${stock.batch_1?json_string}") + - boolean: possible values: true and false + - datetime: expected format: 2025-10-30T10:12:10.000Z + - decimal number: the separator is a point (e.g. 10.5) +"MetaData": [ + { + "Key": "OrderType", + "Value": { "String" : "${order.optional_attributes.reason_code}"} + } + ], +--> + + +"MetaData": [ ] \ No newline at end of file diff --git a/RFXtoRP_HsrAntRec_Created_LineMetadata.ftl b/RFXtoRP_HsrAntRec_Created_LineMetadata.ftl new file mode 100644 index 0000000..b920b69 --- /dev/null +++ b/RFXtoRP_HsrAntRec_Created_LineMetadata.ftl @@ -0,0 +1,10 @@ +<#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names --> + +<#-- Best practices: + If the SK is of type: + - string: add ?json_string (e.g. "${stock.batch_1?json_string}") + - boolean: possible values: true and false + - datetime: expected format: 2025-10-30T10:12:10.000Z + - decimal number: the separator is a point (e.g. 10.5)--> + +"MetaData": [ ] \ No newline at end of file diff --git a/RFXtoRP_HsrAntRec_Created_SegmentationKeys.ftl b/RFXtoRP_HsrAntRec_Created_SegmentationKeys.ftl new file mode 100644 index 0000000..de24f8b --- /dev/null +++ b/RFXtoRP_HsrAntRec_Created_SegmentationKeys.ftl @@ -0,0 +1,47 @@ +<#-- use protobuf of class HsrReceiptList to find HARDIS WMS fields names --> + +<#-- +<#-- Best practices: + If the SK is of type: + - string: add ?json_string (e.g. "${stock.batch_1?json_string}") + - boolean: possible values: true and false + - datetime: expected format: 2025-10-30T10:12:10.000Z + - decimal number: the separator is a point (e.g. 10.5) +"SegmentationKeys": [ + { + "Key": "Grade", + "Value": { "String" : "${line.grade_code}"} + }, + { + "Key": "Owner", + "Value": { "String" : "${line.owner_code}"} + }, + { + "Key": "BatchNumber", + <#if reflexMvtStockInterface.batch_1 == ""> + "Value": { "String" : "no batch"} + <#else> + "Value": { "String" : "${line_without_detail.batch_1}"} + + }, + { + "Key": "HeldForSpecificCode", + <#if line_without_detail.hold_for_specific_code == "true"> + "Value": { "Bool" : "True"} + <#else> + "Value": { "Bool" : "False"} + }, + + { + <#assign manufacturing_date = line_without_detail.ipg_date_of_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> + "Key": "ManufacturingDate", + "Value": "Timestamp": { + "AuthorTimeZone": "${time_zone_rfx}", + "DateTime": "${manufacturing_date}" + } + } + + ] + +--> +"SegmentationKeys": [ ] \ No newline at end of file From 2098be0ce7cdb9e4265203b3352b8797a27c1d56 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 16 Jan 2026 16:55:43 +0100 Subject: [PATCH 09/20] fix error syntax --- RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl index 1db1cc0..fddb56b 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl @@ -75,7 +75,7 @@ "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" <#else> <#stop "Appointment type not supported" > - + }] From 474061200b2235cd08833c2f153cfd77b67b5d72 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 16 Jan 2026 16:58:36 +0100 Subject: [PATCH 10/20] SCPN1-10047 --- RFXtoRP_HsrAntRec_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl index 9ed2a18..b91a26a 100644 --- a/RFXtoRP_HsrAntRec_Created.ftl +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -31,7 +31,7 @@ }, { "Key": "depot_code", - "Value": "${ancReceipt.depot_code?json_string}" + "Value": "${ancReceipt.physical_depot_code?json_string}" } ], "RefID": "${ancReceipt.anticipated_receipt_reference?json_string}" From 2f04415f2e5a945e4c57033f1eaefbf0e4e20057 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 16 Jan 2026 17:00:58 +0100 Subject: [PATCH 11/20] SCPN1-10047 --- RFXtoRP_HsrAntRec_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl index b91a26a..029095f 100644 --- a/RFXtoRP_HsrAntRec_Created.ftl +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -41,7 +41,7 @@ "ActorID": "${RFXtoRPprefixSupplier(ancReceipt.original_code?json_string)}" }, "ShipTo": { - "ActorID": "${RFXtoRPprefixDepot(ancReceipt.depot_code?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(ancReceipt.physical_depot_code?json_string)}" }, "CreationDateTime": { "DateTime": "${creationDate}", From cd630352774b6fd3d5e2e6dea84455833aac60aa Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 16 Jan 2026 17:04:51 +0100 Subject: [PATCH 12/20] SCPN1-10047 --- RFXtoRP_HsrAntRec_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl index 029095f..9dee8b9 100644 --- a/RFXtoRP_HsrAntRec_Created.ftl +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -52,7 +52,7 @@ "Lines": [ <#list ancReceipt.line_list?filter(l -> l??) as line> { - <#if line.anticipated_receipt_reference_line_no?? && line.anticipated_receipt_reference_line_no!=""> + <#if line.anticipated_receipt_reference_line_no?? && line.anticipated_receipt_reference_line_no!=0> "LineID": ${line.anticipated_receipt_reference_line_no}, <#else> "LineID": ${line.anticipated_receipt_line_number}, From 6def04b35878854d74f7e473245918218fcefdda Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 16 Jan 2026 17:14:20 +0100 Subject: [PATCH 13/20] SCPN1-10047 --- RFXtoRP_HsrAntRec_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl index 9dee8b9..04090d3 100644 --- a/RFXtoRP_HsrAntRec_Created.ftl +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -3,7 +3,7 @@ <#include "ActorPrefix.ftl"> [ { - <#assign creationDate = RfxDateTimetoUTCWithTimezone(dataRfx.time,time_zone_rfx) /> + <#assign creationDate = RfxDateTimetoUTCWithTimezone(dataRfx.@timestamp,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, From 9a130211ba2ea526a839291552b8aa20dd503429 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 16 Jan 2026 17:16:19 +0100 Subject: [PATCH 14/20] SCPN1-10047 --- RFXtoRP_HsrAntRec_Created.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl index 04090d3..3963b77 100644 --- a/RFXtoRP_HsrAntRec_Created.ftl +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -47,6 +47,7 @@ "DateTime": "${creationDate}", "AuthorTimeZone": "${time_zone_rfx}" }, + "LanguageCodeISO6391":"fr", <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrAntRec_Created_HeaderMetadata.ftl">, "Lines": [ From 0ef7219e2945468c62fee32825ca5a03c859478d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 19 Jan 2026 11:36:09 +0100 Subject: [PATCH 15/20] SCPN1-10047 --- RPtoRFX_Receipt.ftl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index bd37d24..c4246f1 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -19,8 +19,11 @@ "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", "original_code" : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}", - "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", - + <#if executionflow.Carrier.ActorID?? && executionflow.Carrier.ActorID!=""> + "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", + <#else> + "carrier_code" : "", + <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> From 8128e55edef14b36b9b7ee056c1f6d1749100daf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 19 Jan 2026 11:40:13 +0100 Subject: [PATCH 16/20] SCPN1-10047 --- RPtoRFX_Receipt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index c4246f1..a782e32 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -19,7 +19,7 @@ "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", "original_code" : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}", - <#if executionflow.Carrier.ActorID?? && executionflow.Carrier.ActorID!=""> + <#if executionflow.Carrier??> "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", <#else> "carrier_code" : "", From 509d47a97901aaeed1213c35f2132893a0f96a9f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 19 Jan 2026 13:53:33 +0100 Subject: [PATCH 17/20] SCPN1-10047 --- RPtoRFX_Receipt.ftl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index a782e32..99470fa 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -19,11 +19,7 @@ "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", "original_code" : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}", - <#if executionflow.Carrier??> - "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", - <#else> - "carrier_code" : "", - + "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> From 83d1fbfcaa9b97226119d1236985a41c4ab6b49e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 19 Jan 2026 16:11:06 +0100 Subject: [PATCH 18/20] RDV --- RFXtoRP_HsrAntRec.ftl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl index c04b66a..440b422 100644 --- a/RFXtoRP_HsrAntRec.ftl +++ b/RFXtoRP_HsrAntRec.ftl @@ -17,10 +17,11 @@ <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCreated> + <#--<#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrAntRec_Created.ftl"> + <#include "RFXtoRP_HsrAntRec_Created.ftl">--> + <#stop "create anticipated receipt"> } ] <#break> From c5561245659f82a29d1a8d97074d9efee18606ce Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 21 Jan 2026 10:55:03 +0100 Subject: [PATCH 19/20] SCPN1-10068 --- RFXtoRP_HsaLstCarSta_CarrierArrived.ftl | 16 ++++++++++++---- RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl | 16 ++++++++++++---- RFXtoRP_HsaLstCarSta_CarrierExpected.ftl | 16 ++++++++++++---- RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl | 16 ++++++++++++---- RFXtoRP_HsaLstCarSta_LoadingStarted.ftl | 16 ++++++++++++---- RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl | 16 ++++++++++++---- RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl | 16 ++++++++++++---- 7 files changed, 84 insertions(+), 28 deletions(-) diff --git a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl index bf31116..242111f 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl index dc4ed53..2875778 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl index dc4ed53..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl index dc4ed53..2875778 100644 --- a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl +++ b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl index dc4ed53..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl +++ b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl index dc4ed53..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl +++ b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl index 3b8b98e..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl +++ b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl @@ -5,11 +5,19 @@ "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_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 833821a8a3c15d50a83b961a045606e7c767fa68 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 21 Jan 2026 14:50:17 +0100 Subject: [PATCH 20/20] SCPN1-10068 --- RFXtoRP_HsaLstCarSta_CarrierArrived.ftl | 4 ++-- RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl | 4 ++-- RFXtoRP_HsaLstCarSta_CarrierExpected.ftl | 4 ++-- RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl | 4 ++-- RFXtoRP_HsaLstCarSta_LoadingStarted.ftl | 4 ++-- RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl | 4 ++-- RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl index 242111f..1cd4134 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> diff --git a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl index 2875778..c5648cd 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> diff --git a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl index 81e923f..4fe7837 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> diff --git a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl index 2875778..c5648cd 100644 --- a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl +++ b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> diff --git a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl index 81e923f..4fe7837 100644 --- a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl +++ b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> diff --git a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl index 81e923f..4fe7837 100644 --- a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl +++ b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> diff --git a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl index 81e923f..4fe7837 100644 --- a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl +++ b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl @@ -7,9 +7,9 @@ "ID": { <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> - "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> - "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", <#else> <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">