Release 1.2.14+1

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 10:02:52 +01:00 · 2024-03-12 08:56:33 +00:00 · 2024-03-12 09:55:32 +01:00 · 2024-03-12 08:51:41 +00:00 · 2024-03-12 09:31:26 +01:00 · 2024-03-12 08:11:21 +01:00
47 changed files with 801 additions and 617 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 "stock type different from 200">
+            <#stop>
            <#break>
        </#if>
      </#list>
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -38,28 +38,28 @@
         }
         ]
         <#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"
-          >
-         [
-         {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
-           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-           "datas" :         
-           <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-         }
-         ]  
-      <#else>  
-      <#-- Case of IPG move type volontarilly ignored-->         
+            <#-- 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"
+            >
+            [
+            {
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+            "datas" :
+            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+            }
+            ]
+            <#else>
+               <#-- Case of IPG move type volontarilly ignored-->
               <#stop>
-      </#if>
-      </#if>
-      <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
-         <#stop>
+            </#if>
         </#if>
+      <#else>
+         <#-- cases of an IPG move with quantity = 0 (weight modification)-->
+         <#stop>
+      </#if>
      <#break>

      <#case "D">
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -30,9 +30,9 @@
        <#else>
          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
        </#if>
-       "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+        "LineID": "${reflexMvtStockInterface.receipt_line_number}",
        "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
-       "Quantity": {
+        "Quantity": {
            "LVID": "${quantity_in_base_lv_RP_Cst}",
            "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs}
       }
--- a/RFXtoRP_HsaItm_ItemCreated.ftl
+++ b/RFXtoRP_HsaItm_ItemCreated.ftl
@@ -49,7 +49,9 @@
            <#-- LV Metadata inclusion -->
            <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">,

-            "IsBaseLogisticVariant": ${logistical_variant.base_lv},
+            <#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,33 +34,30 @@
                  <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl">
               }
            <#else>
-               <#-- **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> 
+               <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" >
+                       {
+                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted>
                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                     "datas" :
-                        <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">          
+                        <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl">
+                     },
+                     {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                           <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl">
                     }
-                  <#else>
+               <#else>
                     <#-- ****Preparation cancelled (650)**** -->
-                     <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "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>
+                  <#else>
                        <#stop>
                  </#if>
               </#if>
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -22,7 +22,7 @@
          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
         "datas" :
-          <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl">          
+          <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
         },
         {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
@@ -30,21 +30,57 @@
         "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.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>
+
+
       ]
+
 <#else>
    <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -0,0 +1,23 @@
+<#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
@@ -1,89 +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}"
-        <#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
@@ -0,0 +1,23 @@
+<#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,11 +9,7 @@
      "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
@@ -0,0 +1,128 @@
+<#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_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -0,0 +1,18 @@
+<#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,6 +15,13 @@
      <#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_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -18,21 +18,21 @@
       [
         {
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-         <#-- check preparation type code (internal order and reservation are ignored)  -->
+          <#-- check preparation type code (internal order and reservation are ignored)  -->
          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-          <#-- Only if preparation order not confirmed  -->
-          <#if preparation_order.preparation_order_confirmed == "false" >
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> 
-            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-            "datas" :         
-            <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">          
-          <#else>
-          <#stop "preparation order already confirmed">
-          </#if>
+            <#-- Only if preparation order not confirmed  -->
+            <#if preparation_order.preparation_order_confirmed == "false" >
+              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+              "datas" :
+              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            <#else>
+            <#stop "preparation order already confirmed">
+           </#if>

-        <#else>
+          <#else>
          <#stop "preparation order type not supported">
-        </#if>         
+          </#if>
        <#else>
          <#stop "PRO reference is empty">
        </#if>
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -16,29 +16,29 @@
      <#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>
+      <#else>
+        <#stop "Receipt reference is empty">
+      </#if>
      <#break>
    <#case "U">
       <#-- *********************************************** Action = UPDATE ******************** -->
@@ -47,10 +47,10 @@
       [
        <#if receipt.receipt_confirmed == "true" >
        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> 
+          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
-          <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl">  
+          <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.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}",
+	    "OriginalID": "${id.refid?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -36,6 +36,12 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :
 							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]
 				   </#if>
@@ -52,6 +58,12 @@
 						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						 "datas" :
 							<#include "RFXtoRP_PlatformLogCreate.ftl">
+					   },
+					   {
+						 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+						 "datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
 					   }
 				   ]
               </#switch>
@@ -81,7 +93,13 @@
 							 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							 "datas" :
 								<#include "RFXtoRP_PlatformLogCreate.ftl">
-						   }
+						   },
+						   {
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
+							"datas" :
+							<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					   		}
 					   ]

 			   		</#if>
@@ -98,6 +116,12 @@
 						 "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
@@ -0,0 +1,20 @@
+<#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,8 +2,7 @@
 <#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format -->
 <#-- --------------------------------------------------------------------------------------- -->
 <#function RfxDateTimetoUTC rfxdatetime offset >
-  <#assign datetimeUTC = JsonUtil.createUTCDateTime(rfxdatetime,time_zone_rfx , "yyyy-MM-dd'T'HH:mm:ss") />
-  <#return (datetimeUTC)>
+  <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>

 <#-- --------------------------------------------------------------------------------------- -->
@@ -13,7 +12,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.2.12+2
+1.2.14+1
Author	SHA1	Message	Date
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
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
frea	48052a8112	SCPN1-6130	2024-03-11 14:25:42 +01:00
Laurie Montant	5af4faf052	modifs	2024-03-07 10:16:44 +01:00
Laurie Montant	dc362f6826	modifs	2024-03-05 17:30:56 +01:00
Laurie Montant	3ef86f9e5c	modifs	2024-03-05 17:03:32 +01:00
frea	97b3eb3d97	SCPN1-6130	2024-03-05 15:05:51 +01:00
Laurie Montant	3b98560221	modifs	2024-03-04 10:30:24 +01:00
Laurie Montant	7eee45993e	modif	2024-02-29 17:13:39 +01:00
Laurie Montant	76c17efbec	modifs	2024-02-29 16:48:02 +01:00
Laurie Montant	1038471fd0	modifs	2024-02-29 16:23:09 +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
Laurie Montant	76c071fab7	modif receipt	2024-02-29 13:53:59 +01:00
Laurie Montant	3ed530fb09	modifs trim json	2024-02-29 13:34:59 +01:00
Laurie Montant	da8939ec74	modifs	2024-02-29 11:57:41 +01:00
Laurie Montant	4193d6e48c	modifs	2024-02-29 11:54:30 +01:00
Laurie Montant	d038e1f6ce	modifs order	2024-02-29 11:01:52 +01:00
Laurie Montant	f4b1864337	Priority date goods	2024-02-27 16:05:43 +01:00
Laurie Montant	37f5fbf364	modif hsrprepa	2024-02-26 16:21:44 +01:00
Laurie Montant	a18f41ed78	Modifs prioritydate	2024-02-22 16:29:08 +01:00
Laurie Montant	b6aa1d544e	ajout fonction jsonString	2024-02-19 18:12:05 +01:00
Laurie Montant	3ededd9c62	Modifs logs	2024-02-15 10:42:42 +01:00
Laurie Montant	f25f664b9a	Modifs HsrPro	2024-02-15 10:30:51 +01:00
Laurie Montant	feee703166	Modifs	2024-02-15 10:19:31 +01:00
Laurie Montant	c183b1398e	Modifs LMO	2024-02-14 17:43:20 +01:00
Laurie Montant	e5981b5b0d	Modifs HSAProstatus	2024-02-08 17:51:28 +01:00
Laurie Montant	ceac740066	modifs HsaProstatut	2024-02-08 17:23:25 +01:00
Laurie Montant	9aa9500f0b	Modifs HSRprpaGP	2024-02-06 15:56:41 +01:00
Laurie Montant	585ac07746	Modifs HsrPrepaGP	2024-02-06 15:41:57 +01:00
Laurie Montant	4a806b3977	Modifs HSRPrepaGP	2024-02-06 15:26:24 +01:00
Laurie Montant	eedd7cb16a	Modifs hsrprepaGP	2024-02-06 15:00:52 +01:00
Laurie Montant	387721fd82	Modifs HSRPrepa 0502241451	2024-02-05 14:51:55 +01:00
Laurie Montant	d334812615	Modifs HsrPrepa	2024-02-02 17:29:04 +01:00
Laurie Montant	071b5e47b0	Modifs HsrPrepa	2024-02-02 17:15:32 +01:00
Laurie Montant	ba9c557ae5	Modifs HSRprepa	2024-02-02 17:04:50 +01:00
Laurie Montant	869dc5e2f7	Modifs RPtoRFX_Receipts 2301241132	2024-01-23 11:32:31 +01:00
Laurie Montant	252302e688	Modifs RPtoRFX_Receipts 2301241118	2024-01-23 11:18:52 +01:00
Laurie Montant	56cd76fe0e	Modifs RPtoRFX 2301241050	2024-01-23 10:50:44 +01:00
Laurie Montant	262e22d970	Modifs date 1901241548	2024-01-19 15:51:08 +01:00
Laurie Montant	ed809f872d	Modifs HsaIpgMove-Rec 1801241412	2024-01-18 14:12:33 +01:00
Laurie Montant	ca30958d35	Modifs RPtoRFX 1701240947	2024-01-17 09:48:01 +01:00
Laurie Montant	824a52a588	Modifs 1601241713	2024-01-16 17:14:01 +01:00
Laurie Montant	60cadad51f	Modifs 1601241710	2024-01-16 17:10:40 +01:00
Laurie Montant	123d1dce90	Modifs date 1601241705	2024-01-16 17:06:17 +01:00
Laurie Montant	4073c63a75	Modifs 1601241500	2024-01-16 15:00:05 +01:00
Laurie Montant	b8aea218ce	Modifs 1601241452	2024-01-16 14:53:23 +01:00
Laurie Montant	380b6ea116	Modifs Hsrprepa 1601241448	2024-01-16 14:48:17 +01:00
Laurie Montant	59db159c29	modifs trackinhHULabelled 1601241437	2024-01-16 14:37:51 +01:00
Laurie Montant	c7fbfe21fb	Modifs emalis 1601241352	2024-01-16 13:52:38 +01:00
Laurie Montant	12e29c6644	Modifs 1601241121	2024-01-16 11:21:04 +01:00
Laurie Montant	fb1980d07a	Ajout Statut HU 1601241049	2024-01-16 10:49:13 +01:00
Laurie Montant	736054e237	Modifs hsrprepa dimension 1501241759	2024-01-15 17:59:50 +01:00
Laurie Montant	4eb68902bf	Modifs 1201241553	2024-01-12 15:54:08 +01:00
@@ -1 +1 @@
 .2.12+2
 .2.14+1