From 88fa6bd2af81cf6d34dd06c3f6c3325bf885e5ca Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Tue, 24 Jun 2025 16:50:59 +0200
Subject: [PATCH] SCPN1-8863

---
 RFXtoRP_HsaIpgMove_GoodsReceived.ftl                     | 4 ++--
 RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl          | 4 ++--
 RFXtoRP_HsaProStatus_PreparationCompleted.ftl            | 4 ++--
 RFXtoRP_HsaProStatus_PreparationExpected.ftl             | 4 ++--
 RFXtoRP_HsaProStatus_PreparationStarted.ftl              | 4 ++--
 RFXtoRP_HsaProStatus_TransportStarted.ftl                | 4 ++--
 RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl           | 4 ++--
 RFXtoRP_HsrPro_ExecutionflowCancelled.ftl                | 2 +-
 RFXtoRP_HsrPro_ExecutionflowDetected.ftl                 | 2 +-
 RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl        | 2 +-
 RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl         | 2 +-
 RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +-
 RFXtoRP_HsrReceiptList_ReceiptExpected.ftl               | 2 +-
 13 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index 4d4ec2a..ca5c456 100644
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -33,8 +33,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.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}",
+          "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>
         "LineID": "${reflexMvtStockInterface.receipt_line_number}",
         "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
index 039bb8e..a424860 100644
--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@@ -9,9 +9,9 @@
     },
     "ID": {
       <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       <#else>
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
       </#if>
     "RefDate": {
       "DateTime": "${preparation_status_datetime}",
diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
index 640e90e..3728c21 100644
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@@ -8,9 +8,9 @@
     },
     "ID": {
       <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
       <#else>
-        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+        "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
       </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
index f5cb56d..51d298f 100644
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@@ -8,9 +8,9 @@
     },
     "ID": {
         <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+          "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
         <#else>
-          "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+          "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
         </#if>
         "RefDate": {
           "DateTime": "${preparation_status_datetime}",
diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
index f5cb56d..51d298f 100644
--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@@ -8,9 +8,9 @@
     },
     "ID": {
         <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+          "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
         <#else>
-          "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+          "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
         </#if>
         "RefDate": {
           "DateTime": "${preparation_status_datetime}",
diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl
index d054d85..0bdb7ac 100644
--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@@ -8,9 +8,9 @@
     },
     "ID": {
         <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
-          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+          "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
         <#else>
-          "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+          "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
         </#if>
        "RefDate": {
           "DateTime": "${preparation_status_datetime}",
diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
index c7c180a..af4010f 100644
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -116,8 +116,8 @@
           "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
           "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
         <#else>
-          "OrderID": "${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}",
-          "ExecutionflowID": "${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}",
+          "OrderID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}",
+          "ExecutionflowID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}",
         </#if>
         <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
           "LineID": "${preparation_line.pro_originator_reference_line_number}",
diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
index c42aa61..36c24dc 100644
--- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl
@@ -10,7 +10,7 @@
       <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
         "RefID": "${preparation_order.originator_reference?trim?json_string}",
       <#else>
-        "RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
       </#if>
        "RefDate": {
         "DateTime": "${preparation_status_datetime}",
diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
index 08d8213..04ed23e 100644
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@@ -12,7 +12,7 @@
       <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
         "RefID": "${preparation_order.originator_reference?trim?json_string}",
       <#else>
-        "RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
+        "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
       </#if>
     "RefDate": {
             "DateTime": "${pro_creation_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index 94a0b67..287a509 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -11,7 +11,7 @@
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
       <#else>
-        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
       </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index bad6fcd..78f7727 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -12,7 +12,7 @@
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
       <#else>
-        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
       </#if>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index b1f75ce..6cf5be9 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -10,7 +10,7 @@
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
       <#else>
-        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
       </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index 68fcae2..c0a5741 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -11,7 +11,7 @@
       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
       <#else>
-        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
+        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}",
       </#if>
        "RefDate": {
         "DateTime": "${receipt_status_datetime}",