From 24f7b8b36a7e126de7170aec4459f04f7ff611f4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 17:24:32 +0200 Subject: [PATCH] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++++- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 090c683..40a50a4 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -4,7 +4,11 @@ [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#else> + <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> + <#if refIDHmap_local?size != 0 > , diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 35ae400..a8405f4 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -4,7 +4,11 @@ [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#else> + <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> + <#if refIDHmap_local?size != 0 > ,