Release 1.2.15+1

Merge branch 'version-1.2.15' into 'release/1.2'
Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!23
2024-03-19 16:50:50 +01:00 · 2024-03-19 15:04:39 +00:00 · 2024-03-19 08:53:51 +01:00 · 2024-03-18 17:19:26 +01:00 · 2024-03-18 15:36:55 +01:00 · 2024-03-18 10:06:06 +01:00
15 changed files with 205 additions and 217 deletions
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -12,49 +12,52 @@
      <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)>

      <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->
+
      <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>

      <#-- IPG moves translated into Stock moves -->
-      <#if reflexMvtStockInterface.ipg_move_type == "130" ||
-           reflexMvtStockInterface.ipg_move_type == "200" ||
-           reflexMvtStockInterface.ipg_move_type == "210" ||
-           reflexMvtStockInterface.ipg_move_type == "220" ||
-           reflexMvtStockInterface.ipg_move_type == "230" ||
-           reflexMvtStockInterface.ipg_move_type == "240" ||
-           reflexMvtStockInterface.ipg_move_type == "260" ||
-           reflexMvtStockInterface.ipg_move_type == "290" ||
-           reflexMvtStockInterface.ipg_move_type == "300" ||
-           reflexMvtStockInterface.ipg_move_type == "400" ||
-           reflexMvtStockInterface.ipg_move_type == "410" ||
-           reflexMvtStockInterface.ipg_move_type == "420"
-           >
-         [
-         {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
-           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :
-              <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
-
-         }
-         ]
-         <#else>
-            <#-- IPG moves translated into goods received (all type of  receipt)  -->
-            <#if reflexMvtStockInterface.ipg_move_type == "100" ||
-            reflexMvtStockInterface.ipg_move_type == "110" ||
-            reflexMvtStockInterface.ipg_move_type == "120"
+         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
+            reflexMvtStockInterface.ipg_move_type == "200" ||
+            reflexMvtStockInterface.ipg_move_type == "210" ||
+            reflexMvtStockInterface.ipg_move_type == "220" ||
+            reflexMvtStockInterface.ipg_move_type == "230" ||
+            reflexMvtStockInterface.ipg_move_type == "240" ||
+            reflexMvtStockInterface.ipg_move_type == "260" ||
+            reflexMvtStockInterface.ipg_move_type == "290" ||
+            reflexMvtStockInterface.ipg_move_type == "300" ||
+            reflexMvtStockInterface.ipg_move_type == "400" ||
+            reflexMvtStockInterface.ipg_move_type == "410" ||
+            reflexMvtStockInterface.ipg_move_type == "420"
            >
            [
            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
-            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
            }
            ]
-            <#else>
-               <#-- Case of IPG move type volontarilly ignored-->
-               <#stop>
-            </#if>
+         <#else>
+            <#-- IPG moves translated into goods received (all type of  receipt)  -->
+               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
+                     reflexMvtStockInterface.ipg_move_type == "110" ||
+                     reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+                  [
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+                  }
+                  ]
+               <#else>
+                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+                     <#-- Case of IPG move type volontarilly ignored-->
+                     <#stop " Reference receipt is empty">
+                  <#else>
+                     <#stop>
+                  </#if>
+               </#if>
         </#if>
      <#else>
         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -17,51 +17,55 @@
      <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
      [
         <#--**Pick batch runned (200) **-->
-         <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
-            {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :
-            <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
-            }
-         <#else>
-            <#-- ** Collection started (300) and Preparation in progress (400)** -->
-            <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+            <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
               {
-               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
-                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+               <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl">
               }
            <#else>
-                  <#-- ****Preparation dispatched (600)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
-                       {
-                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
-                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                     "datas" :
-                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
-                     },
-                     {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
-                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
-                     }
+               <#-- ** Collection started (300) and Preparation in progress (400)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") >
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                     <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
+                  }
               <#else>
-                     <#-- ****Preparation cancelled (650)**** -->
-                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                     <#-- ****Preparation dispatched (600)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
                        {
-                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                        "datas" :
-                           <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                        },
+                        {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                        }
                  <#else>
-                        <#stop>
+                        <#-- ****Preparation cancelled (650)**** -->
+                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" >
+                           {
+                           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+                           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                           "datas" :
+                              <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl">
+                           }
+                     <#else>
+                           <#stop>
+                     </#if>
                  </#if>
               </#if>
            </#if>
+         <#else>
+            <#stop "PRO reference is empty">
         </#if>
      ]
      <#break>
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -16,75 +16,72 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>

-<#if	preparationOrder.total_lv_validated !=0>
-	   [
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
-         },
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
-         }
+   <#if	preparationOrder.total_lv_validated !=0>
+         [
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+            },
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
+            }

-         <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-         ,
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
-         },
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
-         }
-         </#if>
-
-          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-          <#list preparation_line.despatched_ipg_list as despatched_ipg>
-          <#if despatched_ipg.consignment_unit_id!="">
-          ,
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
-          }
-         </#if>
-          <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-          ,
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-         },
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :
-          <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
-         }
-         </#if>
+            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">
+               }
+            </#if>

+            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+            <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#if despatched_ipg.consignment_unit_id!="">
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">
+               }
+            </#if>
+            <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
+               ,
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
+               },
+               {
+               <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
+               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+               "datas" :
+               <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
+               }
+            </#if>
+               </#list>
+            <#--  <#sep>,</#sep> -->
            </#list>
-         <#--  <#sep>,</#sep> -->
-          </#list>
+         ]
+   <#else>
+      <#stop "no confirmed quantity for the preparation - preparation closed">
+   </#if>


-       ]
-
-<#else>
-    <#stop "no confirmed quantity for the preparation - preparation closed">
-</#if>
-
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,13 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-
+   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
  {
    "Header": {
    "ProjectID": "${projectRP}"
    },
    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
+    "RefID": "${OrderOriginReference}"
    },
  "Payload":{
    "Carrier": {
@@ -20,4 +21,6 @@
    </#if> -->
  }
  }
+  <#sep>,</#sep>
+   </#list>
 ]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -2,22 +2,22 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    { 
+    {
    "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
    },
    "ID": {
      "RefID": "${despatched_ipg.hd_number}",
      "RefDate": {
        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"            
+        "AuthorTimeZone": "${time_zone_rfx}"
      }
      },
      "Payload": { }
      }<#sep>,</#sep>
      </#list>
  <#sep>,</#sep>
-  </#list> 
+  </#list>
 ]
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">

 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
    {
    "Header": {
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -1,37 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
- { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-    "RefID": "${despatched_ipg.hd_number}"
-  },
-
- "Payload": {
-
-"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? >
-      ,
-    "Information": {
-      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
-      "Length": {
-        "Unit": "${length_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth}
-      },
-      "Weight": {
-        "Unit": "${weight_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight}
-      },
-      "Width": {
-        "Unit": "${length_unit_rfx}",
-        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
-      }      
-    }
-    </#if>
-
- }
- }
-]
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,13 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
  {
    "Header": {
    "ProjectID": "${projectRP}"
    },
    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
+    "RefID": "${OrderOriginReference}"
    },
  "Payload":{
    "Carrier": {
@@ -15,4 +16,6 @@
    }
  }
  }
+    <#sep>,</#sep>
+   </#list>
 ]
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -46,12 +46,18 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-         {
+        {
+        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-         }
+          }
+        <#else>
+          <#stop "PRO reference is empty">
+        </#if>
+        }
       ]
         <#break>

--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -45,31 +45,34 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
-        <#if receipt.receipt_confirmed == "true" >
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-        }
-        <#else>
-          <#if receipt.receipt_type = "030">
-          <#stop "ignored message because receipt type = transfert">
+        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.receipt_confirmed == "true" >
+            {
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+            }
          <#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>
+              {
+                <#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>
+        <#else>
+          <#stop "Receipt reference is empty">
        </#if>
       ]
      <#break>
@@ -79,14 +82,17 @@
        <#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">
-
-         }
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+          }
+        <#else>
+          <#stop "Receipt reference is empty">
+        </#if>
       ]
         <#break>

--- a/RPtoRFX_ExecutionflowEvent.ftl
+++ b/RPtoRFX_ExecutionflowEvent.ftl
@@ -2,6 +2,8 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">

 <#assign eventRP = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -1,8 +1,5 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">

-<#assign aDateTime = .now>
-
-
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
@@ -18,9 +15,9 @@
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
+		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -1,5 +1,5 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-<#assign aDateTime = .now>
+
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
@@ -19,9 +19,9 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",

 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-			"receipt_datetime":  "${aDateTime?iso_utc}",
+			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -5,6 +5,10 @@
  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>

+<#function DateTimeUTCtoRfxLocale dateutc locale >
+  <#return dateutc?datetime.iso?iso_nz(locale)>
+</#function>
+
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- Split email reflex into json array string                                               -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->
--- a/2
+++ b/2
@@ -1 +1 @@
-1.3.0-SNAPSHOT
+1.2.15+1
Author	SHA1	Message	Date
Vincent Le Maitre	6b633663e9	Release 1.2.15+1	2024-03-19 16:50:50 +01:00
Francis Reat	c801c574ab	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!23	2024-03-19 15:04:39 +00:00
frea	6282266c6d	Merge branch 'develop' into version-1.2.15	2024-03-19 08:53:51 +01:00
Laurie Montant	be2229d184	Modifs	2024-03-18 17:19:26 +01:00
Laurie Montant	0067755ee4	Modifs	2024-03-18 15:36:55 +01:00
Laurie Montant	03953258d6	modifs	2024-03-18 10:06:06 +01:00
frea	cb9d61bfe9	version-1.2.15	2024-03-15 16:55:08 +01:00
Laurie Montant	591b49cd88	modifs	2024-03-15 10:56:08 +01:00
Laurie Montant	cc5357369d	modifs	2024-03-15 10:42:28 +01:00
Laurie Montant	c03129855e	modifs	2024-03-15 09:45:24 +01:00
Laurie Montant	0211b91069	modifs	2024-03-15 09:38:15 +01:00
Laurie Montant	53afac0ccf	modifs	2024-03-14 12:01:40 +01:00
Laurie Montant	349642fe25	modifs	2024-03-14 11:58:35 +01:00
Laurie Montant	4802c74fb8	modifs ref vide	2024-03-14 11:51:49 +01:00
frea	c6370e2eb7	SCPN1-6203	2024-03-13 18:07:47 +01:00
Laurie Montant	e5f775605f	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2024-03-12 17:47:47 +01:00
Laurie Montant	8575ad0de2	Modifs	2024-03-12 17:47:35 +01:00
Laurie Montant	c7d7aaec16	Modifs pro cancelled	2024-03-12 17:09:22 +01:00
Vincent Le Maitre	60c6f812d1	Release 1.2.14+1	2024-03-12 10:02:52 +01:00
Vincent LEMAITRE	c2f6537e0c	Merge branch 'version-1.7' into 'release/1.2' Version 1.7 See merge request r-d-technique/tiers/reflex-wms-connector!20	2024-03-12 08:56:33 +00:00
frea	f5970127b0	update version	2024-03-12 09:55:32 +01:00
Vincent LEMAITRE	33c7ab08a7	reverted VERSION	2024-03-12 08:51:41 +00:00
Vincent Le Maitre	fb8f9ca651	Release 1.2.14+1	2024-03-12 09:31:26 +01:00
Vincent LEMAITRE	86afce4b0d	reverted VERSION	2024-03-12 08:29:59 +00:00
frea	16c7d6b686	Merge branch 'develop' into version-1.7 # Conflicts: # RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl # RFXtoRP_HfLvTypeList.ftl # RFXtoRP_HsaIpgMove.ftl # RFXtoRP_HsaIpgMove_GoodsReceived.ftl # RFXtoRP_HsaIpgMove_StockMoved.ftl # RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl # RFXtoRP_HsaItm_ItemCreated.ftl # RFXtoRP_HsaProStatus.ftl # RFXtoRP_HsrPrepa.ftl # RFXtoRP_HsrPrepa_CarrierUpdated.ftl # RFXtoRP_HsrPrepa_GoodsPrepared.ftl # RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl # RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl # RFXtoRP_HsrPro.ftl # RFXtoRP_HsrPro_ExecutionflowDetected.ftl # RFXtoRP_HsrReceiptList.ftl # RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl # ReflexUtils.ftl # VERSION	2024-03-12 08:11:21 +01:00
Vincent Le Maitre	9cffad8ffb	Snapshot reflex-wms-connector 1.4.0-SNAPSHOT	2024-03-11 17:12:45 +01:00
Vincent Le Maitre	fc919c2199	Release 1.2.13+1	2024-03-11 16:13:48 +01:00
freat	3365a94098	Release 1.2.12+3	2024-02-29 15:35:54 +01:00
Francis Reat	e055eab522	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!18	2024-02-29 14:35:25 +00:00
frea	c95bdc7f00	SCPN1-6093	2024-02-29 15:32:01 +01:00
freat	319cb6cc51	Release 1.2.12+2	2024-02-29 14:51:31 +01:00
Francis Reat	1f289e229c	Merge branch 'SCPN1-6093' into 'release/1.2' SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!17	2024-02-29 13:30:33 +00:00
frea	fba36b5d77	SCPN1-6093	2024-02-29 14:16:53 +01:00
freat	892812e85e	Release 1.2.12+1	2024-02-16 11:51:17 +01:00
freat	a512e4c23a	Release 1.2.11+1	2024-01-26 11:15:57 +01:00
Francis Reat	884ad540fe	Update VERSION to roolback to 1.2.10+2	2024-01-26 10:02:42 +00:00
freat	3a9620e3ee	Release 1.2.2+1	2024-01-26 10:56:09 +01:00
Francis Reat	d5573b6dba	Merge branch 'SCPN-5764' into 'release/1.2' Modifs RPtoRFX 2301241050 See merge request r-d-technique/tiers/reflex-wms-connector!13	2024-01-26 09:52:43 +00:00
Laurie Montant	162b73e75f	Modifs RPtoRFX 2301241050 (cherry picked from commit `56cd76fe0e`)	2024-01-25 11:22:41 +01:00
Laurie Montant	bb4315bba1	SCPN1-5764	2024-01-25 11:13:44 +01:00
freat	c4910785e0	Release 1.2.10+2	2024-01-17 15:29:36 +01:00
Francis Reat	5688244be2	Update VERSION to roolback to 1.2.10+1	2024-01-17 13:34:06 +00:00
freat	de5e94be3c	Release 1.2.1+1	2024-01-17 13:58:26 +01:00
Francis Reat	646256d879	Merge branch 'SCPN1-5711' into 'release/1.2' SCPN1-5711 See merge request r-d-technique/tiers/reflex-wms-connector!12	2024-01-17 12:49:38 +00:00
frea	60355d1ba5	SCPN1-5711	2024-01-17 13:47:38 +01:00
freat	737763dc7f	Release 1.2.10+1	2024-01-17 10:16:31 +01:00
Francis Reat	098b2d4e1d	Merge branch 'SCPN1-5711' into 'release/1.2' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!10	2024-01-17 09:05:46 +00:00
Francis Reat	7b55a4bcd0	Merge branch 'cherry-pick-ca30958d' into 'SCPN1-5711' Modifs RPtoRFX 1701240947 See merge request r-d-technique/tiers/reflex-wms-connector!9	2024-01-17 09:02:23 +00:00
Laurie Montant	b369dd8adf	Modifs RPtoRFX 1701240947 (cherry picked from commit `ca30958d35`)	2024-01-17 09:02:01 +00:00
frea	fd1cfcc2c5	SCPN1-5711	2024-01-17 10:00:31 +01:00
freat	fc8290648f	Release 1.2.9+1	2024-01-10 10:40:42 +01:00
Francis Reat	378c1ba75f	Merge branch 'SCPN1-5651' into 'release/1.2' Resolve SCPN1-5651 See merge request r-d-technique/tiers/reflex-wms-connector!7	2024-01-10 09:33:49 +00:00
frea	d94a74d399	Partial Merge branch 'develop' into SCPN1-5651	2024-01-09 17:17:26 +01:00
freat	a882ac4b86	Release 1.2.8+2	2024-01-03 14:42:40 +01:00
frea	d2d9443fc7	bug SCPN1-5632	2024-01-03 13:32:45 +01:00
Vincent Le Maitre	30ae93b9e7	Release 1.2.8+1	2023-12-06 15:48:59 +01:00
Vincent Le Maitre	64e03640d1	Release 1.2.7+2	2023-12-01 16:06:45 +01:00
Laurie Montant	270f90a9b3	Modif HsrPrepa 0112231019	2023-12-01 16:05:47 +01:00
Laurie Montant	b5c85220b5	Modifs FTL 2211231645	2023-12-01 16:05:36 +01:00
Laurie Montant	2409cf3a01	Modif FTL 2211231459	2023-12-01 16:05:11 +01:00
Laurie Montant	957df51487	Modifs FTL 2211231443	2023-12-01 16:04:57 +01:00
Laurie Montant	d09fa33577	Modif 2011231720 HsrPro	2023-12-01 16:04:46 +01:00
Laurie Montant	3bcdec1d5d	Modif alignement champs techniques Reflex HsrPro 2011231657	2023-12-01 16:04:35 +01:00
Vincent Le Maitre	b4ea1e7798	Release 1.2.7+1	2023-12-01 14:29:46 +01:00
Vincent LEMAITRE	80aecb3aa7	Update VERSION	2023-12-01 13:27:11 +00:00
Vincent Le Maitre	e02218f7b1	Release 1.2.6+2	2023-12-01 14:23:58 +01:00
Cedric Rodier	6270992346	Release 1.2.6+1	2023-11-23 10:02:38 +01:00
Vincent Le Maitre	a544f6700d	Release 1.2.6	2023-11-03 09:23:43 +01:00
Vincent Le Maitre	04ec57377a	Release 1.2.5	2023-10-24 16:47:19 +02:00
Vincent Le Maitre	b209e8b5e1	release 1.2.4	2023-10-24 08:22:11 +02:00