From 8abf2771babbfebb14736dc8f90b3b849f617be6 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Fri, 20 Jun 2025 16:39:19 +0200
Subject: [PATCH] SCPN1-8865

---
 RFXtoRP_HsaIpgMove_GoodsReceived.ftl          |   4 +-
 RFXtoRP_HsrReceiptList.ftl                    | 111 ++++++++----------
 ..._HsrReceiptList_ExecutionflowCancelled.ftl |   6 +-
 ...P_HsrReceiptList_ExecutionflowDetected.ftl |  12 +-
 ...eiptList_ExecutionflowReceiptCompleted.ftl |   6 +-
 RFXtoRP_HsrReceiptList_ReceiptExpected.ftl    |   6 +-
 6 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
index 0196de8..2fb18ef 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.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.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_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_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl
index 394713c..9785951 100644
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -15,29 +15,25 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type == "030">
-        <#stop "ignored message because receipt type = transfert">
-        <#else>
-          [
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-
-          },
-          {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-
-          }
-          ]
-        </#if>
+      <#if receipt.receipt_type == "030">
+      <#stop "ignored message because receipt type = transfert">
       <#else>
-        <#stop "Receipt reference is empty">
+        [
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+
+        },
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
+        }
+        ]
       </#if>
       <#break>
     <#case "U">
@@ -45,43 +41,39 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-         <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-                  }
+        <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
+          {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
+        <#else>
+          <#if receipt.receipt_confirmed == "true" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+            }
           <#else>
-            <#if receipt.receipt_confirmed == "true" >
+            <#if receipt.receipt_type == "030">
+              <#stop "ignored message because receipt type = transfert">
+            <#else>
               {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-              }
-            <#else>
-              <#if receipt.receipt_type == "030">
-                <#stop "ignored message because receipt type = transfert">
-              <#else>
-                {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-                },
-                {
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+              },
+              {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                 "datas" :
                 <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-                }
-              </#if>
+              }
             </#if>
           </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
         </#if>
        ]
       <#break>
@@ -91,21 +83,14 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          {
-
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
-          }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
+        {
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+          "datas" :
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+        }
        ]
-         <#break>
-
-
+       <#break>
     <#default>
           <#stop >
 </#switch>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
index e262117..94a0b67 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl
@@ -8,7 +8,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#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}",
+      </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
index ca695e2..bad6fcd 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -9,7 +9,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#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}",
+      </#if>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -44,7 +48,11 @@
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
-
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID": "${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>
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>
diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
index 91390fb..b1f75ce 100644
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
@@ -7,7 +7,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#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}",
+      </#if>
       "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"
diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
index 23cf130..68fcae2 100644
--- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
+++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl
@@ -8,7 +8,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#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}",
+      </#if>
        "RefDate": {
         "DateTime": "${receipt_status_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"