From a610e0b0772dee6a4dfbc256216c965bc3e0539f Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 24 Jun 2025 18:10:49 +0200
Subject: [PATCH] modif

---
 RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
index ebd88cf..ebae4d8 100644
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -4,6 +4,11 @@
 [
   <#assign refIDHmap_local ={}>
   <#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 = "O${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>
     <#if !refIDHmap_local[OrderOriginReference]?? >
         <#if refIDHmap_local?size != 0 >
         ,
@@ -17,7 +22,7 @@
       <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!="">
         "RefID": "${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.preparation_order_originator_reference?trim?json_string}"
       <#else>
-        "RefID": "O${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}"
+        "RefID": "${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>
       },
     "Payload":{