From c31d6de4a2bbfe1165d55803ab860a61e2cdbb38 Mon Sep 17 00:00:00 2001
From: Francis Reat <francis.reat@hardis-group.com>
Date: Thu, 16 May 2024 15:30:52 +0000
Subject: [PATCH] Merge branch 'SCPN1-6564' into 'release/1.2'

SCPN1-6564

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

(cherry picked from commit c0dd029d1ff89d69ea644f402f03177c16b78251)
---
 RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 9 +++++----
 RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl            | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
index 2d5d7e0..0433ade 100644
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -2,8 +2,11 @@
 <#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 generatedComa >,</#if>
     {
     "Header": {
       "ProjectID": "${projectRP}"
@@ -16,10 +19,8 @@
       }
       },
       "Payload": { }
-      }<#sep>,</#sep>
+      }
+	  <#assign generatedComa = true>
       </#list>
-  <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
-  <#sep>,</#sep>
-  </#if>
   </#list>
 ]
diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
index 968ed88..4102e1f 100644
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -16,7 +16,7 @@
  "Payload": {
 
 "IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? >
+  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
       ,
     "Information": {
       "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",