From 1de8a56410996dcc5d0bd64f20f59134d94e3299 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Fri, 8 Dec 2023 12:23:16 +0100
Subject: [PATCH] modifs lmo

---
 RFXtoRP_HsrPrepa.ftl                    |  2 --
 RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 22 ++++++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl
index 2d5075d..1b06b7d 100644
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -32,7 +32,6 @@
          }
           <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
           <#list preparation_line.despatched_ipg_list as despatched_ipg>
-          <#if despatched_ipg.consignment_unit_id != ""> 
             ,
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
@@ -40,7 +39,6 @@
             "datas" :         
             <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
             }
-          </#if>
  
             </#list>
           </#list>
diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
index dd55a18..332c691 100644
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -7,14 +7,28 @@
     "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefID": "${despatched_ipg.consignment_unit_id}"
+		<#if despatched_ipg.consignment_unit_id!="">
+			"RefID": "${despatched_ipg.consignment_unit_id}"
+		<#else>
+			<#if despatched_ipg.carton_number != "000000000000000000"> 
+				"RefID": "${despatched_ipg.carton_number}"
+			<#else>
+				"RefID": "${despatched_ipg.hd_number}"
+			</#if>
+		</#if>	
       },
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000"> 
-      "HandlingunitID": "${despatched_ipg.carton_number}"
+      "HandlingunitID": "${despatched_ipg.carton_number}",
       <#else>
-      "HandlingunitID": "${despatched_ipg.hd_number}"
+      "HandlingunitID": "${despatched_ipg.hd_number}",
       </#if>
+	  <#if preparationOrder.load_data!="" >
+	  "HUCarrier":{
+	  "ActorID": "${preparationOrder.load_data.carrier_code}",
+    
+	  }
+	  </#if>
     }
   }
-]
+]
\ No newline at end of file