From 3d816434af849b4a10dc4ec60bbbd66634551302 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 15:28:59 +0200 Subject: [PATCH] SCPN1-8870 --- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 12 ++++++++---- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 12 ++++++++---- RFXtoRP_HsaProStatus_TransportStarted.ftl | 10 +++++++--- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 5 ++--- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 3 +-- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index db1899a..039bb8e 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 04c48ae..640e90e 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 04c48ae..f5cb56d 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,10 +7,14 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + + "RefDate": { + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 04c48ae..f5cb56d 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,10 +7,14 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + + "RefDate": { + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 04c48ae..d054d85 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,10 +7,14 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 112037e..090c683 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -3,9 +3,9 @@ <#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > , @@ -28,7 +28,6 @@ --> } } - <#assign refIDHmap_local ={}> ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 5019203..35ae400 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -5,7 +5,7 @@ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > , @@ -23,7 +23,6 @@ } } } - <#assign refIDHmap_local ={}> ] \ No newline at end of file