Merge branch 'release/1.2' into 'main'

MR->main

See merge request r-d-technique/tiers/reflex-wms-connector!41

RFXtoRP_HsrPrepa.ftl

@@ -25,6 +25,7 @@
             <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
             },
             {
+
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :
@@ -47,6 +48,7 @@
                }
             </#if>
 
+            <#assign refIDHmap ={}>
             <#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) />
@@ -76,6 +78,7 @@
             </#if>
                </#list>
             </#list>
+            <#assign refIDHmap ={}>
          ]
    <#else>
       <#stop "no confirmed quantity for the preparation - preparation closed">

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,8 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+  <#assign refIDHmap_local ={}>
    <#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>
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+        <#if refIDHmap_local?size != 0 >
+        ,
+        </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
     {
       "Header": {
       "ProjectID": "${projectRP}"
@@ -21,6 +27,7 @@
       </#if> -->
     }
     }
-  <#sep>,</#sep>
+    </#if>
   </#list>
+  <#assign refIDHmap_local ={}>
 ]

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -2,11 +2,14 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-<#assign generatedComa = false>
+
   <#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>
-
+      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
-    <#if generatedComa >,</#if>
+        <#if refIDHmap?size != 0 >
+        ,
+        </#if>
+        <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}>
         {
         "Header": {
           "ProjectID": "${projectRP}"
@@ -20,7 +23,7 @@
            },
           "Payload": { }
         }
-	  <#assign generatedComa = true>
+     </#if>
       </#list>
   </#list>
 ]

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -2,12 +2,16 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign refIDHmap_local ={}>
   <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
+      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={despatched_ipg.hd_number,despatched_ipg.hd_number}>
           {
-    "Header": {
+          "Header": {"ProjectID": "${projectRP}"},
-      "ProjectID": "${projectRP}"
-    },
           "ID": {
             "RefID": "${despatched_ipg.hd_number}",
             "RefDate": {
@@ -16,8 +20,9 @@
             }
             },
             "Payload": { }
-      }<#sep>,</#sep>
+            }
+      </#if>
     </#list>
-  <#sep>,</#sep>
   </#list>
+  <#assign refIDHmap_local ={}>
 ]

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,8 +1,14 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+  <#assign refIDHmap_local ={}>
   <#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>
+  <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+    ,
+    </#if>
+    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
     {
       "Header": {
       "ProjectID": "${projectRP}"
@@ -16,6 +22,7 @@
       }
     }
     }
-    <#sep>,</#sep>
+  </#if>
   </#list>
+  <#assign refIDHmap_local ={}>
 ]

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -51,13 +51,16 @@
             {
               "ItemID":   "${line.item_code?trim?json_string!"0"}",
               "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if line.line_without_detail??>
+              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                  <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
                    "PriorityDate": "${line_without_detail_priority_date}",
-                  </#if>
               <#else>
-                <#stop >
+                <#if (line.line_detail?? && line.line_detail.priority_date?length != 0) && (line.line_detail.priority_date?starts_with("00") == false)>
+                    <#assign line_detail_priority_date = line.line_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${line_detail_priority_date}",
+                <#else>
+                    "PriorityDate": "1970-01-01T00:00:00Z",
+                </#if>
               </#if>
               <#-- Segmentation Keys inclusion -->
               <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">

VERSION

@@ -1 +1 @@
-1.2.16+3
+1.2.16+4