From 0067755ee446824465f20a7ecc1b7e39e92cdf83 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Mon, 18 Mar 2024 15:36:55 +0100
Subject: [PATCH] Modifs

---
 RFXtoRP_HsrPrepa.ftl                     | 2 +-
 RFXtoRP_HsrPrepa_CarrierUpdated.ftl      | 6 +++++-
 RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 133ba4f..1781f53 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -31,7 +31,7 @@
             <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
             }
 
-            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
+            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
                ,
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
index 3186074..b058352 100644
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,12 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+   <#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>
   {
     "Header": {
     "ProjectID": "${projectRP}"
     },
     "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
+    "RefID": "${OrderOriginReference}"
     },
   "Payload":{
     "Carrier": {
@@ -19,4 +21,6 @@
     </#if> -->
   }
   }
+  <#sep>,</#sep>
+   </#list>
 ]
\ No newline at end of file
diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
index 51675ba..42b3f85 100644
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,13 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-
+  <#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>
   {
     "Header": {
     "ProjectID": "${projectRP}"
     },
     "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
+    "RefID": "${OrderOriginReference}"
     },
   "Payload":{
     "Carrier": {
@@ -15,4 +16,6 @@
     }
   }
   }
+    <#sep>,</#sep>
+   </#list>
 ]
\ No newline at end of file