Release 1.2.15+4

Merge branch 'version-1.2.15' into 'release/1.2'
SCPN1-6284 See merge request r-d-technique/tiers/reflex-wms-connector!26
2024-03-27 15:03:49 +01:00 · 2024-03-27 14:01:44 +00:00 · 2024-03-26 14:07:53 +01:00 · 2024-03-26 11:46:09 +01:00 · 2024-03-26 11:21:10 +01:00 · 2024-03-26 11:08:38 +01:00
18 changed files with 298 additions and 221 deletions
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -27,7 +27,9 @@
         <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc />
         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
          "PriorityDate" : "${priority_date}",
-         </#if>
+        <#else>
+            "PriorityDate": "1970-01-01T00:00:00Z",
+        </#if>

       <#-- Segmentation keys inclusion -->
       <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
--- 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_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -24,7 +24,11 @@
    "Payload": {
      "Goods": {
        "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        "PriorityDate": "${ipg_priority_datetime}",
+        <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+          "PriorityDate": "${ipg_priority_datetime}",
+        <#else>
+            "PriorityDate": "1970-01-01T00:00:00Z",
+        </#if>

        <#-- Segmentation keys inclusions -->
        <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,
--- 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
@@ -2,7 +2,7 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-
+<#include "ReflexUtils.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -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>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
+            <#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>
            </#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_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,23 +1,25 @@
 <#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>
-    { 
+<#assign dispatched3_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_line3>
+    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
+    {
    "Header": {
-      "ProjectID": "${projectRP}"     
+      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${despatched_ipg.carton_number}",
+      "RefID": "${despatched_ipg3.carton_number}",
      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"            
+        "DateTime": "${dispatched3_datetime}",
+        "AuthorTimeZone": "${time_zone_rfx}"
      }
      },
      "Payload": { }
      }<#sep>,</#sep>
      </#list>
+  <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
  <#sep>,</#sep>
-  </#list> 
+  </#if>
+  </#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,26 +1,30 @@
 <#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>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line2>
+    <#list preparation_line2.despatched_ipg_list as despatched_ipg2>
+    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line2.confirmation_datetime,time_zone_offset_rfx) />
    {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      <#if despatched_ipg.carton_number != "000000000000000000">
-        "RefID": "${despatched_ipg.carton_number}"
+       "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${packing_datetime}"
+    },
+      <#if despatched_ipg2.carton_number != "000000000000000000">
+        "RefID": "${despatched_ipg2.carton_number}"
      <#else>
-        "RefID": "${despatched_ipg.hd_number}"
+        "RefID": "${despatched_ipg2.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>
+        <#if despatched_ipg2.carton_number != "000000000000000000">
+           "ContainerType": "${despatched_ipg2.carton_type_code}"
+           <#if preparation_line2.despatched_cartons_list?? >
+              <#list preparation_line2.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg2.carton_number) as dimensionCarton>
              ,
              "Length": {
              "Unit": "${length_unit_rfx}",
@@ -41,9 +45,9 @@
              </#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>
+           "ContainerType": "${despatched_ipg2.hd_type_code?json_string}"
+           <#if preparation_line2.despatched_hds_list??>
+            <#list preparation_line2.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg2.hd_number) as dimensionHU>
            ,
              "Length": {
                "Unit": "${length_unit_rfx}",
@@ -68,26 +72,26 @@
    "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 />
+           "ItemID": "${preparation_line2.item_code?trim?json_string}",
+           "LVBranchID": "${preparation_line2.item_lv_code?json_string}",
+           <#if (despatched_ipg2.ipg_manufacture_date?length != 0) && (despatched_ipg2.ipg_manufacture_date?starts_with("00") == false)>
+              <#assign priority_date = despatched_ipg2.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 />
+                  <#if (despatched_ipg2.ipg_receipt_date?length != 0) && (despatched_ipg2.ipg_receipt_date?starts_with("00")== false)>
+                    <#assign priority_date = despatched_ipg2.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 />
+                        <#if (despatched_ipg2.ipg_best_before_date?length != 0) && (despatched_ipg2.ipg_best_before_date?starts_with("00")== false)>
+                          <#assign priority_date = despatched_ipg2.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 />
+                              <#if (despatched_ipg2.ipg_sell_by_date?length != 0) && (despatched_ipg2.ipg_sell_by_date?starts_with("00")== false)>
+                                <#assign priority_date = despatched_ipg2.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 />
+                                    <#if (despatched_ipg2.ipg_use_by_date?length != 0) && (despatched_ipg2.ipg_use_by_date?starts_with("00")== false)>
+                                      <#assign priority_date = despatched_ipg2.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)>
@@ -105,16 +109,16 @@
       <#-- 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}",
+       "ExecutionflowID": "${preparation_line2.preparation_order_originator_reference?trim?json_string}",
+        <#if (preparation_line2.pro_originator_reference_line_number!0) != 0>
+          "LineID": "${preparation_line2.pro_originator_reference_line_number}",
        <#else>
-          "LineID": "${preparation_line.pro_line_number!0}",
+          "LineID": "${preparation_line2.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}
+            "Value": ${despatched_ipg2.quantity_lvs}
       }

      }
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -0,0 +1,40 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+[
+ {
+    "Header": {
+    "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${HUadded_packing_datetime}"
+    },
+    "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.2.14+1
+1.2.15+4
Author	SHA1	Message	Date
freat	d060d3eb10	Release 1.2.15+4	2024-03-27 15:03:49 +01:00
Francis Reat	28e99e9a2b	Merge branch 'version-1.2.15' into 'release/1.2' SCPN1-6284 See merge request r-d-technique/tiers/reflex-wms-connector!26	2024-03-27 14:01:44 +00:00
frea	78b0b467a3	Merge branch 'develop' into version-1.2.15	2024-03-26 14:07:53 +01:00
frea	eca09f2e9e	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into SCPN1-6203	2024-03-26 11:46:09 +01:00
Laurie Montant	cfb8e2ab5a	modifs HUadded	2024-03-26 11:21:10 +01:00
Laurie Montant	d1512d4269	modifs date packing	2024-03-26 11:08:38 +01:00
Laurie Montant	264f9131d0	modifs goods	2024-03-26 10:26:59 +01:00
Laurie Montant	fd9f248619	modifs goods	2024-03-26 10:19:20 +01:00
Laurie Montant	0fff71b759	modifs goods	2024-03-26 10:09:15 +01:00
Laurie Montant	196ab387ac	modifs date	2024-03-26 10:00:03 +01:00
Laurie Montant	5cafa068a7	Modifs date emballage	2024-03-25 18:03:45 +01:00
freat	6f287e878a	Release 1.2.15+3	2024-03-21 17:39:10 +01:00
Francis Reat	c3a23254b1	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!25	2024-03-21 16:32:23 +00:00
frea	c47672b8cc	Merge branch 'develop' into version-1.2.15	2024-03-21 17:27:44 +01:00
Laurie Montant	12483253f1	modifs	2024-03-21 17:04:46 +01:00
Laurie Montant	f0f6e39407	modifs	2024-03-21 16:51:18 +01:00
Laurie Montant	fb0bab260a	modifs	2024-03-21 16:48:52 +01:00
Laurie Montant	040ba2a392	modifs	2024-03-21 16:45:40 +01:00
Laurie Montant	753de14f97	modifs HuAddes	2024-03-21 16:22:59 +01:00
freat	9cdcd2784d	Release 1.2.15+2	2024-03-21 09:38:35 +01:00
Francis Reat	cfe6bddf8d	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!24	2024-03-21 07:48:06 +00:00
frea	0cb3cc7dd0	update priority_date	2024-03-21 08:45:48 +01:00
Laurie Montant	59a7783203	modifs priority date	2024-03-20 17:12:01 +01:00
Laurie Montant	03362d6a8b	modifs HuAdded	2024-03-20 17:07:47 +01:00
Laurie Montant	f7125548db	modifs moved	2024-03-20 10:55:37 +01:00
Laurie Montant	92e37e8baa	modifs ipgmoved	2024-03-20 10:42:42 +01:00
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 LEMAITRE	86afce4b0d	reverted VERSION	2024-03-12 08:29:59 +00:00
@@ -1 +1 @@
 .2.14+1
 .2.15+4