From 6e89261c27ab928fc193df8eabb51fe3eb9ec91d Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 8 Jan 2026 15:29:01 +0100 Subject: [PATCH 01/15] SCPN1-9943 (cherry picked from commit a6fec0c33329e6cd6f9db7bd8c675edc127d6ce6) --- 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 7e57d91cb63c44699f3e2f60298bb8d75a283f4d Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 9 Jan 2026 15:37:25 +0100 Subject: [PATCH 02/15] The loading and unloading appointment is not yet managed. --- 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 4496a4a2ce4de3653a264b25bcab2bf1b0ee2174 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 13 Jan 2026 18:01:25 +0100 Subject: [PATCH 03/15] hsrAntRec --- 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 5977dc3af0aa36d53434ab26a8646b4efdd948f1 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 13 Jan 2026 18:09:02 +0100 Subject: [PATCH 04/15] hsrAntRec (cherry picked from commit efddfdc821856f599d160e5071a8e872b419c4c4) --- 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 ca9706e5aab2811dea90fcce2b16e605be8fa398 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 14 Jan 2026 09:05:37 +0100 Subject: [PATCH 05/15] SCPN1-9682 --- RFXtoRP_RestResponse.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 0dc81b0..70928b3 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -149,10 +149,10 @@ <#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") > [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_Receipt_ExecutionflowDeleted.ftl"> + <#include "RFXtoRP_Receipt_ShipToAcked.ftl"> } ] <#else> @@ -419,7 +419,7 @@ ] <#break> - <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** --> + <#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations/dissociations ******************** --> <#case "appointment_post_physical_receipt_associations_by_ref"> <#case "appointment_post_physical_receipt_associations_by_number"> <#case "appointment_post_physical_receipt_dissociations_by_ref"> From d908f7db77b5d79758fa008d4c2976e2c5aa2ba7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 14 Jan 2026 11:03:00 +0100 Subject: [PATCH 06/15] SCPN1-9991 --- RFXtoRP_HsrCarrierApt.ftl | 11 -------- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 26 +++++++++++++++++++ ...P_HsrReceiptList_ExecutionflowDetected.ftl | 26 +++++++++++++++++++ 3 files changed, 52 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 8aff3af..79f720a 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}" + } + ], "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 0d3b976..8ee3c14 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}" + } + ], <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", <#else> From 0a34359e1240232c51a57431b9a4b8f95d717db3 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 15 Jan 2026 09:31:58 +0100 Subject: [PATCH 07/15] rollback --- 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 629d46534306f4d2882bf077c805b4ad1da807c2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 15 Jan 2026 15:37:58 +0100 Subject: [PATCH 08/15] SCPN1-10040 --- RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl | 2 ++ RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl | 7 ++++++- RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl | 3 ++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl index 6c72e5d..63a606f 100644 --- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl @@ -140,6 +140,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 1f40a65..dad33e2 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl @@ -134,7 +134,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..419ee57 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl @@ -73,7 +73,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" > }] From 2ece576560529ebed52befdf60ea16c663871cc1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 15 Jan 2026 17:21:47 +0100 Subject: [PATCH 09/15] SCPN1-10040 --- RFXtoRP_HsrAntRec.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl index e0555d0..882f36a 100644 --- a/RFXtoRP_HsrAntRec.ftl +++ b/RFXtoRP_HsrAntRec.ftl @@ -17,9 +17,9 @@ <#assign ancReceipt = JsonUtil.jsonToMap(dataRfx)> [ { - <#stop "creation anticipated receipt"> + <#stop "create anticipated receipt"> } - ] + ] <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> @@ -29,7 +29,7 @@ { <#stop "update anticipated receipt"> } - ] + ] <#break> <#case "D"> From e53d81e5348174c6e3791aa73dded363f185573c Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 16 Jan 2026 16:55:43 +0100 Subject: [PATCH 10/15] fix error syntax --- RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl index 419ee57..bd89dee 100644 --- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl @@ -75,6 +75,7 @@ "StartDateTime": "${carrier_apt.planned_unloading_start_datetime}" <#else> <#stop "Appointment type not supported" > + }] From d3cb8ecc156a7464ffce17a547cad2506f006f29 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 20 Jan 2026 15:09:51 +0100 Subject: [PATCH 11/15] rollback --- RFXtoRP_HliAntRecLr.ftl | 49 --------------------------------------- RFXtoRP_HsrAntRec.ftl | 51 ----------------------------------------- 2 files changed, 100 deletions(-) delete mode 100644 RFXtoRP_HliAntRecLr.ftl delete mode 100644 RFXtoRP_HsrAntRec.ftl diff --git a/RFXtoRP_HliAntRecLr.ftl b/RFXtoRP_HliAntRecLr.ftl deleted file mode 100644 index 295e220..0000000 --- a/RFXtoRP_HliAntRecLr.ftl +++ /dev/null @@ -1,49 +0,0 @@ -<#-- **** 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 deleted file mode 100644 index 882f36a..0000000 --- a/RFXtoRP_HsrAntRec.ftl +++ /dev/null @@ -1,51 +0,0 @@ -<#-- **** 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 "create 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 2ed20478c43eed7477153ece14bbc4998a2ef2d5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 21 Jan 2026 10:56:14 +0100 Subject: [PATCH 12/15] 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..81e923f 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 dc4ed53..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 ff5d6bc4d30e9a2a47c1d1850550a85fdbb3af2d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 21 Jan 2026 14:48:58 +0100 Subject: [PATCH 13/15] 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 81e923f..4fe7837 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 !=""> From f96d8b9f09ab453e6d7ca7784311fa40cfa4e920 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 22 Jan 2026 15:32:21 +0100 Subject: [PATCH 14/15] Release 1.2.55+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 96a492f..f66dee0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.54+3 +1.2.55+1 From 7d55f0819406332b38708b2f1a4e2523d4c627ab Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 22 Jan 2026 15:34:14 +0100 Subject: [PATCH 15/15] Release 1.2.56+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f66dee0..8ffb1a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.55+1 +1.2.56+1