Release 1.2.12+2

Merge branch 'SCPN1-6093' into 'release/1.2'
SCPN1-6093 See merge request r-d-technique/tiers/reflex-wms-connector!17
2024-02-29 14:51:31 +01:00 · 2024-02-29 13:30:33 +00:00 · 2024-02-29 14:16:53 +01:00 · 2024-02-16 11:51:17 +01:00 · 2024-01-26 11:15:57 +01:00 · 2024-01-26 10:02:42 +00:00
48 changed files with 619 additions and 840 deletions
--- a/RFXtoRP_HfDtlStockLs.ftl
+++ b/RFXtoRP_HfDtlStockLs.ftl
@@ -26,7 +26,7 @@
      
        <#list reflexStockPicturesInterface.detailled_stock_list as stock>
         <#if stock.stock_type_code != "200">
-            <#stop>
+            <#stop "stock type different from 200">
            <#break>          
        </#if> 
      </#list>  
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -49,9 +49,7 @@
            <#-- LV Metadata inclusion -->
            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,              
              
-            <#if logistical_variant.base_lv?? && logistical_variant.base_lv!="">
            "IsBaseLogisticVariant": ${logistical_variant.base_lv},
-            </#if>
            
            <#if logistical_variant.base_lv != "true">
              "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}",
--- a/RFXtoRP_HsaProStatus.ftl
+++ b/RFXtoRP_HsaProStatus.ftl
@@ -34,14 +34,17 @@
                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">          
               }
            <#else>
-                  <#-- ****Preparation dispatched (600)** -->
-               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+               <#-- **Preparation to package (500) and preparation completed (550)** -->
+               <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "500" || preparationStatusInterface.preparation_status_code == "550")>
                  {
                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> 
                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                  "datas" :         
                     <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">          
-                     },
+                  }
+               <#else>
+                  <#-- ****Preparation dispatched (600)** -->
+                  <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >            
                     {
                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> 
                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -22,7 +22,7 @@
          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> 
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
+          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
         },
         {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> 
@@ -30,26 +30,9 @@
         "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!="">
+          <#if despatched_ipg.consignment_unit_id != ""> 
            ,
            {
            <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
@@ -57,30 +40,11 @@
            "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>
-
-
       ]
-
 <#else>
    <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
-    }
-    <#-- Add transport grade code
-    <#if preparationOrder.transport_grade_code!="">
-    ,
-    "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-    </#if> -->
-  }
-  }
-]
--- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl
@@ -0,0 +1,89 @@
+<#include "HfRpConfig.ftl">
+
+[
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+    <#list preparation_line.despatched_ipg_list as despatched_ipg>
+    { 
+    "Header": {
+      "ProjectID": "${projectRP}"     
+    },
+    "ID": {
+      <#if despatched_ipg.carton_number != "000000000000000000"> 
+        "RefID": "${despatched_ipg.carton_number}"
+      <#else>
+        "RefID": "${despatched_ipg.hd_number}"
+      </#if>
+    },
+     
+    "Payload": {
+      "Information" :{
+        <#if despatched_ipg.carton_number != "000000000000000000"> 
+           "ContainerType": "${despatched_ipg.carton_type_code}"
+        <#else>
+           "ContainerType": "${despatched_ipg.hd_type_code}"
+        </#if>
+      
+        },
+     <#--  HU Metadata inclusin inclusion -->
+    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">  
+    ,
+    "PreparedContents" :[
+       {
+       "Goods": {
+           "ItemID": "${preparation_line.item_code?trim?json_string}",
+           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
+           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+              "PriorityDate": "${priority_date}",
+             <#else>
+            <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+              <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+              "PriorityDate": "${priority_date}",
+             <#else>
+             <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+              "PriorityDate": "${priority_date}",
+             <#else>
+             <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+               <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+              "PriorityDate": "${priority_date}",
+             <#else>
+              <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+              <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> 
+              "PriorityDate": "${priority_date}",
+             <#else>
+			 <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
+              <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> 
+              "PriorityDate": "${priority_date}",
+             <#else>
+                                                  "PriorityDate": "1970-01-01T00:00:00Z",
+          </#if>           
+          </#if>           
+          </#if>             
+          </#if>           
+          </#if> 
+          </#if> 		  
+       
+       <#-- Segmentation Keys inclusion -->
+       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
+         },
+       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
+        <#if (preparation_line.pro_originator_reference_line_number!0) != 0> 
+          "LineID": "${preparation_line.pro_originator_reference_line_number}",
+        <#else>
+          "LineID": "${preparation_line.pro_line_number!0}",
+        </#if>
+       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
+       "Quantity": {
+            "LVID": "${quantity_in_base_lv_RP_Cst}",
+            "Value": ${despatched_ipg.quantity_lvs}           
+       }
+      }
+      ]
+    }
+     
+  }<#sep>,</#sep>
+  </#list>  
+  <#sep>,</#sep>
+  </#list> 
+]
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#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 preparation_line.despatched_ipg_list as despatched_ipg>
-    { 
-    "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      "RefID": "${despatched_ipg.carton_number}",
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"            
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
-      </#list>
-  <#sep>,</#sep>
-  </#list> 
-]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -9,7 +9,11 @@
      "ProjectID": "${projectRP}"     
    },
    "ID": {
+      <#if despatched_ipg.carton_number != "000000000000000000"> 
+      "RefID": "${despatched_ipg.carton_number}",
+      <#else>
      "RefID": "${despatched_ipg.hd_number}",
+      </#if>
      "RefDate": {
        "DateTime": "${dispatched_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"            
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,128 +0,0 @@
-<#include "HfRpConfig.ftl">
-
-[
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      <#if despatched_ipg.carton_number != "000000000000000000">
-        "RefID": "${despatched_ipg.carton_number}"
-      <#else>
-        "RefID": "${despatched_ipg.hd_number}"
-      </#if>
-    },
-
-    "Payload": {
-      "Information" :{
-        <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg.carton_type_code}"
-           <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
-              ,
-              "Length": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionCarton.overall_depth}"
-              },
-              "Weight": {
-              "Unit": "${weight_unit_rfx}",
-              "Value": "${dimensionCarton.carton_gross_weight}"
-              },
-              "Height": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionCarton.overall_height}"
-              },
-              "Width": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${dimensionCarton.overall_width}"
-              }
-              </#list>
-            </#if>
-        <#else>
-           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
-           <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
-            ,
-              "Length": {
-                "Unit": "${length_unit_rfx}",
-                "Value": "${dimensionHU.hd_type_depth}"
-              },
-              "Weight": {
-                "Unit": "${weight_unit_rfx}",
-                "Value": "${dimensionHU.hd_gross_weight}"
-              },
-              "Width": {
-                "Unit": "${length_unit_rfx}",
-                "Value": "${dimensionHU.hd_type_width}"
-              }
-            </#list>
-          </#if>
-        </#if>
-      },
-
-     <#--  HU Metadata inclusin inclusion -->
-    <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">
-    ,
-    "PreparedContents" :[
-       {
-       "Goods": {
-           "ItemID": "${preparation_line.item_code?trim?json_string}",
-           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
-              "PriorityDate": "${priority_date}",
-                <#else>
-                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-                    <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
-                    "PriorityDate": "${priority_date}",
-                      <#else>
-                        <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-                          <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
-                          "PriorityDate": "${priority_date}",
-                            <#else>
-                              <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-                                <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
-                                "PriorityDate": "${priority_date}",
-                                  <#else>
-                                    <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-                                      <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
-                                      "PriorityDate": "${priority_date}",
-                                        <#else>
-                                          <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
-                                            <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc />
-                                            "PriorityDate": "${priority_date}",
-                                              <#else>
-                                                  "PriorityDate": "1970-01-01T00:00:00Z",
-                                                </#if>
-                                          </#if>
-                                    </#if>
-                              </#if>
-                        </#if>
-                  </#if>
-
-       <#-- Segmentation Keys inclusion -->
-       <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
-         },
-       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
-          "LineID": "${preparation_line.pro_originator_reference_line_number}",
-        <#else>
-          "LineID": "${preparation_line.pro_line_number!0}",
-        </#if>
-       "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
-       "Quantity": {
-            "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${despatched_ipg.quantity_lvs}
-       }
-
-      }
-      ]
-    }
-
-  }<#sep>,</#sep>
-  </#list>
-  <#sep>,</#sep>
-  </#list>
-]
--- 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,18 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
-
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
-    }
-  }
-  }
-]
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -15,13 +15,6 @@
      <#else>
      "HandlingunitID": "${despatched_ipg.hd_number}"
      </#if>
-	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-    ,
-	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code?json_string}"
-	  }
-
-	  </#if>
    }
  }
 ]
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -47,10 +47,10 @@
       [  
        <#if receipt.receipt_confirmed == "true" >
        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> 
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :         
-          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">  
        }        
        <#else>
          <#if receipt.receipt_type = "030">
--- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@@ -35,7 +35,7 @@
 	    "ContextPayload": "rfxresponse",
 	    "Type": "RP_EXECUTIONFLOW_EVENT",
 	    "Task": "${id.apiRestReflexID}",
-	    "OriginalID": "${id.refid?trim?json_string}",
+	    "OriginalID": "${id.refid}",
 	    "StackTrace": ""
 	  }
 	}
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -36,12 +36,6 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
 							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ] 
 				   </#if>
@@ -58,12 +52,6 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
 							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]  	           
               </#switch>				   
@@ -93,12 +81,6 @@
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							 "datas" :         
 								<#include "RFXtoRP_PlatformLogCreate.ftl">						
-						   },
-						   {
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
-							"datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 						   }
 					   ] 
 		   				
@@ -116,12 +98,6 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :         
 							<#include "RFXtoRP_PlatformLogCreate.ftl">						
-					   },
-					   {
-						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
-						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-						 "datas" :
-							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]  	           
               </#switch>				   
--- a/RFXtoRP_RestResponseAllocationError.ftl
+++ b/RFXtoRP_RestResponseAllocationError.ftl
@@ -1,20 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-
-[
-  {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-         "RefID": "${id.refid?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${aDateTime?iso_utc}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-    },
-
-    "Payload": {}
-
-  }
-]
--- a/ReflexUtils.ftl
+++ b/ReflexUtils.ftl
@@ -2,7 +2,8 @@
 <#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
-  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
+  <#assign datetimeUTC = JsonUtil.createUTCDateTime(rfxdatetime,time_zone_rfx , "yyyy-MM-dd'T'HH:mm:ss") />
+  <#return (datetimeUTC)>
 </#function>

 <#-- --------------------------------------------------------------------------------------- -->
@@ -12,7 +13,7 @@
 <#-- --------------------------------------------------------------------------------------- -->
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
-<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
+<#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email>
 <#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
 <#if str != "[">		  
 <#local str += ",">
--- a/2
+++ b/2
@@ -1 +1 @@
-1.3.0+1
+1.2.12+2
Author	SHA1	Message	Date
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
@@ -1 +1 @@
 .3.0+1
 .2.12+2