From 882709f01b76cacda88dc67f7a565a468cd1aa79 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Fri, 15 Dec 2023 17:35:01 +0100
Subject: [PATCH] Modifs 1512231734

---
 RFXtoRP_HsrPrepa.ftl | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 2a7ea7a..578c046 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -30,6 +30,20 @@
          "datas" :         
           <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
          },
+
+          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+          <#list preparation_line.despatched_ipg_list as despatched_ipg>,
+          
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :         
+          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
+          }
+ 
+            </#list>
+          </#list>
+
          <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
           {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> 
@@ -44,17 +58,8 @@
           <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">          
          }
          </#if>
-          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-          <#list preparation_line.despatched_ipg_list as despatched_ipg>
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :         
-          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
-          }
- 
-            </#list>
-          </#list>
+
+         
        ]
       
 <#else>