From 890768f89a0f8f5f1695cab5599884cfd53a97c9 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 3 Jul 2025 16:33:56 +0200
Subject: [PATCH] SCPN1-8865

---
 RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index f500905..c933280 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -34,8 +34,13 @@
             "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
           <#else>
+            <#if <#if reflexMvtStockInterface.receipt_reference!="">
+              "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+              "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            <#else>
               "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
               "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            </#if>
           </#if>
         <#else>
           <#if reflexMvtStockInterface.receipt_reference!="">