From 4eb68902bfd821556adc5141ec4ebb97cc296886 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 12 Jan 2024 15:54:08 +0100 Subject: [PATCH 01/91] Modifs 1201241553 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index a4337fd..20f4a2e 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -19,7 +19,7 @@ "Information" :{ <#if despatched_ipg.carton_number != "000000000000000000"> "ContainerType": "${despatched_ipg.carton_type_code}" - <#-- <#if preparation_line.despatched_cartons_list?? > + <#if preparation_line.despatched_cartons_list?? > , "Length": { "Unit": "${length_unit_rfx}", @@ -33,7 +33,7 @@ "Unit": "${length_unit_rfx}", "Value": "${preparation_line.despatched_cartons_list.overall_width}" } - --> + <#else> "ContainerType": "${despatched_ipg.hd_type_code}" From 736054e2377f932b37bf1fc34c429af41bcfa956 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 15 Jan 2024 17:59:50 +0100 Subject: [PATCH 02/91] Modifs hsrprepa dimension 1501241759 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 20f4a2e..89c38ad 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -20,19 +20,21 @@ <#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 dimension> + , "Length": { "Unit": "${length_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list.overall_depth}" + "Value": "${dimension.overall_depth}" }, "Weight": { "Unit": "${weight_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list.carton_gross_weight}" + "Value": "${dimension.carton_gross_weight}" }, "Width": { "Unit": "${length_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list.overall_width}" + "Value": "${dimension.overall_width}" } + <#else> "ContainerType": "${despatched_ipg.hd_type_code}" From fb1980d07a329d2c88c45beead3f6a305bbbc008 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 10:49:13 +0100 Subject: [PATCH 03/91] Ajout Statut HU 1601241049 --- RFXtoRP_HsrPrepa.ftl | 8 +++++-- ...rPrepa_HUsAdded_HandlingUnitDispatched.ftl | 23 +++++++++++++++++++ 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 1f889a6..8570664 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -59,12 +59,16 @@ <#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"> } <#sep>, diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl new file mode 100644 index 0000000..d4c3d21 --- /dev/null +++ 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.hd_number}", + "RefDate": { + "DateTime": "${dispatched_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } + }<#sep>, + + <#sep>, + +] From 12e29c6644605df9845464e88720b5e1f7e6f642 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 11:21:04 +0100 Subject: [PATCH 04/91] Modifs 1601241121 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 8570664..2f2720f 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -68,7 +68,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched"> + <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> } <#sep>, From c7fbfe21fbb1511ce253e86dec0ca7878ed33641 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 13:52:38 +0100 Subject: [PATCH 05/91] Modifs emalis 1601241352 --- ReflexUtils.ftl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index d1e2569..a73c1fa 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -10,17 +10,18 @@ <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" --> <#-- return "["john.doe@hardis-group.com","name@hardis-group.com"]" --> -<#-- ${splitEmailsIntoArray(emailReflex)} --> <#-- --------------------------------------------------------------------------------------- --> <#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 += ","> <#local str += "\""> <#local str += email> <#local str += "\""> + <#local str += "]"> <#return (str)> From 59db159c2970676e5c297fe6a752c9ecddbc1f60 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 14:37:51 +0100 Subject: [PATCH 06/91] modifs trackinhHULabelled 1601241437 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 0cc76c8..575a1bf 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -9,12 +9,12 @@ "ID": { <#if despatched_ipg.consignment_unit_id!=""> "RefID": "${despatched_ipg.consignment_unit_id}" - <#else> + <#-- <#else> <#if despatched_ipg.carton_number != "000000000000000000"> "RefID": "${despatched_ipg.carton_number}" <#else> "RefID": "${despatched_ipg.hd_number}" - + --> }, "Payload": { From 380b6ea116371e6b2ae62cbe0a052a2515705ccc Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 14:48:17 +0100 Subject: [PATCH 07/91] Modifs Hsrprepa 1601241448 --- RFXtoRP_HsrPrepa.ftl | 6 +++--- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 8 ++++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 2f2720f..c2fd0a2 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -63,13 +63,13 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> - }, - { + } + <#-- { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> - } + } --> <#sep>, diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 6105a16..cca110c 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -9,11 +9,15 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if despatched_ipg.carton_number != "000000000000000000"> + + "RefID": "${despatched_ipg.hd_number}", + + + <#-- <#if despatched_ipg.carton_number != "000000000000000000"> "RefID": "${despatched_ipg.carton_number}", <#else> "RefID": "${despatched_ipg.hd_number}", - + --> "RefDate": { "DateTime": "${dispatched_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From b8aea218ce1f3b538c6a5c7c44622bf0397bb363 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 14:53:23 +0100 Subject: [PATCH 08/91] Modifs 1601241452 --- RFXtoRP_HsrPrepa.ftl | 4 ++-- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index c2fd0a2..d9cd23b 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -64,12 +64,12 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> } - <#-- { + { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> - } --> + } <#sep>, diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index d4c3d21..3f469fd 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.hd_number}", + "RefID": "${despatched_ipg.carton_number}", "RefDate": { "DateTime": "${dispatched_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index cca110c..07f6274 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -18,6 +18,7 @@ <#else> "RefID": "${despatched_ipg.hd_number}", --> + "RefDate": { "DateTime": "${dispatched_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 4073c63a75df49a9ceb6c4d2b94899d933cdc834 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 15:00:05 +0100 Subject: [PATCH 09/91] Modifs 1601241500 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index d9cd23b..962fd5e 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -63,7 +63,7 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> - } + }, { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 123d1dce90bb64d493369e0b8039472bb99ffe3d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 17:06:17 +0100 Subject: [PATCH 10/91] Modifs date 1601241705 --- RFXtoRP_HsrPrepa.ftl | 6 +++--- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 9 ++++----- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 9 --------- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 6 ------ 4 files changed, 7 insertions(+), 23 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 962fd5e..7bc4634 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -49,15 +49,15 @@ <#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 despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > - , { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 89c38ad..1cf0eb7 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -50,29 +50,28 @@ "ItemID": "${preparation_line.item_code}", "LVBranchID": "${preparation_line.item_lv_code}", <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> - <#-- <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_manufacture_date) /> --> <#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 = JsonUtil.createUTCDateTime(despatched_ipg.ipg_receipt_date) /> --> <#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 = JsonUtil.createUTCDateTime(despatched_ipg.ipg_best_before_date) /> --> <#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 = JsonUtil.createUTCDateTime(despatched_ipg.ipg_sell_by_date) /> --> <#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 = JsonUtil.createUTCDateTime(despatched_ipg.ipg_use_by_date) /> --> <#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": "error_date", diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 07f6274..d4c3d21 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -9,16 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.hd_number}", - - - <#-- <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID": "${despatched_ipg.carton_number}", - <#else> - "RefID": "${despatched_ipg.hd_number}", - --> - "RefDate": { "DateTime": "${dispatched_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 575a1bf..0b37d35 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -9,12 +9,6 @@ "ID": { <#if despatched_ipg.consignment_unit_id!=""> "RefID": "${despatched_ipg.consignment_unit_id}" - <#-- <#else> - <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID": "${despatched_ipg.carton_number}" - <#else> - "RefID": "${despatched_ipg.hd_number}" - --> }, "Payload": { From 60cadad51f5258a1389d0143920c0ed071e448fb Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 17:10:40 +0100 Subject: [PATCH 11/91] Modifs 1601241710 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 0b37d35..69ca2f6 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -7,9 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if despatched_ipg.consignment_unit_id!=""> - "RefID": "${despatched_ipg.consignment_unit_id}" - + "RefID": "${despatched_ipg.consignment_unit_id}" }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> From 824a52a588595e2d24f406d0bbca522c07688a56 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 16 Jan 2024 17:14:01 +0100 Subject: [PATCH 12/91] Modifs 1601241713 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 1cf0eb7..3b07fc8 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -78,7 +78,8 @@ - + + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> From ca30958d350503a9923f26ca5e2baa05c06c5313 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 17 Jan 2024 09:48:01 +0100 Subject: [PATCH 13/91] Modifs RPtoRFX 1701240947 --- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 10 +++++++++- RPtoRFX_PrepOrder_DefaultLineData.ftl | 9 ++++++++- RPtoRFX_Receipt_DefaultHeaderData.ftl | 9 ++++++++- RPtoRFX_Receipt_DefaultLineData.ftl | 9 ++++++++- 4 files changed, 33 insertions(+), 4 deletions(-) diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index 89d07dc..7055d66 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -2,10 +2,18 @@ <#-- How to use MD Header map Example : - <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/> + <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/> + + If your MD is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> + <#assign activity_code = ""/> <#assign originator_code = ""/> <#assign preparation_type_code = ""/> diff --git a/RPtoRFX_PrepOrder_DefaultLineData.ftl b/RPtoRFX_PrepOrder_DefaultLineData.ftl index 1ff229a..eb0e902 100644 --- a/RPtoRFX_PrepOrder_DefaultLineData.ftl +++ b/RPtoRFX_PrepOrder_DefaultLineData.ftl @@ -3,7 +3,14 @@ <#-- How to use MD or SK map Example : - <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"]!""/> + <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"].String!""/> + + If your SK is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> <#assign owner_code_to_prepare = SegmentationKeys_Map["myOwner"]!""/> diff --git a/RPtoRFX_Receipt_DefaultHeaderData.ftl b/RPtoRFX_Receipt_DefaultHeaderData.ftl index e510b3c..5e4bc78 100644 --- a/RPtoRFX_Receipt_DefaultHeaderData.ftl +++ b/RPtoRFX_Receipt_DefaultHeaderData.ftl @@ -2,7 +2,14 @@ <#-- How to use MD Header map Example : - <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/> + <#assign receipt_type = Header_MetaData_Map["OrderType"].String!""/> + + If your MD is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> <#assign activity_code = ""/> diff --git a/RPtoRFX_Receipt_DefaultLineData.ftl b/RPtoRFX_Receipt_DefaultLineData.ftl index 7ed934d..112da79 100644 --- a/RPtoRFX_Receipt_DefaultLineData.ftl +++ b/RPtoRFX_Receipt_DefaultLineData.ftl @@ -3,7 +3,14 @@ <#-- How to use MD or SK map Example : - <#assign owner_code = SegmentationKeys_Map["Owner"]!""/> + <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/> + + If your SK is : + Boolean : .Bool + Float : .Float + Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone + Int : .Int + String : .String --> From ed809f872d54e29604399267f9598e59a7eb6e2f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 18 Jan 2024 14:12:33 +0100 Subject: [PATCH 14/91] Modifs HsaIpgMove-Rec 1801241412 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 3b60527..90566bc 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -25,10 +25,14 @@ <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference}", - "LineID": "${reflexMvtStockInterface.receipt_line_number}", - "ActorID": "${reflexMvtStockInterface.physical_depot_code}", - "Quantity": { + <#if reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference}", + <#else> + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", + + "LineID": "${reflexMvtStockInterface.receipt_line_number}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code}", + "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} } From 262e22d9704345c5c214a09943fd81162dd3a07a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 19 Jan 2024 15:51:08 +0100 Subject: [PATCH 15/91] Modifs date 1901241548 --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 4 +++- RFXtoRP_HsaIpgMove.ftl | 4 ++-- RFXtoRP_HsrPrepa.ftl | 3 +-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index 60bca2f..a5d738b 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -25,7 +25,9 @@ "ItemID": "${stock.item_code}", "LVBranchID": "${stock.item_logistical_variant_code}", <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate" : "${priority_date}", + <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) > + "PriorityDate" : "${priority_date}", + <#-- Segmentation keys inclusion --> <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl"> diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 5fb123e..7715ea3 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -45,7 +45,7 @@ > [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> @@ -58,7 +58,7 @@ <#else> - <#-- cases of an IPG move with quantity = 0 (weight modification))--> + <#-- cases of an IPG move with quantity = 0 (weight modification)--> <#stop "move ignored quantity = 0"> <#break> diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 7bc4634..d5d5450 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -45,7 +45,6 @@ <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> }, - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> @@ -56,7 +55,7 @@ "datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> }, - + <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> From 56cd76fe0e00f7321e611aa42d2b4e863efce7dd Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Jan 2024 10:50:44 +0100 Subject: [PATCH 16/91] Modifs RPtoRFX 2301241050 --- RPtoRFX_PrepOrder.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index eba3211..17cc8d6 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -67,13 +67,13 @@ "grade_code_to_prepare" :"${grade_code_to_prepare}", "input_order_data": "false", "batch_1": "${batch_1}", + "base_lv_quantity": "true", "any_lv": "false" <#-- "stock_reservation": "false", "forced_priority_date_min_lead_time": "false", "temp_substitution_possible": "false", - "substitution_possible": "false", - "base_lv_quantity": "true", + "substitution_possible": "false" --> }<#sep>, From 252302e688e1653abd6a46903bcd7c87661561a7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Jan 2024 11:18:52 +0100 Subject: [PATCH 17/91] Modifs RPtoRFX_Receipts 2301241118 --- RPtoRFX_Receipt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index e9fa3b3..c422db5 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -43,7 +43,7 @@ "receipt_reference_line_no": ${line.LineID?number}, "item_code": "${line.RequestedContent.Goods.ItemID!""}", "item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}", - "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, + "order_quantity_in_lv": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", "batch_1": "${batch_1!""}", From 869dc5e2f723be7781336b86925b4beea331bdfe Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Jan 2024 11:32:31 +0100 Subject: [PATCH 18/91] Modifs RPtoRFX_Receipts 2301241132 --- RPtoRFX_Receipt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index c422db5..e9fa3b3 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -43,7 +43,7 @@ "receipt_reference_line_no": ${line.LineID?number}, "item_code": "${line.RequestedContent.Goods.ItemID!""}", "item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}", - "order_quantity_in_lv": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, + "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", "batch_1": "${batch_1!""}", From ba9c557ae5b2749d000ae20c0779f4e5800c4633 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 2 Feb 2024 17:04:50 +0100 Subject: [PATCH 19/91] Modifs HSRprepa --- RFXtoRP_HsrPrepa.ftl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index d5d5450..7c79923 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -29,9 +29,10 @@ "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}", @@ -43,12 +44,13 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> - }, + } <#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}", @@ -70,7 +72,7 @@ <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> } - <#sep>, + <#sep>, From 071b5e47b090c3b3f3cffd01e79fe710b710c993 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 2 Feb 2024 17:15:32 +0100 Subject: [PATCH 20/91] Modifs HsrPrepa --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 7c79923..d0b1c39 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -74,7 +74,7 @@ - <#sep>, + <#-- <#sep>, --> From d3348126150a2f2a1837f099badb0a00c0bbe6d0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 2 Feb 2024 17:29:04 +0100 Subject: [PATCH 21/91] Modifs HsrPrepa --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index d0b1c39..061b9f7 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -19,7 +19,7 @@ <#if preparationOrder.total_lv_validated !=0> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl"> From 387721fd8269afcb139c189480473f773b2173ea Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 5 Feb 2024 14:51:55 +0100 Subject: [PATCH 22/91] Modifs HSRPrepa 0502241451 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 3b07fc8..c5373d9 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -20,24 +20,38 @@ <#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 dimension> + <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton> , "Length": { "Unit": "${length_unit_rfx}", - "Value": "${dimension.overall_depth}" + "Value": "${dimensionCarton.overall_depth}" }, "Weight": { "Unit": "${weight_unit_rfx}", - "Value": "${dimension.carton_gross_weight}" + "Value": "${dimensionCarton.carton_gross_weight}" }, "Width": { "Unit": "${length_unit_rfx}", - "Value": "${dimension.overall_width}" + "Value": "${dimensionCarton.overall_width}" } <#else> - "ContainerType": "${despatched_ipg.hd_type_code}" + "ContainerType": "${despatched_ipg.hd_type_code}", + <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.handling_device_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}" + } + }, From eedd7cb16a042d2b88245c8538fae9f98bbad888 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 6 Feb 2024 15:00:52 +0100 Subject: [PATCH 23/91] Modifs hsrprepaGP --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index c5373d9..dcb0278 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -38,20 +38,22 @@ <#else> "ContainerType": "${despatched_ipg.hd_type_code}", - <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.handling_device_number) as dimensionHU> - "Length": { - "Unit": "${length_unit_rfx}", - "Value": "${dimensionHU.hd_type_depth}" + <#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}" + "Unit": "${weight_unit_rfx}", + "Value": "${dimensionHU.hd_gross_weight}" }, "Width": { - "Unit": "${length_unit_rfx}", - "Value": "${dimensionHU.hd_type_width}" + "Unit": "${length_unit_rfx}", + "Value": "${dimensionHU.hd_type_width}" } - + + }, From 4a806b3977b43f48f5acb93672583a3e8bbc04cf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 6 Feb 2024 15:26:24 +0100 Subject: [PATCH 24/91] Modifs HSRPrepaGP --- RFXtoRP_HsrPrepa.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 061b9f7..a3dab93 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -56,9 +56,10 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - }, + } <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > + , { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 585ac07746e48d159a51ce040686e170a5101b44 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 6 Feb 2024 15:41:57 +0100 Subject: [PATCH 25/91] Modifs HsrPrepaGP --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index dcb0278..4fd880d 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -30,6 +30,10 @@ "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}" From 9aa9500f0b4e6351b7b5850f275d94c21e978c38 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 6 Feb 2024 15:56:41 +0100 Subject: [PATCH 26/91] Modifs HSRprpaGP --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 4fd880d..92f5bfa 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -32,7 +32,7 @@ }, "Height": { "Unit": "${length_unit_rfx}", - "Value": "${dimensionCarton.overall_height} + "Value": "${dimensionCarton.overall_height}" }, "Width": { "Unit": "${length_unit_rfx}", From ceac74006672f377a7d1a3a21305d36db1d111f3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 8 Feb 2024 17:23:25 +0100 Subject: [PATCH 27/91] modifs HsaProstatut --- RFXtoRP_HsaProStatus.ftl | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 2a1aa97..1d33c62 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -35,7 +35,8 @@ } <#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")> + <#--<#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "500" || preparationStatusInterface.preparation_status_code == "550")> --> + <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "500" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -44,12 +45,18 @@ } <#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> <#-- ****Preparation cancelled (650)**** --> From e5981b5b0d6516ff12ad403155264bdadbf1e32b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 8 Feb 2024 17:51:28 +0100 Subject: [PATCH 28/91] Modifs HSAProstatus --- RFXtoRP_HsaProStatus.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 1d33c62..ebf389e 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -35,7 +35,6 @@ } <#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")> --> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "500" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> From c183b1398e43ef0ab77503d35805d9f692f17d17 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 14 Feb 2024 17:43:20 +0100 Subject: [PATCH 29/91] Modifs LMO --- RFXtoRP_HsaProStatus.ftl | 52 ++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index ebf389e..2161718 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -3,7 +3,7 @@ <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -14,68 +14,58 @@ <#case "U"> <#-- Action = CREATE or UPDATE --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> + <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ <#--**Pick batch runned (200) **--> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl"> + "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") > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl"> + "datas" : + <#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" > - { - <#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" > + <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl"> - }, + "datas" : + <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl"> + }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl"> + "datas" : + <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl"> } <#else> <#-- ****Preparation cancelled (650)**** --> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl"> + "datas" : + <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl"> } <#else> <#stop "Reflex WMS status not supported on Reflex Platform"> - - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#stop "event not supported (case D)"> From feee7031662797f94c3bca73a139f8f930aadd51 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 15 Feb 2024 10:19:31 +0100 Subject: [PATCH 30/91] Modifs --- RFXtoRP_HfLvTypeList.ftl | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl index 2f03386..468dd64 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -1,5 +1,5 @@ <#-- *********************************************** Parameter global ******************** --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -9,10 +9,12 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for LV types"> + + <#--<#stop "no generic FTL file available yet for LV types"> --> + <#stop> <#break> - - + + <#default> <#stop "event not supported"> From f25f664b9ab68768fc6761582cf06a28fc1c8f3f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 15 Feb 2024 10:30:51 +0100 Subject: [PATCH 31/91] Modifs HsrPro --- RFXtoRP_HsrPro.ftl | 59 ++++++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 6f1864b..318d8e9 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -3,7 +3,7 @@ <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -14,45 +14,48 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> + [ { - <#-- check preparation type code (internal order and reservation are ignored) --> - <#if preparation_order.preparation_type_code == "010" || 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 preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + <#-- check preparation type code (internal order and reservation are ignored) --> + <#if preparation_order.preparation_type_code == "010" || 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"> + + <#else> + <#stop "preparation order type not supported"> + <#else> - <#stop "preparation order type not supported"> - + <#stop "PRO reference is null"> + } - - ] + + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> + "datas" : + <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> } - ] + ] <#break> - - + + <#default> <#stop "event not supported"> From 3ededd9c62a6dd43813078da510f1fa132c7438d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 15 Feb 2024 10:42:42 +0100 Subject: [PATCH 32/91] Modifs logs --- RFXtoRP_HfLvTypeList.ftl | 4 +- RFXtoRP_HsaIpgMove.ftl | 71 +++++++++---------- RFXtoRP_HsaProStatus.ftl | 2 +- RFXtoRP_HsrPro.ftl | 2 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 64 ++++++++--------- 5 files changed, 71 insertions(+), 72 deletions(-) diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl index 468dd64..584df9a 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -10,8 +10,8 @@ <#case "U"> <#case "D"> - <#--<#stop "no generic FTL file available yet for LV types"> --> - <#stop> + <#stop "no generic FTL file available yet for LV types"> + <#break> diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 7715ea3..be73034 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -1,4 +1,4 @@ -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -9,13 +9,13 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)> - + <#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" || + <#if reflexMvtStockInterface.ipg_move_type == "130" || reflexMvtStockInterface.ipg_move_type == "200" || reflexMvtStockInterface.ipg_move_type == "210" || reflexMvtStockInterface.ipg_move_type == "220" || @@ -25,50 +25,49 @@ 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" + reflexMvtStockInterface.ipg_move_type == "410" || + reflexMvtStockInterface.ipg_move_type == "420" > - [ + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved> + <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : + "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" - > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> - - } - ] - <#else> - <#-- Case of IPG move type volontarilly ignored--> - <#stop "Move type not supported"> - - - <#else> - <#-- cases of an IPG move with quantity = 0 (weight modification)--> - <#stop "move ignored quantity = 0"> + <#-- 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> + + <#else> + <#-- cases of an IPG move with quantity = 0 (weight modification)--> + <#stop> + <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#stop "event not supported - Case D "> <#break> - - + + <#default> <#stop "event not supported"> diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 2161718..042b49b 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -58,7 +58,7 @@ <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl"> } <#else> - <#stop "Reflex WMS status not supported on Reflex Platform"> + <#stop> diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 318d8e9..f633216 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -34,7 +34,7 @@ <#stop "preparation order type not supported"> <#else> - <#stop "PRO reference is null"> + <#stop "PRO reference is empty"> } diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 477456f..6d55a0f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -1,87 +1,87 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - { + { <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) /> <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { "RefID": "${receipt.receipt_reference}", "RefDate": { "DateTime": "${receipt_creation_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload": { "CreationDateTime": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" - }, - + }, + <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, - - "ShipFrom": + + "ShipFrom": { "ActorID": "${receipt.original_code}" }, - "ShipTo" : + "ShipTo" : { "ActorID": "${receipt.physical_depot_code}" }, - "ShipToAcked": true, - + "ShipToAcked": true, + <#if receipt.carrier_informations.carrier_code != ""> - "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, - - - - <#if receipt.line_list??> + "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, + + + + <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> { "LineID": "${line.receipt_line_number}", <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, - "RequestedContent": - { - "Goods": + "RequestedContent": + { + "Goods": { "ItemID": "${line.item_code!"0"}", - "LVBranchID": "${line.item_lv_code!"0"}", - <#if line.line_without_detail??> + "LVBranchID": "${line.item_lv_code!"0"}", + <#if line.line_without_detail??> <#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}", + <#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}", <#else> - <#stop "line with detail"> + <#stop > <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> }, - "Quantity" : + "Quantity" : { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${line.order_quantity_in_lv!0}" + "Value": "${line.order_quantity_in_lv!0}" } } - + } <#sep>, - + ], - + "RequestedMilestones" : { - "RequestedDeliveryDateTime" : + "RequestedDeliveryDateTime" : { - "DateTime": "${receipt_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } + "DateTime": "${receipt_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } } } } From b6aa1d544e2d940ff228b5ace6e850167ecae895 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 19 Feb 2024 18:12:05 +0100 Subject: [PATCH 33/91] ajout fonction jsonString --- RFXtoRP_HfExpGrpList.ftl | 10 +- RFXtoRP_HsaCarrier_ActorCreated.ftl | 24 ++-- RFXtoRP_HsaCarrier_ActorDeleted.ftl | 10 +- RFXtoRP_HsaCons_ActorCreated.ftl | 22 ++-- RFXtoRP_HsaCons_ActorDeleted.ftl | 8 +- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 22 ++-- RFXtoRP_HsaIpgMove_StockMoved.ftl | 28 ++-- RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl | 10 +- RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl | 54 ++++---- RFXtoRP_HsaItm_ItemCreated.ftl | 94 +++++++------- RFXtoRP_HsaItm_ItemDeleted.ftl | 8 +- ...RP_HsaProStatus_ExecutionflowCancelled.ftl | 6 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 10 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 10 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 10 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 10 +- RFXtoRP_HsaSup_ActorCreated.ftl | 26 ++-- RFXtoRP_HsaSup_ActorDeleted.ftl | 10 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 24 ++-- RFXtoRP_HsrDepot_ActorDeleted.ftl | 10 +- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 14 +- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 60 ++++----- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 10 +- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 12 +- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 6 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 120 +++++++++--------- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 6 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 12 +- RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl | 6 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 10 +- RFXtoRP_PrepOrder_ShipFromAcked.ftl | 8 +- 31 files changed, 335 insertions(+), 335 deletions(-) diff --git a/RFXtoRP_HfExpGrpList.ftl b/RFXtoRP_HfExpGrpList.ftl index 08e4a69..affae42 100644 --- a/RFXtoRP_HfExpGrpList.ftl +++ b/RFXtoRP_HfExpGrpList.ftl @@ -1,5 +1,5 @@ <#-- *********************************************** Parameter global ******************** --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> <#include "HfExpGrpList.ftl"> @@ -15,14 +15,14 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign file = JsonUtil.jsonToMap(dataRfx)> - <#assign temp = ExpiryGroupList64> + <#assign temp = ExpiryGroupList64> <#list file.expiry_group_list as expiry_group> <#assign temp = JsonUtil.update(temp,cloudEventMsg.action,expiry_group.exipiry_group_code,Date_Tye_Code_KV[expiry_group.priority_date_type_code])> <#assign output = JsonUtil.print(temp)> -${output} +${output} <#break> - + <#default> - <#stop> + <#stop > diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index fd16db5..e9b707a 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -1,32 +1,32 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code}" + "RefID": "${carrier.carrier_code?json_string}" }, - + "Payload": { "Name": "${carrier.carrier_designation?json_string}", "ManagedStock": false, "IsCarrier": true, <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - + <#-- <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, --> - + "Address": { <#-- if Reflex WMS address is structured --> - <#if carrier.carrier_structured_address?? > + <#if carrier.carrier_structured_address?? > "Name": "${carrier.carrier_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}", + "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}", "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}", "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}", "CountryCode" : "${carrier.carrier_structured_address.country_code?json_string}", @@ -40,15 +40,15 @@ "StreetAddressOne" : "${carrier.address.address_1?json_string}", "StreetAddressTwo" : "${carrier.address.address_2?json_string}", "StreetAddressThree" : "${carrier.address.address_3?json_string}" - - + + }, <#if carrier.address??> - "Phones": ["${carrier.address.telephone?json_string}", + "Phones": ["${carrier.address.telephone?json_string}", "${carrier.address.other_number?json_string}" ], "Typology": "TYPOLOGY_CARRIER" } - } + } ] diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index bc5f838..da3b214 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -1,12 +1,12 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code}" + "RefID": "${carrier.carrier_code?json_string}" }, - + "Payload": {} - } + } ] diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 06bc6c2..2aac723 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?json_string}" }, "Payload": { @@ -17,7 +17,7 @@ <#-- <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, --> - + "Address": { @@ -26,7 +26,7 @@ "Name": "${actor.consignee_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}", + "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}", "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}", "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}", "CountryCode" : "${actor.consignee_structured_address.country_code?json_string}", @@ -34,20 +34,20 @@ "State": "${actor.consignee_structured_address.country_designation?json_string}" <#-- if Reflex WMS is not structured --> - <#else> + <#else> <#if actor.address?? > "Name": "${actor.address.company_name?json_string}", "StreetAddressOne" : "${actor.address.address_1?json_string}", "StreetAddressTwo" : "${actor.address.address_2?json_string}", - "StreetAddressThree" : "${actor.address.address_3?json_string}" - - - }, - <#if actor.address?? > - "Phones": ["${actor.address.telephone?json_string}", + "StreetAddressThree" : "${actor.address.address_3?json_string}" + + + }, + <#if actor.address?? > + "Phones": ["${actor.address.telephone?json_string}", "${actor.address.other_number?json_string}" - ], + ], "Typology": "TYPOLOGY_UNKNOWN" } diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index abce0a0..bb838af 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -1,12 +1,12 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?json_string}" }, - + "Payload": {} } ] diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 90566bc..f1c5d4b 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -3,42 +3,42 @@ [ <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> <#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> - { + { "Header": { "ProjectID": "${projectRP}" }, "ID": { "RefID": "${reflexMvtStockInterface.hd_number}" - }, + }, "Payload": { "ReceivedContents" :[ { "DateTime": { "DateTime": "${receipt_confirmation_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "AuthorTimeZone": "${time_zone_rfx}" }, "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code}", - "LVBranchID": "${reflexMvtStockInterface.lv_code}", + "ItemID": "${reflexMvtStockInterface.item_code?json_string}", + "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", "PriorityDate": "${priority_date}", - + <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference}", + "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?json_string}", <#else> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", - "ActorID": "${reflexMvtStockInterface.physical_depot_code}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} + "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} } } ] - } + } } - + ] diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 754b2d2..9421f70 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -12,42 +12,42 @@ "300":"STOCK_MOVEMENT_TYPE_REQUALIFICATION", "400":"STOCK_MOVEMENT_TYPE_FIX", "410":"STOCK_MOVEMENT_TYPE_FIX", - "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}> + "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}> <#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "Payload": { "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code}", + "ItemID": "${reflexMvtStockInterface.item_code?json_string}", "PriorityDate": "${ipg_priority_datetime}", - + <#-- Segmentation keys inclusions --> <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">, - - - "LVBranchID": "${reflexMvtStockInterface.lv_code}" + + + "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}" }, - "ActorID": "${reflexMvtStockInterface.physical_depot_code}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code?json_string}", "Movement": { - + "DateTime": { "DateTime": "${generation_date}", "AuthorTimeZone": "${time_zone_rfx}" }, - "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code}", + "Author": "ReflexWMS-${reflexMvtStockInterface.ipg_move_creation_user_code?json_string}", "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}", "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}", - "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}", + "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}", "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}", <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", - - + + "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", diff --git a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl index 5c1c26e..467028b 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl @@ -1,14 +1,14 @@ <#include "HfRpConfig.ftl"> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code}" + "RefID": "${lv.item_code?json_string}" }, "Payload": { - "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] - } + "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] + } } ] diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl index 1385a6e..ac9267a 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl @@ -1,37 +1,37 @@ <#include "HfRpConfig.ftl"> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code}" + "RefID": "${lv.item_code?json_string}" }, "Payload": { "LogisticVariants": [ - { - "LVID": "${lv.logistical_variant_code}", - "Name" : "${lv.lv_type_code}", - <#if lv.id_list??> + { + "LVID": "${lv.logistical_variant_code?json_string}", + "Name" : "${lv.lv_type_code?json_string}", + <#if lv.id_list??> "Codes": [ <#list lv.id_list as id> { - "Key": "${id.logistical_variant_ID_type_code}", - "Value": "${id.logistical_variant_ID_code}" + "Key": "${id.logistical_variant_ID_type_code?json_string!""}", + "Value": "${id.logistical_variant_ID_code?json_string!""}" }<#sep>, - - ], - - - <#-- LV Metadata inclusion --> + + ], + + + <#-- LV Metadata inclusion --> <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated_Metadata.ftl">, - + "IsBaseLogisticVariant": ${lv.base_lv}, - + <#if lv.base_lv != "true"> - "RefLV": "${lv.subpackaging_lv_code}", + "RefLV": "${lv.subpackaging_lv_code?json_string}", - + "QuantityInRefLV": ${lv.quantity_in_subpackaging_lv}, "NetWeight": { @@ -39,35 +39,35 @@ "Unit": "${weight_unit_rfx}" }, "GrossWeight": { - "Value": ${lv.gross_weight}, + "Value": ${lv.gross_weight}, "Unit": "${weight_unit_rfx}" }, "Volume": { "Value": ${lv.volume}, "Unit": "${volume_unit_rfx}" - }, + }, "Height": { "Value": ${lv.height}, "Unit": "${length_unit_rfx}" - }, + }, "Width": { "Value": ${lv.width}, "Unit": "${length_unit_rfx}" - }, + }, "Length": { "Value": ${lv.depth}, "Unit": "${length_unit_rfx}" - }, + }, <#if lv.packaging_lv == "true"> "BranchIDs": ["${lv.logistical_variant_code}"] <#else> "BranchIDs": [] - - - + + + } - ] + ] } } ] diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index f38c95d..943f331 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -1,102 +1,102 @@ <#include "HfRpConfig.ftl"> <#include "HfExpGrpList.ftl"> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code}" + "RefID": "${item.item_code?json_string}" }, "Payload": { "DescriptionsByLanguage": [{ "ShortDescription": "${item.short_designation?json_string}", "LongDescription": "${item.designation?json_string}", - "TechnicalDetails": "${item.item_description?json_string}", + "TechnicalDetails": "${item.item_description?json_string}", "LanguageCodeISO6391": "${text_language_rfx}" - } - ], + } + ], "ExpiryConstraint": { - "Type": "${ExpiryGroupList[item.expiry_group_code]!"UNKNOWN_DATE"}" + "Type": "${ExpiryGroupList[item.expiry_group_code]!"UNKNOWN_DATE"}" }, - - <#-- Item metadata inclusion --> + + <#-- Item metadata inclusion --> <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">, - + <#-- Item Photo URI could be added here --> <#--"PhotoURI": " ", --> <#-- Loop for the Logistical Variants - LV --> - <#if item.logistical_variant_list??> + <#if item.logistical_variant_list??> "LogisticVariants": [ - - <#list item.logistical_variant_list as logistical_variant> - { - "LVID": "${logistical_variant.logistical_variant_code}", - "Name" : "${logistical_variant.lv_type_code}", - - <#if logistical_variant.id_list??> + + <#list item.logistical_variant_list as logistical_variant> + { + "LVID": "${logistical_variant.logistical_variant_code?json_string}", + "Name" : "${logistical_variant.lv_type_code?json_string}", + + <#if logistical_variant.id_list??> "Codes": [ <#list logistical_variant.id_list as id> { - "Key": "${id.logistical_variant_ID_type_code}", - "Value": "${id.logistical_variant_ID_code}" + "Key": "${id.logistical_variant_ID_type_code?json_string!""}", + "Value": "${id.logistical_variant_ID_code?json_string!""}" }<#sep>, - - ], - - - <#-- LV Metadata inclusion --> - <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">, - - "IsBaseLogisticVariant": ${logistical_variant.base_lv}, - - <#if logistical_variant.base_lv != "true"> - "RefLV": "${logistical_variant.subpackaging_lv_code}", + + ], - + + <#-- LV Metadata inclusion --> + <#include "RFXtoRP_HsaItm_ItemCreated_LogisticVariantMetadata.ftl">, + + "IsBaseLogisticVariant": ${logistical_variant.base_lv}, + + <#if logistical_variant.base_lv != "true"> + "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}", + + "QuantityInRefLV": ${logistical_variant.quantity_in_subpackaging_lv}, - + "NetWeight": { "Value": ${logistical_variant.net_weight}, "Unit": "${weight_unit_rfx}" }, "GrossWeight": { - "Value": ${logistical_variant.gross_weight}, + "Value": ${logistical_variant.gross_weight}, "Unit": "${weight_unit_rfx}" }, "Volume": { "Value": ${logistical_variant.volume}, "Unit": "${volume_unit_rfx}" - }, + }, "Height": { "Value": ${logistical_variant.height}, "Unit": "${length_unit_rfx}" - }, + }, "Width": { "Value": ${logistical_variant.width}, "Unit": "${length_unit_rfx}" - }, + }, "Length": { "Value": ${logistical_variant.depth}, "Unit": "${length_unit_rfx}" - }, - - + }, + + <#if logistical_variant.packaging_lv == "true"> "BranchIDs": ["${logistical_variant.logistical_variant_code}"] <#else> "BranchIDs": [] - - + + } - <#sep>, - - - ] + <#sep>, + + + ] <#-- End of LV loop --> - + } } ] diff --git a/RFXtoRP_HsaItm_ItemDeleted.ftl b/RFXtoRP_HsaItm_ItemDeleted.ftl index 9250205..c8775d9 100644 --- a/RFXtoRP_HsaItm_ItemDeleted.ftl +++ b/RFXtoRP_HsaItm_ItemDeleted.ftl @@ -1,12 +1,12 @@ <#include "HfRpConfig.ftl"> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code}" + "RefID": "${item.item_code?json_string}" }, - "Payload": {} + "Payload": {} } ] diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index 847ec8a..e0f1939 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -3,12 +3,12 @@ <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 110b7f6..3c66b75 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -2,19 +2,19 @@ <#include "ReflexUtils.ftl"> <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, - + "Payload": {} - + } ] diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 110b7f6..3c66b75 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -2,19 +2,19 @@ <#include "ReflexUtils.ftl"> <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, - + "Payload": {} - + } ] diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 110b7f6..3c66b75 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -2,19 +2,19 @@ <#include "ReflexUtils.ftl"> <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, - + "Payload": {} - + } ] diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 110b7f6..3c66b75 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -2,19 +2,19 @@ <#include "ReflexUtils.ftl"> <#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, - + "Payload": {} - + } ] diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 5a219ad..e5b33cc 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -1,37 +1,37 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?json_string}" }, - + "Payload": { "Name": "${actor.designation?json_string}", "ManagedStock": false, - "IsCarrier": false, + "IsCarrier": false, <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - + <#-- <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">, --> - + "Address": { <#-- if Reflex WMS address is structured --> - <#if actor.supplier_structured_address?? > + <#if actor.supplier_structured_address?? > "Name": "${actor.supplier_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}", + "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}", "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}", "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}", "CountryCode" : "${actor.supplier_structured_address.country_code?json_string}", "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", "State": "${actor.supplier_structured_address.country_designation?json_string}" - + <#-- if Reflex WMS address is not structured --> <#else> <#if actor.optional_attributes?? > @@ -41,14 +41,14 @@ "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" - + }, <#if actor.optional_attributes?? > - "Phones": ["${actor.optional_attributes.telephone?json_string}", + "Phones": ["${actor.optional_attributes.telephone?json_string}", "${actor.optional_attributes.other_number?json_string}" ], "Typology": "TYPOLOGY_UNKNOWN" } - } + } ] diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index 07f19fc..bb838af 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -1,12 +1,12 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?json_string}" }, - + "Payload": {} - } + } ] diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 07adb7e..187fae8 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -1,37 +1,37 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code}" + "RefID": "${depot.physical_depot_code?json_string}" }, - + "Payload": { "Name": "${depot.physical_depot_designation?json_string}", "ManagedStock": true, "IsCarrier": false, <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - + <#-- <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">, --> - + "Address": { <#-- if Reflex WMS address is structured --> - <#if depot.physical_depot_structured_address?? > + <#if depot.physical_depot_structured_address?? > "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}", + "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}", "PostalCode" : "${depot.physical_depot_structured_address.postal_code?json_string}", "City" : "${depot.physical_depot_structured_address.post_code_area_name?json_string}", "CountryCode" : "${depot.physical_depot_structured_address.country_code?json_string}", "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}", "State": "${depot.physical_depot_structured_address.country_designation?json_string}" - + <#-- if Reflex WMS address is not structured --> <#else> "Name": "${depot.physical_depot_address.company_name?json_string}", @@ -39,12 +39,12 @@ "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}", "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}" - + }, - "Phones": ["${depot.physical_depot_address.telephone?json_string}", + "Phones": ["${depot.physical_depot_address.telephone?json_string}", "${depot.physical_depot_address.other_number?json_string}" ], "Typology": "TYPOLOGY_UNKNOWN" } - } + } ] diff --git a/RFXtoRP_HsrDepot_ActorDeleted.ftl b/RFXtoRP_HsrDepot_ActorDeleted.ftl index 164f67e..0e82294 100644 --- a/RFXtoRP_HsrDepot_ActorDeleted.ftl +++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl @@ -1,12 +1,12 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code}" + "RefID": "${depot.physical_depot_code?json_string}" }, - + "Payload": {} - } + } ] diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 89cae0e..6e5d826 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -1,22 +1,22 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - - { + + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}" + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?json_string}" }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code}" + "ActorID":"${preparationOrder.load_data.carrier_code?json_string}" } - <#-- Add transport grade code + <#-- Add transport grade code <#if preparationOrder.transport_grade_code!=""> , - "CarrierService":"${preparationOrder.transport_grade_code}" + "CarrierService":"${preparationOrder.transport_grade_code?json_string}" --> } } diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 92f5bfa..92cda11 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -3,25 +3,25 @@ [ <#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}" + "ProjectID": "${projectRP}" }, "ID": { - <#if despatched_ipg.carton_number != "000000000000000000"> + <#if despatched_ipg.carton_number != "000000000000000000"> "RefID": "${despatched_ipg.carton_number}" <#else> "RefID": "${despatched_ipg.hd_number}" }, - + "Payload": { "Information" :{ - <#if despatched_ipg.carton_number != "000000000000000000"> + <#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}" @@ -37,11 +37,11 @@ "Width": { "Unit": "${length_unit_rfx}", "Value": "${dimensionCarton.overall_width}" - } + } - + <#else> - "ContainerType": "${despatched_ipg.hd_type_code}", + "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": { @@ -55,20 +55,20 @@ "Width": { "Unit": "${length_unit_rfx}", "Value": "${dimensionHU.hd_type_width}" - } + } }, <#-- HU Metadata inclusin inclusion --> - <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl"> + <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl"> , "PreparedContents" :[ { "Goods": { - "ItemID": "${preparation_line.item_code}", - "LVBranchID": "${preparation_line.item_lv_code}", + "ItemID": "${preparation_line.item_code?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}", @@ -86,42 +86,42 @@ "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 /> + <#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 /> + <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> "PriorityDate": "error_date", - - - - - - - + + + + + + + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}", - <#if (preparation_line.pro_originator_reference_line_number!0) != 0> + "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?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}", - "ActorID": "${preparationOrder.physical_depot_code}", + "ActorID": "${preparationOrder.physical_depot_code?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": ${despatched_ipg.quantity_lvs} - } + "Value": ${despatched_ipg.quantity_lvs} + } } ] } - + }<#sep>, - + <#sep>, - + ] diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 7b3176a..e9da77f 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -1,17 +1,17 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - - { + + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}" + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?json_string}" }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code}" + "ActorID":"${preparationOrder.load_data.carrier_code?json_string}" } } } diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 69ca2f6..495a261 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -1,16 +1,16 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - - { + + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id}" + "RefID": "${despatched_ipg.consignment_unit_id?json_string}" }, "Payload": { - <#if despatched_ipg.carton_number != "000000000000000000"> + <#if despatched_ipg.carton_number != "000000000000000000"> "HandlingunitID": "${despatched_ipg.carton_number}" <#else> "HandlingunitID": "${despatched_ipg.hd_number}" @@ -18,7 +18,7 @@ <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > , "HUCarrier":{ - "ActorID": "${preparationOrder.load_data.carrier_code}" + "ActorID": "${preparationOrder.load_data.carrier_code?json_string}" } diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index d933eed..952e8b8 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -2,12 +2,12 @@ <#include "ReflexUtils.ftl"> <#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference}", + "RefID": "${preparation_order.originator_reference?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 00a2f46..8cfafad 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -1,57 +1,57 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - { + { <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) /> <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) /> "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference}", + "RefID": "${preparation_order.originator_reference?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload": { "CreationDateTime": { "DateTime": "${pro_creation_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - }, + "AuthorTimeZone": "${time_zone_rfx}" + }, <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, - <#-- Add transport grade code + <#-- Add transport grade code <#if preparation_order.transport_grade_code!=""> - "CarrierService":"${preparation_order.transport_grade_code}", + "CarrierService":"${preparation_order.transport_grade_code?json_string}", --> - "ShipFrom": { - "ActorID": "${preparation_order.physical_depot_code}" + "ShipFrom": { + "ActorID": "${preparation_order.physical_depot_code?json_string}" }, - "ShipFromAcked": true, + "ShipFromAcked": true, "ShipTo": { - <#if - <#-- preparation_order.address.type_code == "" && - preparation_order.address.title_code == "" && - preparation_order.address.first_name == "" && - preparation_order.address.last_name == "" && - preparation_order.address.mail_address == "" && - preparation_order.address.contact_type_code == "" && - preparation_order.address.mobile_phone_number == "" && - preparation_order.address.land_line_phone_number == "" && + <#if + <#-- preparation_order.address.type_code == "" && + preparation_order.address.title_code == "" && + preparation_order.address.first_name == "" && + preparation_order.address.last_name == "" && + preparation_order.address.mail_address == "" && + preparation_order.address.contact_type_code == "" && + preparation_order.address.mobile_phone_number == "" && + preparation_order.address.land_line_phone_number == "" && preparation_order.address.fax_number == "" && --> - preparation_order.address.address_type_code == "" && - preparation_order.address.name_or_company_name == "" && - preparation_order.address.additional_address_data_1 == "" && - preparation_order.address.additional_address_data_2 == "" && - preparation_order.address.post_code_area_name == "" && - preparation_order.address.territorial_division_code == "" && - preparation_order.address.postal_code == "" && - preparation_order.address.iso_country_code == ""> + preparation_order.address.address_type_code == "" && + preparation_order.address.name_or_company_name == "" && + preparation_order.address.additional_address_data_1 == "" && + preparation_order.address.additional_address_data_2 == "" && + preparation_order.address.post_code_area_name == "" && + preparation_order.address.territorial_division_code == "" && + preparation_order.address.postal_code == "" && + preparation_order.address.iso_country_code == ""> "ActorID": "${preparation_order.end_consignee_code}" - <#else> - "Actor": - { + <#else> + "Actor": + { "Name" : "${preparation_order.address.name_or_company_name?json_string!""}", "Address" : { @@ -63,62 +63,62 @@ "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" } }, - "Contact" : + "Contact" : { "FirstName" : "${preparation_order.address.first_name?json_string!""}", - "LastName" : "${preparation_order.address.last_name?json_string!""}", - "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)}, - "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ] - } - + "LastName" : "${preparation_order.address.last_name?json_string!""}", + "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)}, + "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ] + } + }, - - <#if preparation_order.line_list??> + + <#if preparation_order.line_list??> "Lines" : [ <#list preparation_order.line_list as preparation_order_line > - { - <#if (preparation_order_line.originator_reference_line_number!0) != 0> + { + <#if (preparation_order_line.originator_reference_line_number!0) != 0> "LineID": "${preparation_order_line.originator_reference_line_number}", <#else> "LineID": "${preparation_order_line.preparation_order_line_number!0}", <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">, - - "RequestedContent": - { - "Goods": + + "RequestedContent": + { + "Goods": { - "ItemID": "${preparation_order_line.item_code!"0"}", - "LVBranchID": "${preparation_order_line.item_lv_code!"0"}", + "ItemID": "${preparation_order_line.item_code?json_string!"0"}", + "LVBranchID": "${preparation_order_line.item_lv_code?json_string!"0"}", <#if (preparation_order_line.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)> - <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${forced_priority_date}", + <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${forced_priority_date}", - + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl"> - + }, - "Quantity" : + "Quantity" : { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${preparation_order_line.base_lv_quantity_to_prepare!0}" + "Value": "${preparation_order_line.base_lv_quantity_to_prepare!0}" } } }<#sep>, - + ], - + "RequestedMilestones" : { - "RequestedDeliveryDateTime" : + "RequestedDeliveryDateTime" : { - "DateTime": "${planned_final_delivery_start_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - } + "DateTime": "${planned_final_delivery_start_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + } } } ] diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index e294ccf..368c776 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -3,12 +3,12 @@ <#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "RefID": "${receipt.receipt_reference?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 6d55a0f..d2b5463 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "RefID": "${receipt.receipt_reference?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -25,16 +25,16 @@ "ShipFrom": { - "ActorID": "${receipt.original_code}" + "ActorID": "${receipt.original_code?json_string}" }, "ShipTo" : { - "ActorID": "${receipt.physical_depot_code}" + "ActorID": "${receipt.physical_depot_code?json_string}" }, "ShipToAcked": true, <#if receipt.carrier_informations.carrier_code != ""> - "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, + "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?json_string}"}, @@ -49,8 +49,8 @@ { "Goods": { - "ItemID": "${line.item_code!"0"}", - "LVBranchID": "${line.item_lv_code!"0"}", + "ItemID": "${line.item_code?json_string!"0"}", + "LVBranchID": "${line.item_lv_code?json_string!"0"}", <#if line.line_without_detail??> <#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 /> diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl index 3d36bb1..7c3171f 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl @@ -2,12 +2,12 @@ <#include "ReflexUtils.ftl"> <#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "RefID": "${receipt.receipt_reference?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 823866d..c82554d 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -3,19 +3,19 @@ <#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "RefID": "${receipt.receipt_reference?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, - + "Payload": {} - + } ] diff --git a/RFXtoRP_PrepOrder_ShipFromAcked.ftl b/RFXtoRP_PrepOrder_ShipFromAcked.ftl index 69d0247..6a4ab2c 100644 --- a/RFXtoRP_PrepOrder_ShipFromAcked.ftl +++ b/RFXtoRP_PrepOrder_ShipFromAcked.ftl @@ -1,15 +1,15 @@ [ - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { "RefID": "${id.refid}" }, - + "Payload": { "ShipFromAcked": true } - + } ] From a18f41ed7897968894076ef7ea39d03679c53ffa Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 22 Feb 2024 16:29:08 +0100 Subject: [PATCH 34/91] Modifs prioritydate --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 61 ++++++++++++++++-------------- 1 file changed, 33 insertions(+), 28 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 92cda11..54c0e37 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -72,34 +72,39 @@ <#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": "error_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> + <#if (preparation_line.confirmation_datetime?length != 0) && (preparation_line.confirmation_datetime?starts_with("00")== false)> + <#assign priority_date = preparation_line.confirmation_datetime?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${priority_date}", + <#else> + "PriorityDate": "error_date", + + + + + + + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> From 37f5fbf36467ba855b36cab2a4d794cba55d8470 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 26 Feb 2024 16:21:44 +0100 Subject: [PATCH 35/91] modif hsrprepa --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 54c0e37..62a0a16 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -93,12 +93,7 @@ <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> - <#if (preparation_line.confirmation_datetime?length != 0) && (preparation_line.confirmation_datetime?starts_with("00")== false)> - <#assign priority_date = preparation_line.confirmation_datetime?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${priority_date}", - <#else> - "PriorityDate": "error_date", - + "PriorityDate": "error_date", From f4b18643374ebc6ee1ae66e04a7e0abde64e0e1d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 27 Feb 2024 16:05:43 +0100 Subject: [PATCH 36/91] Priority date goods --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 62a0a16..607fcd3 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -93,7 +93,7 @@ <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> - "PriorityDate": "error_date", + "PriorityDate": "1970-01-01T00:00:00Z", From d038e1f6ceef0890b7656e30b2a785da16fdf7a8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 11:01:52 +0100 Subject: [PATCH 37/91] modifs order --- RFXtoRP_HsrPro.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index f633216..caa5990 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -19,7 +19,7 @@ { <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> <#-- check preparation type code (internal order and reservation are ignored) --> - <#if preparation_order.preparation_type_code == "010" || order.preparation_type_code == "030"> + <#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> From 4193d6e48c9e3d223c507861fab4bf046e5526f8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 11:54:30 +0100 Subject: [PATCH 38/91] modifs --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index a5d738b..bc2f003 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -3,16 +3,16 @@ <#list reflexStockPicturesInterface.detailled_stock_list as stock> { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "Payload": { "ActorID": "${stock.physical_depot_code}", <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> "Snapshot": { "DateTime": { - "DateTime": "${generation_date}", - "AuthorTimeZone": "${time_zone_rfx}" - }, + "DateTime": "${generation_date}", + "AuthorTimeZone": "${time_zone_rfx}" + }, "ID": "${stock.physical_depot_code}-${idSnapshot}", "Quantity": { @@ -20,21 +20,21 @@ "LVID": "${quantity_in_base_lv_RP_Cst}" } }, - + "Goods": { - "ItemID": "${stock.item_code}", + "ItemID": "${stock.item_code?json_string}", "LVBranchID": "${stock.item_logistical_variant_code}", - <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> + <#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}", - + <#-- Segmentation keys inclusion --> <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl"> - } - + } + } }<#sep>, - + ] From da8939ec74ec3099fe86b50df35d0de2ddcc927f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 11:57:41 +0100 Subject: [PATCH 39/91] modifs --- RFXtoRP_HsrReceiptList.ftl | 97 +++++++++++++++++++------------------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 4932a33..5dc1631 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -3,7 +3,7 @@ <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -12,82 +12,83 @@ <#switch cloudEventMsg.action> <#case "C"> <#-- *********************************************** Action = CREATE ******************** --> - - <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#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"> - - } - ] - + <#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"> + + } + ] + + <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign receipt = JsonUtil.jsonToMap(dataRfx)> + [ <#if receipt.receipt_confirmed == "true" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl"> - } + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl"> + } <#else> <#if receipt.receipt_type = "030"> <#stop "ignored message because receipt type = transfert"> <#else> { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign receipt = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> - + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } - ] + ] <#break> - - + + <#default> <#stop "event not supported"> From 3ed530fb0946ba4705f57c39c4d272083942a9bf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 13:34:59 +0100 Subject: [PATCH 40/91] modifs trim json --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 2 +- RFXtoRP_HsaCarrier_ActorCreated.ftl | 2 +- RFXtoRP_HsaCarrier_ActorDeleted.ftl | 2 +- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- RFXtoRP_HsaCons_ActorDeleted.ftl | 2 +- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 8 ++++---- RFXtoRP_HsaIpgMove_StockMoved.ftl | 4 ++-- RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl | 2 +- RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl | 2 +- RFXtoRP_HsaItm_ItemCreated.ftl | 2 +- RFXtoRP_HsaItm_ItemDeleted.ftl | 2 +- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 2 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 2 +- RFXtoRP_HsaSup_ActorCreated.ftl | 2 +- RFXtoRP_HsaSup_ActorDeleted.ftl | 2 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 2 +- RFXtoRP_HsrDepot_ActorDeleted.ftl | 2 +- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++--- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 6 +++--- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 4 ++-- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 8 ++++---- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 10 +++++----- RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 30 files changed, 46 insertions(+), 46 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index bc2f003..9152df1 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -22,7 +22,7 @@ }, "Goods": { - "ItemID": "${stock.item_code?json_string}", + "ItemID": "${stock.item_code?trim?json_string}", "LVBranchID": "${stock.item_logistical_variant_code}", <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) > diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index e9b707a..8c35239 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code?json_string}" + "RefID": "${carrier.carrier_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index da3b214..5e131c4 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code?json_string}" + "RefID": "${carrier.carrier_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 2aac723..97b21f8 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index bb838af..6fbfb45 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index f1c5d4b..4a65641 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${reflexMvtStockInterface.hd_number}" + "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}" }, "Payload": { "ReceivedContents" :[ @@ -18,7 +18,7 @@ "AuthorTimeZone": "${time_zone_rfx}" }, "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code?json_string}", + "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", "PriorityDate": "${priority_date}", @@ -26,12 +26,12 @@ <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?json_string}", + "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", - "ActorID": "${reflexMvtStockInterface.physical_depot_code?json_string}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 9421f70..86c7d55 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -23,7 +23,7 @@ }, "Payload": { "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code?json_string}", + "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "PriorityDate": "${ipg_priority_datetime}", <#-- Segmentation keys inclusions --> @@ -32,7 +32,7 @@ "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}" }, - "ActorID": "${reflexMvtStockInterface.physical_depot_code?json_string}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "Movement": { "DateTime": { diff --git a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl index 467028b..edc0760 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code?json_string}" + "RefID": "${lv.item_code?trim?json_string}" }, "Payload": { "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl index ac9267a..81560f3 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code?json_string}" + "RefID": "${lv.item_code?trim?json_string}" }, "Payload": { "LogisticVariants": [ diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 943f331..9ef083d 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -6,7 +6,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code?json_string}" + "RefID": "${item.item_code?trim?json_string}" }, "Payload": { "DescriptionsByLanguage": [{ diff --git a/RFXtoRP_HsaItm_ItemDeleted.ftl b/RFXtoRP_HsaItm_ItemDeleted.ftl index c8775d9..a9de0f1 100644 --- a/RFXtoRP_HsaItm_ItemDeleted.ftl +++ b/RFXtoRP_HsaItm_ItemDeleted.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code?json_string}" + "RefID": "${item.item_code?trim?json_string}" }, "Payload": {} } diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index e0f1939..0a1b945 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index e5b33cc..fb804ac 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index bb838af..6fbfb45 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 187fae8..31774f9 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code?json_string}" + "RefID": "${depot.physical_depot_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsrDepot_ActorDeleted.ftl b/RFXtoRP_HsrDepot_ActorDeleted.ftl index 0e82294..d4e070a 100644 --- a/RFXtoRP_HsrDepot_ActorDeleted.ftl +++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code?json_string}" + "RefID": "${depot.physical_depot_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 6e5d826..50d8214 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -7,16 +7,16 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?json_string}" + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}" }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?json_string}" + "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" } <#-- Add transport grade code <#if preparationOrder.transport_grade_code!=""> , - "CarrierService":"${preparationOrder.transport_grade_code?json_string}" + "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}" --> } } diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 607fcd3..20b9138 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -67,7 +67,7 @@ "PreparedContents" :[ { "Goods": { - "ItemID": "${preparation_line.item_code?json_string}", + "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 /> @@ -104,13 +104,13 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?json_string}", + "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}", - "ActorID": "${preparationOrder.physical_depot_code?json_string}", + "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${despatched_ipg.quantity_lvs} diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index e9da77f..51675ba 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -7,11 +7,11 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?json_string}" + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}" }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?json_string}" + "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" } } } diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 495a261..107c511 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id?json_string}" + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 952e8b8..9cdd1b6 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?json_string}", + "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 8cfafad..d1f4107 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?json_string}", + "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -23,10 +23,10 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, <#-- Add transport grade code <#if preparation_order.transport_grade_code!=""> - "CarrierService":"${preparation_order.transport_grade_code?json_string}", + "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}", --> "ShipFrom": { - "ActorID": "${preparation_order.physical_depot_code?json_string}" + "ActorID": "${preparation_order.physical_depot_code?trim?json_string}" }, "ShipFromAcked": true, "ShipTo": { @@ -89,7 +89,7 @@ { "Goods": { - "ItemID": "${preparation_order_line.item_code?json_string!"0"}", + "ItemID": "${preparation_order_line.item_code?trim?json_string!"0"}", "LVBranchID": "${preparation_order_line.item_lv_code?json_string!"0"}", <#if (preparation_order_line.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)> <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 368c776..46a8692 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index d2b5463..5919440 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -25,16 +25,16 @@ "ShipFrom": { - "ActorID": "${receipt.original_code?json_string}" + "ActorID": "${receipt.original_code?trim?json_string}" }, "ShipTo" : { - "ActorID": "${receipt.physical_depot_code?json_string}" + "ActorID": "${receipt.physical_depot_code?trim?json_string}" }, "ShipToAcked": true, <#if receipt.carrier_informations.carrier_code != ""> - "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?json_string}"}, + "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"}, @@ -49,7 +49,7 @@ { "Goods": { - "ItemID": "${line.item_code?json_string!"0"}", + "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.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)> diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl index 7c3171f..485a5c5 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index c82554d..65f257c 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 76c071fab760b3f62b66aabf9a315143c8f5a200 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 13:53:59 +0100 Subject: [PATCH 41/91] modif receipt --- RFXtoRP_HsrReceiptList.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 5dc1631..5fcdffb 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -36,6 +36,8 @@ } ] + <#else> + <#stop "Receipt reference is empty"> <#break> <#case "U"> From 1038471fd0f01e0dfba41f060de0bc657333c6d7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 16:23:09 +0100 Subject: [PATCH 42/91] modifs --- RFXtoRP_HsaProStatus.ftl | 12 ++++++------ RFXtoRP_HsrReceiptList.ftl | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 042b49b..a1c4709 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -33,9 +33,9 @@ "datas" : <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl"> } - <#else> + <#else> <#-- ****Preparation dispatched (600)** --> - <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" > + <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -48,18 +48,18 @@ "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> - + diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 5fcdffb..840b0f8 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -35,10 +35,10 @@ } ] - - <#else> - <#stop "Receipt reference is empty"> + <#else> + <#stop "Receipt reference is empty"> + <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> From 76c17efbec7eecab9953ff69289ec4bd2205ba22 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 16:48:02 +0100 Subject: [PATCH 43/91] modifs --- RFXtoRP_HsrPrepa.ftl | 68 +++++++++---------- ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 0 RFXtoRP_HsrReceiptList.ftl | 4 +- ...eiptList_ExecutionflowReceiptCompleted.ftl | 0 4 files changed, 36 insertions(+), 36 deletions(-) rename RFXtoRP_HsrPrepa_GoodsPrepared.ftl => RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl (100%) rename RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl => RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl (100%) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index a3dab93..712cfec 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -2,89 +2,89 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> - -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> - + <#assign aDateTime = .now> - + <#switch cloudEventMsg.action> <#case "C"> <#--<#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> -<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> - -<#if preparationOrder.total_lv_validated !=0> - [ +<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> + +<#if preparationOrder.total_lv_validated !=0> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl"> + "datas" : + <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl"> }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> + "datas" : + <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> } <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > , { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> + "datas" : + <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> + "datas" : + <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> } - + <#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> + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> + "datas" : + <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> } <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > , { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : + "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> - } + "datas" : + <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> + } - + <#-- <#sep>, --> - + ] - + <#else> <#stop "no confirmed quantity for the preparation - preparation closed"> - + <#break> <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl similarity index 100% rename from RFXtoRP_HsrPrepa_GoodsPrepared.ftl rename to RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 840b0f8..abcab30 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -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"> diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl similarity index 100% rename from RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl rename to RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl From 7eee45993e3ddcd1570d3160aaf9087ccbc98464 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 17:13:39 +0100 Subject: [PATCH 44/91] modif --- RFXtoRP_HfDtlStockLs.ftl | 42 ++++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs.ftl b/RFXtoRP_HfDtlStockLs.ftl index 14595ff..1c514ab 100644 --- a/RFXtoRP_HfDtlStockLs.ftl +++ b/RFXtoRP_HfDtlStockLs.ftl @@ -6,7 +6,7 @@ <#include "HfRpConfig.ftl"> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -16,44 +16,44 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign reflexStockPicturesInterface = JsonUtil.jsonToMap(dataRfx)> - + <#-- idSnapshot MUST BE UNIQUE regardless of the number of messages in the stock image --> - <#if cloudEventMsg.messageSet??> + <#if cloudEventMsg.messageSet??> <#assign idSnapshot = cloudEventMsg.messageSet /> <#else> <#assign idSnapshot = cloudEventMsg.id /> - - + + <#list reflexStockPicturesInterface.detailled_stock_list as stock> <#if stock.stock_type_code != "200"> - <#stop "stock type different from 200"> - <#break> - - - [ - { + <#stop> + <#break> + + + [ + { <#if sum_elt??> - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorSnapshotCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl"> + "datas" : + <#include "RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl"> <#else> - <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.StockSnapshotted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : + "datas" : <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl"> - + } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#stop "event not supported"> <#break> - - + + <#default> <#stop "event not supported"> From 3b98560221fbc2b2a11054962ff3d62a5a352d23 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 4 Mar 2024 10:30:24 +0100 Subject: [PATCH 45/91] modifs --- RFXtoRP_HsaItm_ItemCreated.ftl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 9ef083d..6ef16c0 100644 --- 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 logistical_variant.base_lv != "true"> "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}", From 97b3eb3d97bc6dc177986b627e64d2a9fddd8bc4 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 5 Mar 2024 15:05:51 +0100 Subject: [PATCH 46/91] SCPN1-6130 --- ReflexUtils.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index a73c1fa..574d0a2 100644 --- 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?datetime("yyyy-MM-dd'T'HH:mm:ss")?iso_utc)> <#-- --------------------------------------------------------------------------------------- --> From 3ef86f9e5ce61c5c3a8a8e426fe7ebf6a69a6326 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Mar 2024 17:03:32 +0100 Subject: [PATCH 47/91] modifs --- RFXtoRP_PlatformLogCreate.ftl | 8 +- RFXtoRP_RestResponse.ftl | 112 ++++++++++++++---------- RFXtoRP_RestResponseAllocationError.ftl | 21 +++++ 3 files changed, 93 insertions(+), 48 deletions(-) create mode 100644 RFXtoRP_RestResponseAllocationError.ftl diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index 7806150..9e657f1 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -2,9 +2,9 @@ [ <#assign UUID = UUID.randomUUID()> <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> - { + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { "RefID": "${UUID}", @@ -12,7 +12,7 @@ "DateTime": "${aDateTime?iso_utc}", "AuthorTimeZone": "${time_zone_rfx}" } - }, + }, "Payload": { <#assign severity = SeverityLevel.ERROR> "Severity": "${severity}", @@ -35,7 +35,7 @@ "ContextPayload": "rfxresponse", "Type": "RP_EXECUTIONFLOW_EVENT", "Task": "${id.apiRestReflexID}", - "OriginalID": "${id.refid}", + "OriginalID": "${id.refid?trim?json_string}", "StackTrace": "" } } diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 2b62793..01a3c9b 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -3,8 +3,8 @@ <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#assign restResponsetMsg = JsonUtil.jsonToMap(input)> -<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)> +<#assign restResponsetMsg = JsonUtil.jsonToMap(input)> +<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -18,91 +18,115 @@ <#case 201> <#-- *********************************************** ApiRestID = preparation_orders_post ******************** --> <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> - <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> - <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > - [ + <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> + <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl"> + "datas" : + <#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl"> } ] - <#else> - [ + <#else> + [ { <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> - <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_PlatformLogCreate.ftl"> + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_RestResponseAllocationError.ftl"> } - ] + ] - <#break> + <#break> <#default> - [ + [ { <#if restResponsetMsg.body?? > <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#else> <#assign restResponseBody = "{}" /> - <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_PlatformLogCreate.ftl"> + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_RestResponseAllocationError.ftl"> } - ] - + ] + <#break> - + <#case "receipts_post"> <#switch restResponsetMsg.status> <#case 200> <#case 201> <#-- *********************************************** ApiRestID = receipts_post ******************** --> <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> - <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> - <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > - [ + <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> + <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipToAcked> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_Receipt_ShipToAcked.ftl"> + "datas" : + <#include "RFXtoRP_Receipt_ShipToAcked.ftl"> } - ] - <#else> - [ + ] + <#else> + [ { <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> - <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_PlatformLogCreate.ftl"> - } - ] - + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_RestResponseAllocationError.ftl"> + } + ] + <#break> <#default> - [ + [ { <#if restResponsetMsg.body?? > <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#else> <#assign restResponseBody = "{}" /> - <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_PlatformLogCreate.ftl"> + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_RestResponseAllocationError.ftl"> } - ] - + ] + <#break> - + <#default> <#stop> diff --git a/RFXtoRP_RestResponseAllocationError.ftl b/RFXtoRP_RestResponseAllocationError.ftl new file mode 100644 index 0000000..f42c1d2 --- /dev/null +++ b/RFXtoRP_RestResponseAllocationError.ftl @@ -0,0 +1,21 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> + +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${id.refid?trim?json_string}", + "RefDate": { + "DateTime": "${aDateTime?iso_utc}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + + "Payload": {} + + } +] From dc362f682636d25cf3f610fb98710f530676aaa4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Mar 2024 17:30:56 +0100 Subject: [PATCH 48/91] modifs --- RFXtoRP_RestResponseAllocationError.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_RestResponseAllocationError.ftl b/RFXtoRP_RestResponseAllocationError.ftl index f42c1d2..56626f1 100644 --- a/RFXtoRP_RestResponseAllocationError.ftl +++ b/RFXtoRP_RestResponseAllocationError.ftl @@ -1,6 +1,5 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> [ { From 5af4faf052a9a6e625a7e37ec409fc9efdb3b503 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 7 Mar 2024 10:16:44 +0100 Subject: [PATCH 49/91] modifs --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 20b9138..ecd7bb4 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -41,9 +41,10 @@ <#else> - "ContainerType": "${despatched_ipg.hd_type_code?json_string}", + "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}" From 48052a81120198a6152c73057f98d74bbf078c29 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 11 Mar 2024 14:25:42 +0100 Subject: [PATCH 50/91] SCPN1-6130 --- ReflexUtils.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index 574d0a2..d033bfb 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -2,7 +2,7 @@ <#-- Concat reflex timestamp with reflex time zone and format this date in ISO UTC format --> <#-- --------------------------------------------------------------------------------------- --> <#function RfxDateTimetoUTC rfxdatetime offset > - <#return (rfxdatetime?datetime("yyyy-MM-dd'T'HH:mm:ss")?iso_utc)> + <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)> <#-- --------------------------------------------------------------------------------------- --> From fc919c21999a2e0a80d4e949301d94d7ca03c2ec Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Mon, 11 Mar 2024 16:13:48 +0100 Subject: [PATCH 51/91] Release 1.2.13+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5cf5cba..dd0c704 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.12+3 +1.2.13+1 From 9cffad8ffb18064d45342c389345ae25bb8a0a6e Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Mon, 11 Mar 2024 17:12:45 +0100 Subject: [PATCH 52/91] Snapshot reflex-wms-connector 1.4.0-SNAPSHOT --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9d7c109..8f069ae 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0-SNAPSHOT +1.4.0-SNAPSHOT From 86afce4b0dff37520deea849a7282f4c556a5630 Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Tue, 12 Mar 2024 08:29:59 +0000 Subject: [PATCH 53/91] reverted VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8f069ae..9d7c109 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.4.0-SNAPSHOT +1.3.0-SNAPSHOT From fb8f9ca6511f5891bf67bc49228d3c06005f9045 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 12 Mar 2024 09:31:26 +0100 Subject: [PATCH 54/91] Release 1.2.14+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index dd0c704..962e05d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.13+1 +1.2.14+1 From 33c7ab08a781f029e2e769325968df693cf1f5db Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Tue, 12 Mar 2024 08:51:41 +0000 Subject: [PATCH 55/91] reverted VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 962e05d..dd0c704 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.14+1 +1.2.13+1 From f5970127b0939017ef0714e0754d64d1b6106b79 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 12 Mar 2024 09:55:32 +0100 Subject: [PATCH 56/91] update version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5cf5cba..dd0c704 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.12+3 +1.2.13+1 From 60c6f812d13f9e3c3452e607e9925b3988137350 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 12 Mar 2024 10:02:52 +0100 Subject: [PATCH 57/91] Release 1.2.14+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index dd0c704..962e05d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.13+1 +1.2.14+1 From c7d7aaec1605536c301e3fd7b87dd8ada97d8a98 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Mar 2024 17:09:22 +0100 Subject: [PATCH 58/91] Modifs pro cancelled --- RFXtoRP_HsrPro.ftl | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index caa5990..cfa3721 100644 --- 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"> + + } ] <#break> From 8575ad0de26e53e3d705efaf3de90b85a04bf723 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Mar 2024 17:47:35 +0100 Subject: [PATCH 59/91] Modifs --- RFXtoRP_HsaProStatus.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index a1c4709..044f6db 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -17,6 +17,7 @@ <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ <#--**Pick batch runned (200) **--> + <#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.ExecutionflowPreparationExpected> @@ -63,6 +64,9 @@ + <#else> + <#stop "PRO reference is empty"> + ] <#break> From c6370e2eb78f00c27f3f097e718758e45f84ebac Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 13 Mar 2024 18:07:47 +0100 Subject: [PATCH 60/91] SCPN1-6203 --- RPtoRFX_ExecutionflowEvent.ftl | 2 ++ RPtoRFX_PrepOrder.ftl | 7 ++----- RPtoRFX_Receipt.ftl | 6 +++--- ReflexUtils.ftl | 4 ++++ 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/RPtoRFX_ExecutionflowEvent.ftl b/RPtoRFX_ExecutionflowEvent.ftl index 30f9c0e..95d8132 100644 --- 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> diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 17cc8d6..a887482 100644 --- 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)}", "requested_delivery_date_type": "${requested_delivery_date_type}", "consolidated_delivery": "${consolidated_delivery_flag}", diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index e9fa3b3..5cf790e 100644 --- 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)}", "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index d033bfb..b7071f6 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -5,6 +5,10 @@ <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)> +<#function DateTimeUTCtoRfxLocale dateutc locale > + <#return dateutc?datetime.iso?iso_nz(locale)> + + <#-- --------------------------------------------------------------------------------------- --> <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" --> From 4802c74fb81e99df0b9a77529b346e831274b3ac Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 14 Mar 2024 11:51:49 +0100 Subject: [PATCH 61/91] modifs ref vide --- RFXtoRP_HsaProStatus.ftl | 68 ++++++++++----------- RFXtoRP_HsrPrepa.ftl | 127 +++++++++++++++++++-------------------- 2 files changed, 97 insertions(+), 98 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 044f6db..99a4993 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -18,55 +18,55 @@ [ <#--**Pick batch runned (200) **--> <#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.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_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> + + <#else> + <#stop "PRO reference is empty"> - <#else> - <#stop "PRO reference is empty"> - ] <#break> diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 712cfec..bcd6a62 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -15,74 +15,73 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> +<#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference??!=""> + <#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"> - } - - - <#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 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 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"> + } + + <#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 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"> + } + + + <#-- <#sep>, --> - <#-- <#sep>, --> - - - - ] - + ] + <#else> + <#stop "no confirmed quantity for the preparation - preparation closed"> + <#else> - <#stop "no confirmed quantity for the preparation - preparation closed"> + <#stop "PRO reference is empty"> <#break> From 349642fe256928e794ccdb3ebde4852d321c5a46 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 14 Mar 2024 11:58:35 +0100 Subject: [PATCH 62/91] modifs --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index bcd6a62..6ce5b27 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -15,7 +15,7 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> -<#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference??!=""> +<#if preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?? && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference??!=""> <#if preparationOrder.total_lv_validated !=0> [ { From 53afac0ccf79ab36849e6b6c41c9a9cf6329ec8a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 14 Mar 2024 12:01:40 +0100 Subject: [PATCH 63/91] modifs --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 6ce5b27..eccfac8 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -15,7 +15,7 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> -<#if preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?? && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference??!=""> +<#if preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?? && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference!=""> <#if preparationOrder.total_lv_validated !=0> [ { From 0211b910691a1e6e610eef275dfc4db7652e3a7f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Mar 2024 09:38:15 +0100 Subject: [PATCH 64/91] modifs --- RFXtoRP_HsaIpgMove.ftl | 66 ++++++++++++++++++------------------ RFXtoRP_HsrReceiptList.ftl | 68 +++++++++++++++++++++----------------- 2 files changed, 71 insertions(+), 63 deletions(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index be73034..00fdfd5 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -12,50 +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> + <#-- IPG moves translated into goods received (all type of receipt) --> + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> + <#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> + <#else> - <#-- Case of IPG move type volontarilly ignored--> - <#stop> + <#stop Receipt reference is empty> - <#else> <#-- cases of an IPG move with quantity = 0 (weight modification)--> <#stop> diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index abcab30..d25cd93 100644 --- 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 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"> + } + + + <#else> + <#stop "Receipt reference is empty"> ] <#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"> + ] <#break> From c03129855ea974b326e97188d86e13f80183b310 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Mar 2024 09:45:24 +0100 Subject: [PATCH 65/91] modifs --- RFXtoRP_HsaIpgMove.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 00fdfd5..e1ff9be 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -58,9 +58,10 @@ <#else> <#stop Receipt reference is empty> - <#else> + <#else> <#-- cases of an IPG move with quantity = 0 (weight modification)--> <#stop> + <#break> From cc5357369d43f27b8d8bb9b15ff7c8bd492d273f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Mar 2024 10:42:28 +0100 Subject: [PATCH 66/91] modifs --- RFXtoRP_HsaIpgMove.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index e1ff9be..ef559d0 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -56,7 +56,7 @@ <#stop> <#else> - <#stop Receipt reference is empty> + <#stop "Receipt reference is empty"> <#else> <#-- cases of an IPG move with quantity = 0 (weight modification)--> From 591b49cd88cac6978b01e391f55f8402266bd816 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Mar 2024 10:56:08 +0100 Subject: [PATCH 67/91] modifs --- RFXtoRP_HsaIpgMove.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index ef559d0..03cbfb8 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -58,10 +58,10 @@ <#else> <#stop "Receipt reference is empty"> - <#else> + + <#else> <#-- cases of an IPG move with quantity = 0 (weight modification)--> <#stop> - <#break> From 03953258d68326f03adbce3fc4333f8e42ee962a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 18 Mar 2024 10:06:06 +0100 Subject: [PATCH 68/91] modifs --- RFXtoRP_HsrPrepa.ftl | 8 +++----- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 1 - RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 10 +++++----- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index eccfac8..133ba4f 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -15,7 +15,7 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> -<#if preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?? && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference!=""> + <#if preparationOrder.total_lv_validated !=0> [ { @@ -47,7 +47,7 @@ } - <#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> <#if despatched_ipg.consignment_unit_id!=""> , @@ -80,9 +80,7 @@ <#else> <#stop "no confirmed quantity for the preparation - preparation closed"> -<#else> - <#stop "PRO reference is empty"> - + <#break> <#case "D"> diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 50d8214..3186074 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -1,7 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - { "Header": { "ProjectID": "${projectRP}" diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index d4c3d21..22948cb 100644 --- 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>, - + ] diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index ecd7bb4..feb6c2e 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -1,7 +1,7 @@ <#include "HfRpConfig.ftl"> [ - <#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": { From 0067755ee446824465f20a7ecc1b7e39e92cdf83 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 18 Mar 2024 15:36:55 +0100 Subject: [PATCH 69/91] Modifs --- RFXtoRP_HsrPrepa.ftl | 2 +- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++++- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 133ba4f..1781f53 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -31,7 +31,7 @@ <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> } - <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > + <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!=""> , { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 3186074..b058352 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -1,12 +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": { @@ -19,4 +21,6 @@ --> } } + <#sep>, + ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 51675ba..42b3f85 100644 --- 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>, + ] \ No newline at end of file From be2229d184be65bf34c4724bd1bf628ebd5b3d05 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 18 Mar 2024 17:19:26 +0100 Subject: [PATCH 70/91] Modifs --- RFXtoRP_HsaIpgMove.ftl | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 03cbfb8..c1a22d7 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -39,10 +39,9 @@ ] <#else> <#-- IPG moves translated into goods received (all type of receipt) --> - <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> - <#if reflexMvtStockInterface.ipg_move_type == "100" || - reflexMvtStockInterface.ipg_move_type == "110" || - reflexMvtStockInterface.ipg_move_type == "120"> + <#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> @@ -52,13 +51,14 @@ } ] <#else> - <#-- Case of IPG move type volontarilly ignored--> - <#stop> + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> + <#-- Case of IPG move type volontarilly ignored--> + <#stop " Reference receipt is empty"> + <#else> + <#stop> + - <#else> - <#stop "Receipt reference is empty"> - - + <#else> <#-- cases of an IPG move with quantity = 0 (weight modification)--> <#stop> From 6b633663e9211b688a465d7b1ff043dc39585a69 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 19 Mar 2024 16:50:50 +0100 Subject: [PATCH 71/91] Release 1.2.15+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 962e05d..360e472 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.14+1 +1.2.15+1 From 92e37e8baa56a009a42972f81dc9f1fda767f0f4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Mar 2024 10:42:42 +0100 Subject: [PATCH 72/91] modifs ipgmoved --- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 86c7d55..2112525 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -24,7 +24,9 @@ "Payload": { "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", + <#if (ipg_priority_datetime!="") && (ipg_priority_datetime?starts_with("00")== false) > "PriorityDate": "${ipg_priority_datetime}", + <#-- Segmentation keys inclusions --> <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">, From f7125548db216287e867704d6101f86140b3b1dd Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Mar 2024 10:55:37 +0100 Subject: [PATCH 73/91] modifs moved --- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 2112525..d9175fc 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -24,7 +24,7 @@ "Payload": { "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", - <#if (ipg_priority_datetime!="") && (ipg_priority_datetime?starts_with("00")== false) > + <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) > "PriorityDate": "${ipg_priority_datetime}", From 03362d6a8b5836d4fb7bfaad9c90424b88ecb65f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Mar 2024 17:07:47 +0100 Subject: [PATCH 74/91] modifs HuAdded --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index 93c49ff..cb9e5b0 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -1,10 +1,10 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - - { + + { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { "RefID": "${despatched_ipg.hd_number}" @@ -28,7 +28,7 @@ "Width": { "Unit": "${length_unit_rfx}", "Value": ${preparation_line.despatched_hds_list[0].hd_type_width} - } + } } From 59a77832034319f1ddd717f4b7b417f8a9a0ea9f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Mar 2024 17:12:01 +0100 Subject: [PATCH 75/91] modifs priority date --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 4 +++- RFXtoRP_HsaIpgMove_StockMoved.ftl | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index 9152df1..deed817 100644 --- 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}", - + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + <#-- Segmentation keys inclusion --> <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl"> diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index d9175fc..4fc6aaf 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -25,7 +25,9 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) > - "PriorityDate": "${ipg_priority_datetime}", + "PriorityDate": "${ipg_priority_datetime}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", <#-- Segmentation keys inclusions --> From 9cdcd2784d0fa6f24627b4d707c86728558d8cef Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 21 Mar 2024 09:38:35 +0100 Subject: [PATCH 76/91] Release 1.2.15+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 360e472..6608b4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+1 +1.2.15+2 From 753de14f97c3b9be6274f25ba9593efda4a552ed Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Mar 2024 16:22:59 +0100 Subject: [PATCH 77/91] 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 78/91] 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 79/91] 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 80/91] 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 81/91] 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>, + ] From 6f287e878a231b82f4859ca01b0454dc71a3afc6 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 21 Mar 2024 17:39:10 +0100 Subject: [PATCH 82/91] Release 1.2.15+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6608b4f..501ed67 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+2 +1.2.15+3 From 5cafa068a75d2f54eeed921beb3c4c37b03f28a4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 25 Mar 2024 18:03:45 +0100 Subject: [PATCH 83/91] Modifs date emballage --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index feb6c2e..046e1d3 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -8,6 +8,10 @@ "ProjectID": "${projectRP}" }, "ID": { + "RefDate": { + "AuthorTimeZone": "${time_zone_rfx}", + "DateTime": "${preparation_line.confirmation_datetime}" + }, <#if despatched_ipg.carton_number != "000000000000000000"> "RefID": "${despatched_ipg.carton_number}" <#else> From 196ab387acdd112161fdbcb00195051979342f23 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Mar 2024 10:00:03 +0100 Subject: [PATCH 84/91] modifs date --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 046e1d3..19a13de 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -1,8 +1,10 @@ <#include "HfRpConfig.ftl"> [ + < <#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 packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> { "Header": { "ProjectID": "${projectRP}" From 0fff71b759fb1ef6c309d4330856a318a3ab167d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Mar 2024 10:09:15 +0100 Subject: [PATCH 85/91] modifs goods --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 19a13de..324c50d 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -1,4 +1,5 @@ <#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> [ < From fd9f248619fb074339debb8343cccfbe402495e1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Mar 2024 10:19:20 +0100 Subject: [PATCH 86/91] modifs goods --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 324c50d..8cb15ab 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -13,7 +13,7 @@ "ID": { "RefDate": { "AuthorTimeZone": "${time_zone_rfx}", - "DateTime": "${preparation_line.confirmation_datetime}" + "DateTime": "${packing_datetime}" }, <#if despatched_ipg.carton_number != "000000000000000000"> "RefID": "${despatched_ipg.carton_number}" From 264f9131d08991983a44487e10e329948e51d19c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Mar 2024 10:26:59 +0100 Subject: [PATCH 87/91] modifs goods --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 8cb15ab..2094590 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,6 @@ <#include "ReflexUtils.ftl"> [ - < <#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 packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> From d1512d426947b8916b1539ad847d2f8785d75f49 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Mar 2024 11:08:38 +0100 Subject: [PATCH 88/91] modifs date packing --- RFXtoRP_HsrPrepa.ftl | 3 +- ...rPrepa_HUsAdded_HandlingUnitDispatched.ftl | 12 ++-- ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 60 +++++++++---------- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 5 +- 4 files changed, 42 insertions(+), 38 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index eef8a4a..ddb67e3 100644 --- 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> @@ -49,6 +49,7 @@ <#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!=""> , { diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index d8e06d9..64be3ad 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -1,24 +1,24 @@ <#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_line2> - <#list preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg2> +<#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_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg2.carton_number}", + "RefID": "${despatched_ipg3.carton_number}", "RefDate": { - "DateTime": "${dispatched_datetime}", + "DateTime": "${dispatched3_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } }, "Payload": { } }<#sep>, - <#if preparation_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 > + <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 > <#sep>, diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 2094590..ac496b5 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,9 +2,9 @@ <#include "ReflexUtils.ftl"> [ - <#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 packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> + <#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}" @@ -14,19 +14,19 @@ "AuthorTimeZone": "${time_zone_rfx}", "DateTime": "${packing_datetime}" }, - <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID": "${despatched_ipg.carton_number}" + <#if despatched_ipg2.carton_number != "000000000000000000"> + "RefID": "${despatched_ipg2.carton_number}" <#else> - "RefID": "${despatched_ipg.hd_number}" + "RefID": "${despatched_ipg2.hd_number}" }, "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}", @@ -47,9 +47,9 @@ <#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}", @@ -74,26 +74,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)> @@ -111,16 +111,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}", "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} } } diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index cb9e5b0..968ed88 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -1,12 +1,15 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - { "Header": { "ProjectID": "${projectRP}" }, "ID": { + "RefDate": { + "AuthorTimeZone": "${time_zone_rfx}", + "DateTime": "${HUadded_packing_datetime}" + }, "RefID": "${despatched_ipg.hd_number}" }, From cfb8e2ab5ac20e735d7506db64ceb1a11840deba Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Mar 2024 11:21:10 +0100 Subject: [PATCH 89/91] modifs HUadded --- 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 64be3ad..2d5d7e0 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#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_line2.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> + <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> { "Header": { "ProjectID": "${projectRP}" From eca09f2e9ebda72d51624b848f4943b1884be3c0 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 26 Mar 2024 11:46:09 +0100 Subject: [PATCH 90/91] Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into SCPN1-6203 --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 -- 1 file changed, 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index ac496b5..38ec8a0 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -1,6 +1,4 @@ <#include "HfRpConfig.ftl"> -<#include "ReflexUtils.ftl"> - [ <#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> From d060d3eb101220d0c1fc860d6fa737aa9985c13f Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 27 Mar 2024 15:03:49 +0100 Subject: [PATCH 91/91] Release 1.2.15+4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 501ed67..06fd79e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+3 +1.2.15+4