From 6bf2ea2329ce9d7b35be5da6664afce5784af9ca Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 16 Oct 2025 10:27:57 +0200
Subject: [PATCH] SCPN1-9437

(cherry picked from commit 7786a93b25c235d7ed2202f63493451d857f38d6)
---
 RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index 0b78db9..5b586db 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -37,6 +37,9 @@
             <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
               "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
               "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            <#else>
+              "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
             </#if>
           </#if>
         <#else>
@@ -44,8 +47,8 @@
             "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
             "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
           <#else>
-            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
           </#if>
         </#if>
         <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>