From 753de14f97c3b9be6274f25ba9593efda4a552ed Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Mar 2024 16:22:59 +0100 Subject: [PATCH 1/5] modifs HuAddes --- ...RP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 3f469fd..5589f60 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_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 preparation_line.despatched_ipg_list as despatched_ipg> - { + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line2> + <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2> + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.carton_number}", + "RefID": "${despatched_ipg2.carton_number}", "RefDate": { "DateTime": "${dispatched_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload": { } }<#sep>, <#sep>, - + ] From 040ba2a3929db7f66c9c898449a2071d0dd25440 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Mar 2024 16:45:40 +0100 Subject: [PATCH 2/5] modifs --- RFXtoRP_HsrPrepa.ftl | 1 - RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 1781f53..eef8a4a 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -74,7 +74,6 @@ } - <#-- <#sep>, --> ] <#else> diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 5589f60..b36dab6 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,7 +3,8 @@ [ <#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_line2> - <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2> + <#list preparation_line2.despatched_ipg_list as despatched_ipg2> + <#if despatched_ipg2.carton_number!="000000000000000000"> { "Header": { "ProjectID": "${projectRP}" @@ -20,4 +21,5 @@ <#sep>, + <#if> ] From fb0bab260a9eeb10e9338cd37ead0a56c92315a3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Mar 2024 16:48:52 +0100 Subject: [PATCH 3/5] modifs --- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index b36dab6..461a29a 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -17,9 +17,10 @@ } }, "Payload": { } - }<#sep>, + } + <#if> + <#sep>, <#sep>, - <#if> ] From f0f6e3940728e2d4246bf38706edfc25026f6c1a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Mar 2024 16:51:18 +0100 Subject: [PATCH 4/5] modifs --- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 461a29a..c092c9d 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -18,7 +18,7 @@ }, "Payload": { } } - <#if> + <#sep>, <#sep>, From 12483253f1b02451ecd719142a6a08170f966623 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Mar 2024 17:04:46 +0100 Subject: [PATCH 5/5] modifs --- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index c092c9d..d8e06d9 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,8 +3,7 @@ [ <#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_line2> - <#list preparation_line2.despatched_ipg_list as despatched_ipg2> - <#if despatched_ipg2.carton_number!="000000000000000000"> + <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2> { "Header": { "ProjectID": "${projectRP}" @@ -17,10 +16,10 @@ } }, "Payload": { } - } - - <#sep>, + }<#sep>, + <#if preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 > <#sep>, + ]