From fcc7d3033681662770a51e6227bf7ae52e847a96 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 16:44:41 +0200 Subject: [PATCH] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 8 ++++++-- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 4c88bb2..75bc1bd 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -3,8 +3,12 @@ <#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#list preparationOrder.preparation_line_lst as preparation_line> + <#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[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > , diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 0f215c6..db2e33d 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,7 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> [ - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> {