From 8ea0c3a1c2088b6b52379e1e2bafe25c960e10ec Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Fri, 6 Jun 2025 17:05:51 +0200
Subject: [PATCH] SCPN1-8863

---
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index ae2058b..7a70d5d 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -71,7 +71,11 @@
             </#if>
           </#if>
          },
-        "OrderID":"${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
+        <#else>
+          "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        </#if>
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >