From b209e8b5e1ecd838fc609b992c7edd5c9f91694a Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 24 Oct 2023 08:22:11 +0200 Subject: [PATCH 001/147] release 1.2.4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9d7c109..e8ea05d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.3.0-SNAPSHOT +1.2.4 From 04ec57377a567b98f1073e86d0a409f8e07cb431 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 24 Oct 2023 16:47:19 +0200 Subject: [PATCH 002/147] Release 1.2.5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e8ea05d..c813fe1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.4 +1.2.5 From a544f6700d7a39534bab290b83868ebb37cc228b Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 3 Nov 2023 09:23:43 +0100 Subject: [PATCH 003/147] Release 1.2.6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c813fe1..3c43790 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.5 +1.2.6 From 6270992346b38151833d942bd619b25f8033446b Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Thu, 23 Nov 2023 10:02:38 +0100 Subject: [PATCH 004/147] Release 1.2.6+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3c43790..cc013e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6 +1.2.6+1 From e02218f7b1ec936f97053afdb88887d71feef43e Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 1 Dec 2023 14:23:58 +0100 Subject: [PATCH 005/147] Release 1.2.6+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cc013e2..2f0fe93 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6+1 +1.2.6+2 From 80aecb3aa7f6aaa02b76b72cc63e5217789b84d5 Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Fri, 1 Dec 2023 13:27:11 +0000 Subject: [PATCH 006/147] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2f0fe93..cc013e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6+2 +1.2.6+1 From b4ea1e779866154da717c7ad223115247772d056 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 1 Dec 2023 14:29:46 +0100 Subject: [PATCH 007/147] Release 1.2.7+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cc013e2..ada06a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6+1 +1.2.7+1 From 3bcdec1d5d805d88917296be98c68a006cd92e7d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 16:57:25 +0100 Subject: [PATCH 008/147] Modif alignement champs techniques Reflex HsrPro 2011231657 --- RFXtoRP_HsrPro.ftl | 8 +-- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 54 +++++++++---------- ...o_ExecutionflowDetected_HeaderMetadata.ftl | 2 +- ...ExecutionflowDetected_SegmentationKeys.ftl | 6 +-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 089092a..6f1864b 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -14,14 +14,14 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign order = JsonUtil.jsonToMap(dataRfx)> + <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ { <#-- check preparation type code (internal order and reservation are ignored) --> - <#if order.preparation_type_code == "010" || order.preparation_type_code == "030"> + <#if preparation_order.preparation_type_code == "010" || order.preparation_type_code == "030"> <#-- Only if preparation order not confirmed --> - <#if order.preparation_order_confirmed == "false" > + <#if preparation_order.preparation_order_confirmed == "false" > <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : @@ -41,7 +41,7 @@ <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign order = JsonUtil.jsonToMap(dataRfx)> + <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index bac9ea4..bb28371 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${order.originator_reference}", + "RefID": "${preparation_order.originator_reference}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 353d997..3b3f258 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -2,13 +2,13 @@ <#include "ReflexUtils.ftl"> [ { - <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(order.planned_final_delivery_start_datetime,time_zone_offset_rfx) /> - <#assign pro_creation_datetime = RfxDateTimetoUTC(order.creation_datetime,time_zone_offset_rfx) /> + <#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}" }, "ID": { - "RefID": "${order.originator_reference}", + "RefID": "${preparation_order.originator_reference}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -23,45 +23,45 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, "ShipFrom": { - "ActorID": "${order.physical_depot_code}" + "ActorID": "${preparation_order.physical_depot_code}" }, "ShipFromAcked": true, "ShipTo": { - <#if order.address.type_code == "" && order.address.title_code == "" && order.address.first_name == "" && order.address.last_name == "" && order.address.mail_address == "" && order.address.contact_type_code == "" && order.address.mobile_phone_number == "" && order.address.land_line_phone_number == "" && order.address.fax_number == "" && order.address.address_type_code == "" && order.address.name_or_company_name == "" && order.address.additional_address_data_1 == "" && order.address.additional_address_data_2 == "" && order.address.post_code_area_name == "" && order.address.territorial_division_code == "" && order.address.postal_code == "" && order.address.iso_country_code == ""> - "ActorID": "${order.end_consignee_code}" + <#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 == ""> + "ActorID": "${preparation_order.end_consignee_code}" <#else> "Actor": { - "Name" : "${order.address.name_or_company_name!""}", + "Name" : "${preparation_order.address.name_or_company_name!""}", "Address" : { - "City" : "${order.address.post_code_area_name!""}", - "CountryCode" : "${order.address.iso_country_code!""}", - "PostalCode" : "${order.address.postal_code!""}", - "StreetAddressOne" : "${order.address.street_and_number_and_po_box!""}", - "StreetAddressTwo" : "${order.address.additional_address_data_1!""}", - "StreetAddressThree" : "${order.address.additional_address_data_2!""}" + "City" : "${preparation_order.address.post_code_area_name!""}", + "CountryCode" : "${preparation_order.address.iso_country_code!""}", + "PostalCode" : "${preparation_order.address.postal_code!""}", + "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box!""}", + "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1!""}", + "StreetAddressThree" : "${preparation_order.address.additional_address_data_2!""}" } }, "Contact" : { - "FirstName" : "${order.address.first_name!""}", - "LastName" : "${order.address.last_name!""}", - "Emails" : ["${order.address.mail_address!""}"], - "Phones" : ["${order.address.mobile_phone_number!""}","${order.address.land_line_phone_number!""}", "${order.address.fax_number!""}" ] + "FirstName" : "${preparation_order.address.first_name!""}", + "LastName" : "${preparation_order.address.last_name!""}", + "Emails" : ["${preparation_order.address.mail_address!""}"], + "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ] } }, - <#if order.line_list??> + <#if preparation_order_line_list??> "Lines" : [ - <#list order.line_list as line> + <#list preparation_order_line_list > { - <#if (line.originator_reference_line_number!0) != 0> - "LineID": "${line.originator_reference_line_number}", + <#if (preparation_order_line_list.originator_reference_line_number!0) != 0> + "LineID": "${preparation_order_line_list.originator_reference_line_number}", <#else> - "LineID": "${line.preparation_order_line_number!0}", + "LineID": "${preparation_order_line_list.preparation_order_line_number!0}", <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">, @@ -70,10 +70,10 @@ { "Goods": { - "ItemID": "${line.item_code!"0"}", - "LVBranchID": "${line.item_lv_code!"0"}", - <#if (line.optional_attributes.forced_priority_date?length != 0) && (line.optional_attributes.forced_priority_date?starts_with("00") == false)> - <#assign forced_priority_date = line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> + "ItemID": "${preparation_order_line_list.item_code!"0"}", + "LVBranchID": "${preparation_order_line_list.item_lv_code!"0"}", + <#if (preparation_order_line_list.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line_list.optional_attributes.forced_priority_date?starts_with("00") == false)> + <#assign forced_priority_date = preparation_order_line_list.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${forced_priority_date}", @@ -84,7 +84,7 @@ "Quantity" : { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${line.base_lv_quantity_to_prepare!0}" + "Value": "${preparation_order_line_list.base_lv_quantity_to_prepare!0}" } } }<#sep>, diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl index 125bbd5..64a37f6 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl @@ -5,7 +5,7 @@ "MetaData": [ { "Key": "OrderType", - "Value": { "String" : "${order.optional_attributes.reason_code}"} + "Value": { "String" : "${preparation_order.optional_attributes.reason_code}"} } ], --> diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl index 5c9da3d..818abbd 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl @@ -4,18 +4,18 @@ "SegmentationKeys": [ { "Key": "Grade", - "Value": { "String" : "${line.grade_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line_list.grade_code_to_prepare}"} }, { "Key": "Owner", - "Value": { "String" : "${line.owner_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line_list.owner_code_to_prepare}"} }, { "Key": "BatchNumber", <#if reflexMvtStockInterface.batch_1 == ""> "Value": { "String" : "no batch"} <#else> - "Value": { "String" : "${line.batch_1}"} + "Value": { "String" : "${preparation_order_line_list.batch_1}"} } ] From d09fa33577e6643fe608b5d28ef6e95efb4a3407 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 17:20:54 +0100 Subject: [PATCH 009/147] Modif 2011231720 HsrPro --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 20 +++++++++---------- ...ExecutionflowDetected_SegmentationKeys.ftl | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 3b3f258..44022e4 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -54,14 +54,14 @@ }, - <#if preparation_order_line_list??> + <#if preparation_order.line_list??> "Lines" : [ - <#list preparation_order_line_list > + <#list preparation_order.line_list as preparation_order_line > { - <#if (preparation_order_line_list.originator_reference_line_number!0) != 0> - "LineID": "${preparation_order_line_list.originator_reference_line_number}", + <#if (preparation_order_line.originator_reference_line_number!0) != 0> + "LineID": "${preparation_order_line.originator_reference_line_number}", <#else> - "LineID": "${preparation_order_line_list.preparation_order_line_number!0}", + "LineID": "${preparation_order_line.preparation_order_line_number!0}", <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">, @@ -70,10 +70,10 @@ { "Goods": { - "ItemID": "${preparation_order_line_list.item_code!"0"}", - "LVBranchID": "${preparation_order_line_list.item_lv_code!"0"}", - <#if (preparation_order_line_list.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line_list.optional_attributes.forced_priority_date?starts_with("00") == false)> - <#assign forced_priority_date = preparation_order_line_list.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> + "ItemID": "${preparation_order_line.item_code!"0"}", + "LVBranchID": "${preparation_order_line.item_lv_code!"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}", @@ -84,7 +84,7 @@ "Quantity" : { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${preparation_order_line_list.base_lv_quantity_to_prepare!0}" + "Value": "${preparation_order_line.base_lv_quantity_to_prepare!0}" } } }<#sep>, diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl index 818abbd..8cb3286 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl @@ -4,18 +4,18 @@ "SegmentationKeys": [ { "Key": "Grade", - "Value": { "String" : "${preparation_order_line_list.grade_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line.grade_code_to_prepare}"} }, { "Key": "Owner", - "Value": { "String" : "${preparation_order_line_list.owner_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line.owner_code_to_prepare}"} }, { "Key": "BatchNumber", <#if reflexMvtStockInterface.batch_1 == ""> "Value": { "String" : "no batch"} <#else> - "Value": { "String" : "${preparation_order_line_list.batch_1}"} + "Value": { "String" : "${preparation_order_line.batch_1}"} } ] From 957df514870ffd4e200c3280b5c674b3e53c193e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:43:53 +0100 Subject: [PATCH 010/147] Modifs FTL 2211231443 --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 17 ++++++++++------- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 16 ++++++++-------- RPtoRFX_PrepOrder.ftl | 4 ++-- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index d581b2e..fd16db5 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -22,7 +22,7 @@ "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}", @@ -35,16 +35,19 @@ <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${carrier.address.company_name?json_string}", - "StreetAddressOne" : "${carrier.address.address_1?json_string}", - "StreetAddressTwo" : "${carrier.address.address_2?json_string}", - "StreetAddressThree" : "${carrier.address.address_3?json_string}" + <#if carrier.address??> + "Name": "${carrier.address.company_name?json_string}", + "StreetAddressOne" : "${carrier.address.address_1?json_string}", + "StreetAddressTwo" : "${carrier.address.address_2?json_string}", + "StreetAddressThree" : "${carrier.address.address_3?json_string}" + }, - - "Phones": ["${carrier.address.telephone?json_string}", + <#if carrier.address??> + "Phones": ["${carrier.address.telephone?json_string}", "${carrier.address.other_number?json_string}" ], + "Typology": "TYPOLOGY_CARRIER" } } diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 1735316..754b2d2 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -43,7 +43,7 @@ "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}", - "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference}", + "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}", diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 44022e4..8ccf98a 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -32,22 +32,22 @@ <#else> "Actor": { - "Name" : "${preparation_order.address.name_or_company_name!""}", + "Name" : "${preparation_order.address.name_or_company_name?json_string!""}", "Address" : { - "City" : "${preparation_order.address.post_code_area_name!""}", + "City" : "${preparation_order.address.post_code_area_name?json_string!""}", "CountryCode" : "${preparation_order.address.iso_country_code!""}", "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box!""}", - "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1!""}", - "StreetAddressThree" : "${preparation_order.address.additional_address_data_2!""}" + "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}", + "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}", + "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" } }, "Contact" : { - "FirstName" : "${preparation_order.address.first_name!""}", - "LastName" : "${preparation_order.address.last_name!""}", - "Emails" : ["${preparation_order.address.mail_address!""}"], + "FirstName" : "${preparation_order.address.first_name?json_string!""}", + "LastName" : "${preparation_order.address.last_name?json_string!""}", + "Emails" : ["${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!""}" ] } diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index f55bfbb..735abba 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -35,8 +35,8 @@ }, <#if executionflow.ShipTo.ActorID == ""> "address": { - "first_name": "${executionflow.ShipTo.Contact.FirstName!""}", - "last_name" :"${executionflow.ShipTo.Contact.Lastname!""}", + "first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}", + "last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}", "mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}", "mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}", "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}", From 2409cf3a01ffd69a7de1632f6cc44798c0e028ad Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:59:25 +0100 Subject: [PATCH 011/147] Modif FTL 2211231459 --- RFXtoRP_HsaCons_ActorCreated.ftl | 18 ++++++++++-------- RFXtoRP_HsaSup_ActorCreated.ftl | 18 +++++++++++------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 8f09d9c..06bc6c2 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -35,18 +35,20 @@ <#-- if Reflex WMS is not structured --> <#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}" - + "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}" + }, - - "Phones": ["${actor.address.telephone?json_string}", + <#if actor.address?? > + "Phones": ["${actor.address.telephone?json_string}", "${actor.address.other_number?json_string}" - ], + ], + "Typology": "TYPOLOGY_UNKNOWN" } } diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index a4e5d12..5a219ad 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -34,16 +34,20 @@ <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${actor.optional_attributes.company_name?json_string}", - "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", - "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", - "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" + <#if actor.optional_attributes?? > + "Name": "${actor.optional_attributes.company_name?json_string}", + "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", + "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", + "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" + }, - "Phones": ["${actor.optional_attributes.telephone?json_string}", - "${actor.optional_attributes.other_number?json_string}" - ], + <#if actor.optional_attributes?? > + "Phones": ["${actor.optional_attributes.telephone?json_string}", + "${actor.optional_attributes.other_number?json_string}" + ], + "Typology": "TYPOLOGY_UNKNOWN" } } From b5c85220b51014ee0f98e0535d972511705235d8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 16:45:11 +0100 Subject: [PATCH 012/147] Modifs FTL 2211231645 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 043fa12..926bc9b 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -68,7 +68,11 @@ <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}", - "LineID": "${preparation_line.pro_line_number}", + <#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}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", From 270f90a9b3494a6c3c927b65ad4cacbc470fe7bf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 1 Dec 2023 10:20:01 +0100 Subject: [PATCH 013/147] Modif HsrPrepa 0112231019 --- RFXtoRP_HsaProStatus.ftl | 2 +- RFXtoRP_HsrPrepa.ftl | 72 +++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 63f96df..2a1aa97 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ - <#--**Pick batch runned (100) **--> + <#--**Pick batch runned (200) **--> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index f365bc0..2d5075d 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -2,57 +2,59 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> - + <#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)> - [ +<#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 apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> + <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl"> }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.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"> - } - - + <#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"> + } + + - ] - <#break> - - <#case "D"> - <#-- *********************************************** Action = DELETE ******************** --> - <#stop "event not supported (Case D)"> - <#break> - - - <#default> - <#stop "event not supported"> - + ] +<#else> + <#stop "no confirmed quantity for the preparation - preparation closed"> + + +<#break> +<#case "D"> +<#-- *********************************************** Action = DELETE ******************** --> +<#stop "event not supported (Case D)"> +<#break> +<#default> +<#stop "event not supported"> + \ No newline at end of file From 64e03640d1fad340ede2538a02e828ff6c58bf08 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 1 Dec 2023 16:06:45 +0100 Subject: [PATCH 014/147] Release 1.2.7+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ada06a7..745444b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.7+1 +1.2.7+2 From 30ae93b9e78f8d6685544846984da2fd9fcdece0 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Wed, 6 Dec 2023 15:48:59 +0100 Subject: [PATCH 015/147] Release 1.2.8+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 745444b..022925e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.7+2 +1.2.8+1 From d2d9443fc79f04de95d666e8ff7c0ebf85714b03 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 3 Jan 2024 13:32:45 +0100 Subject: [PATCH 016/147] bug SCPN1-5632 --- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index bb28371..d933eed 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(order.modification_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) /> [ { "Header": { From a882ac4b868cc2c8f49db37017bb2ba8903f3ac4 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 3 Jan 2024 14:42:40 +0100 Subject: [PATCH 017/147] Release 1.2.8+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 022925e..9f0c837 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.8+1 +1.2.8+2 From fc8290648ff92190efffded47df61c38aafafc92 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 10 Jan 2024 10:40:42 +0100 Subject: [PATCH 018/147] Release 1.2.9+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9f0c837..63153f2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.8+2 +1.2.9+1 From fd1cfcc2c52af3d874546b89859e12b9fa12970d Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 17 Jan 2024 10:00:31 +0100 Subject: [PATCH 019/147] SCPN1-5711 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 11 +++++------ ReflexUtils.ftl | 2 ++ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 926bc9b..6ad9c0b 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -33,29 +33,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 /> + <#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/ReflexUtils.ftl b/ReflexUtils.ftl index d1e2569..bc58619 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -15,12 +15,14 @@ <#function splitEmailsIntoArray emails > <#local str = "["> <#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 b369dd8adf8c94bb8ea139f52ed65d3de1ba3b26 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 17 Jan 2024 09:48:01 +0100 Subject: [PATCH 020/147] Modifs RPtoRFX 1701240947 (cherry picked from commit ca30958d350503a9923f26ca5e2baa05c06c5313) --- 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 737763dc7f0c4be067922b0dbf0c16af52b500bb Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 17 Jan 2024 10:16:31 +0100 Subject: [PATCH 021/147] Release 1.2.10+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 63153f2..fa55ef4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.9+1 +1.2.10+1 From 60355d1ba5f61acb21108e1674d4eb28613b7ac7 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 17 Jan 2024 13:47:38 +0100 Subject: [PATCH 022/147] SCPN1-5711 --- 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 6ad9c0b..257afcf 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -61,7 +61,8 @@ - + + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> From de5e94be3c8443e665347caf7b2285673bdc6985 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 17 Jan 2024 13:58:26 +0100 Subject: [PATCH 023/147] Release 1.2.1+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fa55ef4..2497bc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.10+1 +1.2.1+1 From 5688244be2a614acf8ac4b634d7cf16f11a974a8 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Wed, 17 Jan 2024 13:34:06 +0000 Subject: [PATCH 024/147] Update VERSION to roolback to 1.2.10+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2497bc4..fa55ef4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.1+1 +1.2.10+1 From c4910785e076e668b6a877cbc526613d244c0738 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 17 Jan 2024 15:29:36 +0100 Subject: [PATCH 025/147] Release 1.2.10+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fa55ef4..aa7d123 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.10+1 +1.2.10+2 From bb4315bba164f5b2da7e7b391da22602de770c48 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 19 Jan 2024 15:51:08 +0100 Subject: [PATCH 026/147] SCPN1-5764 --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 4 +++- RFXtoRP_HsaIpgMove.ftl | 4 ++-- 2 files changed, 5 insertions(+), 3 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> From 162b73e75f7c739ec837edaf02e5f30cd751cc6f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 23 Jan 2024 10:50:44 +0100 Subject: [PATCH 027/147] Modifs RPtoRFX 2301241050 (cherry picked from commit 56cd76fe0e00f7321e611aa42d2b4e863efce7dd) --- 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 3a9620e3ee34428e587b1b199fa542d2d0109a85 Mon Sep 17 00:00:00 2001 From: freat Date: Fri, 26 Jan 2024 10:56:09 +0100 Subject: [PATCH 028/147] Release 1.2.2+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aa7d123..626bc1d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.10+2 +1.2.2+1 From 884ad540fe7848a85a3109f71db0833a047feb5d Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Fri, 26 Jan 2024 10:02:42 +0000 Subject: [PATCH 029/147] Update VERSION to roolback to 1.2.10+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 626bc1d..aa7d123 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.2+1 +1.2.10+2 From a512e4c23abddda69483820814634f955ddc672a Mon Sep 17 00:00:00 2001 From: freat Date: Fri, 26 Jan 2024 11:15:57 +0100 Subject: [PATCH 030/147] Release 1.2.11+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aa7d123..e6d0d9b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.10+2 +1.2.11+1 From 892812e85e995fe9476efaaa07048d669952bdbd Mon Sep 17 00:00:00 2001 From: freat Date: Fri, 16 Feb 2024 11:51:17 +0100 Subject: [PATCH 031/147] Release 1.2.12+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e6d0d9b..399acb1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.11+1 +1.2.12+1 From fba36b5d77a5068d686182ca664cb8f9f953bf62 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 29 Feb 2024 14:16:53 +0100 Subject: [PATCH 032/147] SCPN1-6093 --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 2 +- RFXtoRP_HfExpGrpList.ftl | 2 +- RFXtoRP_HfLvTypeList.ftl | 2 ++ RFXtoRP_HsaCarrier_ActorCreated.ftl | 2 +- RFXtoRP_HsaCarrier_ActorDeleted.ftl | 2 +- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- RFXtoRP_HsaCons_ActorDeleted.ftl | 2 +- RFXtoRP_HsaIpgMove.ftl | 5 ++--- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 14 +++++++++----- RFXtoRP_HsaIpgMove_StockMoved.ftl | 10 +++++----- RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl | 2 +- RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl | 12 ++++++------ RFXtoRP_HsaItm_ItemCreated.ftl | 12 ++++++------ RFXtoRP_HsaItm_ItemDeleted.ftl | 2 +- RFXtoRP_HsaProStatus.ftl | 3 +-- 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.ftl | 2 +- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 10 +++++----- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 2 +- RFXtoRP_HsrPro.ftl | 7 +++++-- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 12 ++++++------ RFXtoRP_HsrReceiptList.ftl | 5 ++++- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 14 +++++++------- RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- ReflexUtils.ftl | 3 +-- 36 files changed, 82 insertions(+), 73 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index a5d738b..8ea6c58 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -22,7 +22,7 @@ }, "Goods": { - "ItemID": "${stock.item_code}", + "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_HfExpGrpList.ftl b/RFXtoRP_HfExpGrpList.ftl index 08e4a69..64cf79d 100644 --- a/RFXtoRP_HfExpGrpList.ftl +++ b/RFXtoRP_HfExpGrpList.ftl @@ -24,5 +24,5 @@ ${output} <#break> <#default> - <#stop> + <#stop > diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl index 2f03386..e1e6399 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -9,7 +9,9 @@ <#case "C"> <#case "U"> <#case "D"> + <#stop "no generic FTL file available yet for LV types"> + <#break> diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index fd16db5..6f7ba3e 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code}" + "RefID": "${carrier.carrier_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index bc5f838..b3aed7c 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code}" + "RefID": "${carrier.carrier_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 06bc6c2..3b22fc6 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index abce0a0..1a3a3ff 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 7715ea3..44fc2aa 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -49,17 +49,16 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> - } ] <#else> <#-- Case of IPG move type volontarilly ignored--> - <#stop "Move type not supported"> + <#stop> <#else> <#-- cases of an IPG move with quantity = 0 (weight modification)--> - <#stop "move ignored quantity = 0"> + <#stop> <#break> diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 3b60527..5131883 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,16 +18,20 @@ "AuthorTimeZone": "${time_zone_rfx}" }, "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code}", - "LVBranchID": "${reflexMvtStockInterface.lv_code}", + "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", + "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", "PriorityDate": "${priority_date}", <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference}", + <#if reflexMvtStockInterface.receipt_reference!=""> + "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}", + "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 754b2d2..3b09764 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -23,26 +23,26 @@ }, "Payload": { "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code}", + "ItemID": "${reflexMvtStockInterface.item_code?trim?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?trim?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}", diff --git a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl index 5c1c26e..9ac6882 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code}" + "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 1385a6e..5236207 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl @@ -5,19 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code}" + "RefID": "${lv.item_code?trim?json_string}" }, "Payload": { "LogisticVariants": [ { - "LVID": "${lv.logistical_variant_code}", - "Name" : "${lv.lv_type_code}", + "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>, ], @@ -29,7 +29,7 @@ "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}, diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index f38c95d..cb1585e 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -6,7 +6,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code}" + "RefID": "${item.item_code?trim?json_string}" }, "Payload": { "DescriptionsByLanguage": [{ @@ -32,15 +32,15 @@ <#list item.logistical_variant_list as logistical_variant> { - "LVID": "${logistical_variant.logistical_variant_code}", - "Name" : "${logistical_variant.lv_type_code}", + "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>, ], @@ -52,7 +52,7 @@ "IsBaseLogisticVariant": ${logistical_variant.base_lv}, <#if logistical_variant.base_lv != "true"> - "RefLV": "${logistical_variant.subpackaging_lv_code}", + "RefLV": "${logistical_variant.subpackaging_lv_code?json_string}", "QuantityInRefLV": ${logistical_variant.quantity_in_subpackaging_lv}, diff --git a/RFXtoRP_HsaItm_ItemDeleted.ftl b/RFXtoRP_HsaItm_ItemDeleted.ftl index 9250205..485ace1 100644 --- a/RFXtoRP_HsaItm_ItemDeleted.ftl +++ b/RFXtoRP_HsaItm_ItemDeleted.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code}" + "RefID": "${item.item_code?trim?json_string}" }, "Payload": {} } diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 2a1aa97..7fda3bb 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -61,8 +61,7 @@ <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl"> } <#else> - <#stop "Reflex WMS status not supported on Reflex Platform"> - + <#stop> diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index 847ec8a..73eb34b 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "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 110b7f6..3ca47e2 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "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 110b7f6..3ca47e2 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "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 110b7f6..3ca47e2 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "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 110b7f6..3ca47e2 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference}", + "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 5a219ad..bdb370f 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index 07f19fc..93475b7 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 07adb7e..516cc1f 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code}" + "RefID": "${depot.physical_depot_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsrDepot_ActorDeleted.ftl b/RFXtoRP_HsrDepot_ActorDeleted.ftl index 164f67e..0fcdcf7 100644 --- a/RFXtoRP_HsrDepot_ActorDeleted.ftl +++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code}" + "RefID": "${depot.physical_depot_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 2d5075d..598f8c6 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"> diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 257afcf..a7e1bb8 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -30,8 +30,8 @@ "PreparedContents" :[ { "Goods": { - "ItemID": "${preparation_line.item_code}", - "LVBranchID": "${preparation_line.item_lv_code}", + "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 /> "PriorityDate": "${priority_date}", @@ -56,7 +56,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", @@ -67,13 +67,13 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}", + "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}", + "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_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index dd55a18..d936618 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id}" + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 6f1864b..988c6e9 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -17,9 +17,9 @@ <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ { + <#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> @@ -33,6 +33,9 @@ <#else> <#stop "preparation order type not supported"> + <#else> + <#stop "PRO reference is empty"> + } ] diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index d933eed..9f439cc 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference}", + "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 00a2f46..dba5e0c 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference}", + "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}", + "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}", --> "ShipFrom": { - "ActorID": "${preparation_order.physical_depot_code}" + "ActorID": "${preparation_order.physical_depot_code?trim?json_string}" }, "ShipFromAcked": true, "ShipTo": { @@ -68,7 +68,7 @@ "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!""}" ] + "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!""}" ] } }, @@ -89,8 +89,8 @@ { "Goods": { - "ItemID": "${preparation_order_line.item_code!"0"}", - "LVBranchID": "${preparation_order_line.item_lv_code!"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 /> "PriorityDate": "${forced_priority_date}", diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 4932a33..0425c73 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,7 @@ <#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> @@ -36,6 +36,9 @@ } ] + <#else> + <#stop "Receipt reference is empty"> + <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index e294ccf..df69a85 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "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 477456f..715d181 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?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -25,16 +25,16 @@ "ShipFrom": { - "ActorID": "${receipt.original_code}" + "ActorID": "${receipt.original_code?trim?json_string}" }, "ShipTo" : { - "ActorID": "${receipt.physical_depot_code}" + "ActorID": "${receipt.physical_depot_code?trim?json_string}" }, "ShipToAcked": true, <#if receipt.carrier_informations.carrier_code != ""> - "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, + "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"}, @@ -49,15 +49,15 @@ { "Goods": { - "ItemID": "${line.item_code!"0"}", - "LVBranchID": "${line.item_lv_code!"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)> <#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"> diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl index 3d36bb1..1c87c12 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "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 823866d..8588fa5 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index bc58619..24d10e7 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -10,11 +10,10 @@ <#-- 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 += ","> From 319cb6cc513b24cd748254713cb8cde8a997d9b5 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 29 Feb 2024 14:51:31 +0100 Subject: [PATCH 033/147] Release 1.2.12+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 399acb1..5c35724 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.12+1 +1.2.12+2 From c95bdc7f005bfff238b8eab78f18d2cb09930b3f Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 29 Feb 2024 15:32:01 +0100 Subject: [PATCH 034/147] SCPN1-6093 --- RFXtoRP_HsaProStatus.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 7fda3bb..25fae1c 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -62,6 +62,7 @@ } <#else> <#stop> + From 3365a940982fbed3d6879ad4f139dbc416d4e6f5 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 29 Feb 2024 15:35:54 +0100 Subject: [PATCH 035/147] Release 1.2.12+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5c35724..5cf5cba 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.12+2 +1.2.12+3 From fc919c21999a2e0a80d4e949301d94d7ca03c2ec Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Mon, 11 Mar 2024 16:13:48 +0100 Subject: [PATCH 036/147] 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 fb8f9ca6511f5891bf67bc49228d3c06005f9045 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 12 Mar 2024 09:31:26 +0100 Subject: [PATCH 037/147] 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 038/147] 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 039/147] 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 040/147] 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 6b633663e9211b688a465d7b1ff043dc39585a69 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 19 Mar 2024 16:50:50 +0100 Subject: [PATCH 041/147] 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 9cdcd2784d0fa6f24627b4d707c86728558d8cef Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 21 Mar 2024 09:38:35 +0100 Subject: [PATCH 042/147] 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 6f287e878a231b82f4859ca01b0454dc71a3afc6 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 21 Mar 2024 17:39:10 +0100 Subject: [PATCH 043/147] 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 d060d3eb101220d0c1fc860d6fa737aa9985c13f Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 27 Mar 2024 15:03:49 +0100 Subject: [PATCH 044/147] 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 From 2588fda3a8d4cf360698ae81e070e94e07af8681 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 9 Apr 2024 16:53:34 +0200 Subject: [PATCH 045/147] modifs ipg (cherry picked from commit 87efb21e644cdc630786b239e7b26f6d0fbe4518) --- ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 60 +++++++++---------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 38ec8a0..df6cf3b 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -1,8 +1,8 @@ <#include "HfRpConfig.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> - <#assign packing_datetime = RfxDateTimetoUTC(preparation_line2.confirmation_datetime,time_zone_offset_rfx) /> + <#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}" @@ -12,19 +12,19 @@ "AuthorTimeZone": "${time_zone_rfx}", "DateTime": "${packing_datetime}" }, - <#if despatched_ipg2.carton_number != "000000000000000000"> - "RefID": "${despatched_ipg2.carton_number}" + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID": "${despatched_ipg.carton_number}" <#else> - "RefID": "${despatched_ipg2.hd_number}" + "RefID": "${despatched_ipg.hd_number}" }, "Payload": { "Information" :{ - <#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> + <#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}", @@ -45,9 +45,9 @@ <#else> - "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> + "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}", @@ -72,26 +72,26 @@ "PreparedContents" :[ { "Goods": { - "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 /> + "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 /> "PriorityDate": "${priority_date}", <#else> - <#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 /> + <#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_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 /> + <#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_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 /> + <#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_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 /> + <#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)> @@ -109,16 +109,16 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "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}", + "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_line2.pro_line_number!0}", + "LineID": "${preparation_line.pro_line_number!0}", "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": ${despatched_ipg2.quantity_lvs} + "Value": ${despatched_ipg.quantity_lvs} } } From 46a9dc89968104762dca6256420497d8c644c9a8 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 9 Apr 2024 17:45:00 +0200 Subject: [PATCH 046/147] Release 1.2.15+5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 06fd79e..aaaf71e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+4 +1.2.15+5 From 0a32ead29a3090251d3851697ad9c4a36f433c6b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 10 Apr 2024 16:25:27 +0200 Subject: [PATCH 047/147] modifs hsrpro (cherry picked from commit d7c9c72762ccf42d2db2c62c0e8827340ea66ed4) --- RFXtoRP_HsrPro.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index cfa3721..3258db3 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -16,16 +16,18 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ - { + <#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" || preparation_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"> @@ -36,7 +38,7 @@ <#else> <#stop "PRO reference is empty"> - } + ] <#break> @@ -46,18 +48,16 @@ <#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 22b78b4ffe89bee0ef45f0ebbabe9ae3e085d293 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 10 Apr 2024 16:57:58 +0200 Subject: [PATCH 048/147] Release 1.2.15+6 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aaaf71e..851b5bb 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+5 +1.2.15+6 From cff0f18d8a6e5843fe0ba5f6b8c1d1336060f6a1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 11 Apr 2024 11:01:05 +0200 Subject: [PATCH 049/147] modifs ipgmove (cherry picked from commit 6b6cef5332f47dbe93445eacce63d7fa70b723aa) --- RFXtoRP_HsaIpgMove.ftl | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index c1a22d7..4a98824 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -14,8 +14,7 @@ <#-- 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 --> + <#-- IPG moves translated into Stock moves --> <#if reflexMvtStockInterface.ipg_move_type == "130" || reflexMvtStockInterface.ipg_move_type == "200" || reflexMvtStockInterface.ipg_move_type == "210" || @@ -41,22 +40,22 @@ <#-- IPG moves translated into goods received (all type of receipt) --> <#if (reflexMvtStockInterface.ipg_move_type == "100" || reflexMvtStockInterface.ipg_move_type == "110" || - reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> - } - ] + reflexMvtStockInterface.ipg_move_type == "120") > + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> + } + ] + <#else> + <#-- Case of IPG move type volontarilly ignored--> + <#stop " Reference receipt is empty"> + <#else> - <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> - <#-- Case of IPG move type volontarilly ignored--> - <#stop " Reference receipt is empty"> - <#else> - <#stop> - + <#stop> <#else> From 37a5e64e83d1d6af52d5b6021ab3b698587810c7 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 11 Apr 2024 11:22:18 +0200 Subject: [PATCH 050/147] Release 1.2.15+7 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 851b5bb..2a4c332 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+6 +1.2.15+7 From 6809b3241097392580a85424a90f97275796f1cf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 24 Apr 2024 15:09:45 +0200 Subject: [PATCH 051/147] =?UTF-8?q?Cr=C3=A9ation=20de=20commande?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 82dfc05cdb4693cd26bc03d86150ca6c7db95635) --- RPtoRFX_PrepOrder.ftl | 114 ++++++++++++++---------- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 20 ++++- 2 files changed, 86 insertions(+), 48 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index a887482..3d272fb 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -1,4 +1,18 @@ <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl"> +<#-- Valeurs par défaut Adresse --> +<#-- Default values --> +<#assign typecode ="010"> +<#assign titlecode ="1"> +<#assign contacttypecode ="010"> +<#assign adresstypecode ="010"> +<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans Reflex WMS pour utiliser cette fonctionnalité --> +<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature --> +<#assign defaultactor ="VIZ"> +<#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!=""> + <#assign actorID = executionflow.ShipTo.ActorID > +<#else> + <#assign actorID = defaultactor > + { "id" : {"refid" : "${executionflow.OrderID}"}, @@ -9,15 +23,15 @@ "physical_depot_code": "${executionflow.ShipFrom.ActorID}", "originator_code": "${originator_code}" }, - "payload" : + "payload" : { "originator_reference": "${executionflow.OrderID}", "preparation_type_code": "${preparation_type_code}", - "end_consignee_code": "${executionflow.ShipTo.ActorID!""}", - <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> - "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", + "end_consignee_code": "${actorID}", + <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> + "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> - "requested_delivery_start_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", + "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}", @@ -31,52 +45,62 @@ "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" }, - <#if executionflow.ShipTo.ActorID == ""> - "address": { + <#if actorID == defaultactor > + "address": { + "type_code": "${typecode}", + "title_code" : "${titlecode}", + "contact_type_code" : "${contacttypecode}", + "address_type_code" : "${adresstypecode}", "first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}", - "last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}", - "mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}", - "mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}", + "last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}", + "name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}", + <#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!=""> + "mail_address": "${executionflow.ShipTo.Contact.Emails[0]}", + + <#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!=""> + "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}", + "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}", "additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}", "additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}", "postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}", + "post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}", "iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}" - }, + }, - <#if executionflow.Lines??> - "line_list": [ - <#list executionflow.Lines as line> - <#-- ******* line MetaData and Segmentationkeys to maps ******** --> - <#if line.MetaData??> - <#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") /> - - <#if line.RequestedContent.Goods.SegmentationKeys??> - <#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") /> - - <#include "RPtoRFX_PrepOrder_DefaultLineData.ftl"> - { - "originator_reference_line_number": ${line.LineID?number}, - "item_code": "${line.RequestedContent.Goods.ItemID!""}", - "item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}", - "base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, - "owner_code_to_prepare" :"${owner_code_to_prepare}", - "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" - --> - - }<#sep>, - - - ] + <#if executionflow.Lines??> + "line_list": [ + <#list executionflow.Lines as line> + <#-- ******* line MetaData and Segmentationkeys to maps ******** --> + <#if line.MetaData??> + <#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") /> + + <#if line.RequestedContent.Goods.SegmentationKeys??> + <#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") /> + + <#include "RPtoRFX_PrepOrder_DefaultLineData.ftl"> + { + "originator_reference_line_number": ${line.LineID?number}, + "item_code": "${line.RequestedContent.Goods.ItemID!""}", + "item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}", + "base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, + "owner_code_to_prepare" :"${owner_code_to_prepare}", + "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" + --> + + } + <#sep>, + + + ] } } - \ No newline at end of file diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index 7055d66..6d51468 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -1,7 +1,7 @@ <#-- Note : you can use Order Header Metadata, using the define map : Header_MetaData_Map --> <#-- How to use MD Header map - Example : + Example : <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/> If your MD is : @@ -23,8 +23,22 @@ <#assign protected_flag ="false"/> <#assign automatic_generation_flag ="false"/> <#assign apt_with_end_consignee_flag="false"/> -<#assign load_grouping = "DEFAUT"/> - + +<#-- A supprimer si utilisation de la table de correspondance--> +<#--To be deleted if using the correspondence table--> +<#assign load_grouping = "default"> + + +<#-- Table de correspondance Transporteur/Code regroupement chargement, +affectation à un chargement si paramétrage regroupement chargement+plan de base distribution--> +<#--Carrier / Load Grouping Code Correspondence Table, +Assigning to a load if you set up Load Grouping+Distribution Master Plan--> +<#-- Example --> + <#--<#if executionflow.Carrier.ActorID == "TEST" > + <#assign load_grouping = "TEST"> + <#else> + <#assign load_grouping = "default"> + --> From c63e4ff5c88534855a1f2f6a5f4d967f7541bd98 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 24 Apr 2024 18:23:25 +0200 Subject: [PATCH 052/147] Release 1.2.15+8 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2a4c332..17b3207 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+7 +1.2.15+8 From 5948467818d39cc9b23628394f04adeadc6bb30e Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 2 May 2024 10:21:58 +0200 Subject: [PATCH 053/147] Release 1.2.16+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 17b3207..b871264 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.15+8 +1.2.16+1 From 4534155f2e63ddf654b3379ef2bb62352590c770 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 13 May 2024 16:00:46 +0200 Subject: [PATCH 054/147] modifs HUGP (cherry picked from commit b3da874dd390786e59025c040843f2f5c06cd772) --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index df6cf3b..1fcc404 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -24,7 +24,7 @@ <#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> + <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton> , "Length": { "Unit": "${length_unit_rfx}", @@ -47,7 +47,7 @@ <#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> + <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU> , "Length": { "Unit": "${length_unit_rfx}", From f62ccadba596a2a9eecd975d022a39e5a55cd11e Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 13 May 2024 17:07:22 +0200 Subject: [PATCH 055/147] Release 1.2.16+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b871264..1dc5306 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.16+1 +1.2.16+2 From 2e0d61310b243ae9ac2b2b85966d63c9479b4b8d Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 16 May 2024 17:00:32 +0200 Subject: [PATCH 056/147] SCPN1-6564 --- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 9 +++++---- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 2d5d7e0..0433ade 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -2,8 +2,11 @@ <#include "ReflexUtils.ftl"> [ <#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> +<#assign generatedComa = false> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> + + <#if generatedComa >, { "Header": { "ProjectID": "${projectRP}" @@ -16,10 +19,8 @@ } }, "Payload": { } - }<#sep>, + } + <#assign generatedComa = true> - <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 > - <#sep>, - ] diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index 968ed88..4102e1f 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -16,7 +16,7 @@ "Payload": { "IncludedHandlingunitIDs": [ "${despatched_ipg.carton_number}" ] - <#if preparation_line.despatched_hds_list?? > + <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??> , "Information": { "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", From 15bd095febecf0cbc7bfc43ef2e8d6589c2f5e6c Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 16 May 2024 17:55:49 +0200 Subject: [PATCH 057/147] Release 1.2.16+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1dc5306..274351b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.16+2 +1.2.16+3 From b0b4714df9af69d0c24b9021fe977a7ab3b56c12 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 30 May 2024 14:30:09 +0200 Subject: [PATCH 058/147] SCPN1-6641 --- RFXtoRP_HsrPrepa.ftl | 3 ++ RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 45 +++++++++++-------- ...rPrepa_HUsAdded_HandlingUnitDispatched.ftl | 37 ++++++++------- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 35 ++++++++------- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 35 +++++++++------ 5 files changed, 90 insertions(+), 65 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index ddb67e3..ba650af 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -25,6 +25,7 @@ <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl"> }, { + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : @@ -47,6 +48,7 @@ } + <#assign refIDHmap ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> @@ -76,6 +78,7 @@ + <#assign refIDHmap ={}> ] <#else> <#stop "no confirmed quantity for the preparation - preparation closed"> diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index b058352..ca87415 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -1,26 +1,33 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ + <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID":{ - "RefID": "${OrderOriginReference}" - }, - "Payload":{ - "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" + <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID":{ + "RefID": "${OrderOriginReference}" + }, + "Payload":{ + "Carrier": { + "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" + } + <#-- Add transport grade code + <#if preparationOrder.transport_grade_code!=""> + , + "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}" + --> } - <#-- Add transport grade code - <#if preparationOrder.transport_grade_code!=""> - , - "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}" - --> - } - } - <#sep>, - + } + + + <#assign refIDHmap_local ={}> ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 0433ade..1a780d5 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -2,25 +2,28 @@ <#include "ReflexUtils.ftl"> [ <#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> -<#assign generatedComa = false> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> - - <#if generatedComa >, - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${despatched_ipg3.carton_number}", - "RefDate": { - "DateTime": "${dispatched3_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { } - } - <#assign generatedComa = true> + <#if !refIDHmap[despatched_ipg3.carton_number]?? > + <#if refIDHmap?size != 0 > + , + + <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${despatched_ipg3.carton_number}", + "RefDate": { + "DateTime": "${dispatched3_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } + } + ] diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 22948cb..a1b31be 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -2,22 +2,27 @@ <#include "ReflexUtils.ftl"> [ <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> +<#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${despatched_ipg.hd_number}", - "RefDate": { - "DateTime": "${dispatched_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { } - }<#sep>, - - <#sep>, + <#if !refIDHmap_local[despatched_ipg.hd_number]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={despatched_ipg.hd_number,despatched_ipg.hd_number}> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${despatched_ipg.hd_number}", + "RefDate": { + "DateTime": "${dispatched_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } + } + + + <#assign refIDHmap_local ={}> ] diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 42b3f85..7a41e47 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -1,21 +1,28 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ + <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID":{ - "RefID": "${OrderOriginReference}" - }, - "Payload":{ - "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" + <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID":{ + "RefID": "${OrderOriginReference}" + }, + "Payload":{ + "Carrier": { + "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" + } } - } - } - <#sep>, - + } + + + <#assign refIDHmap_local ={}> ] \ No newline at end of file From e344cca043a3313d44f322f70938501037a4e5d3 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 30 May 2024 16:30:59 +0200 Subject: [PATCH 059/147] SCPN1-6642 --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 5919440..fe0cc5f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -51,13 +51,16 @@ { "ItemID": "${line.item_code?trim?json_string!"0"}", "LVBranchID": "${line.item_lv_code?json_string!"0"}", - <#if line.line_without_detail??> - <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)> + <#if (line.line_without_detail?? && 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}", - <#else> - <#stop > + <#if (line.line_detail?? && line.line_detail.priority_date?length != 0) && (line.line_detail.priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_detail_priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> From 011540fc517d38faaf0f5a90b1e4acac0dca62c2 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 30 May 2024 17:20:55 +0200 Subject: [PATCH 060/147] Release 1.2.16+4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 274351b..c67a927 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.16+3 +1.2.16+4 From 513a5c2c3e59ea83b2a772a38c0884878e1be929 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 6 Jun 2024 09:15:09 +0200 Subject: [PATCH 061/147] SCPN1-6692 (cherry picked from commit 2524859cd42c5e6a8de76806a30054f86650d1b8) --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index fe0cc5f..d941559 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -55,8 +55,8 @@ <#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> - <#if (line.line_detail?? && line.line_detail.priority_date?length != 0) && (line.line_detail.priority_date?starts_with("00") == false)> - <#assign line_detail_priority_date = line.line_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> + <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${line_detail_priority_date}", <#else> "PriorityDate": "1970-01-01T00:00:00Z", From 24a94caf29c74f0aabc92361641836f2c23f383b Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 6 Jun 2024 09:45:59 +0200 Subject: [PATCH 062/147] Release 1.2.16+5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c67a927..a540dea 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.16+4 +1.2.16+5 From 1052849c121ad9b2f32f96ebc7a56ecbefb34bb8 Mon Sep 17 00:00:00 2001 From: frea Date: Fri, 21 Jun 2024 13:30:15 +0200 Subject: [PATCH 063/147] =?UTF-8?q?correction=20dans=20le=20cas=20o=C3=B9?= =?UTF-8?q?=20la=20commande=20n'a=20pas=20de=20ligne...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RPtoRFX_PrepOrder.ftl | 9 ++++++--- RPtoRFX_Receipt.ftl | 6 +++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 3d272fb..3616f05 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -44,8 +44,9 @@ "apt_with_end_consignee": "${apt_with_end_consignee_flag}", "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" - }, + } <#if actorID == defaultactor > + , "address": { "type_code": "${typecode}", "title_code" : "${titlecode}", @@ -66,9 +67,10 @@ "postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}", "post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}", "iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}" - }, + } <#if executionflow.Lines??> + , "line_list": [ <#list executionflow.Lines as line> <#-- ******* line MetaData and Segmentationkeys to maps ******** --> @@ -100,7 +102,8 @@ } <#sep>, + ] - ] + } } diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 5cf790e..2125ae5 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -25,9 +25,10 @@ "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", - "dock_occupation_duration": 1, + "dock_occupation_duration": 1 <#if executionflow.Lines??> + , "line_list": [ <#list executionflow.Lines as line> @@ -61,7 +62,6 @@ }<#sep>, ] - - + } } From 6910fb80a84fff2a9e2f6e8874d46fbe1ee5d25f Mon Sep 17 00:00:00 2001 From: frea Date: Fri, 7 Jun 2024 11:15:47 +0200 Subject: [PATCH 064/147] SCPN1-6605 MovementCreated (cherry picked from commit e8510d079c36cdcd395a3ea3d3d71a8cddae2b2a) --- RFXtoRP_HsaIpgMove.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 4a98824..2e216fd 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -30,7 +30,7 @@ > [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved> + <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl"> From 4afc7fa50c6700051f9bdfefac0dccb534dd4010 Mon Sep 17 00:00:00 2001 From: frea Date: Fri, 21 Jun 2024 13:49:56 +0200 Subject: [PATCH 065/147] securisation --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 ++++ RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 4a65641..0e42d08 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -20,7 +20,11 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", + <#if (priority_date!="") && (priority_date?starts_with("00")== false) > "PriorityDate": "${priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 1fcc404..c6ad759 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -22,7 +22,7 @@ "Payload": { "Information" :{ <#if despatched_ipg.carton_number != "000000000000000000"> - "ContainerType": "${despatched_ipg.carton_type_code}" + "ContainerType": "${despatched_ipg.carton_type_code?json_string}" <#if preparation_line.despatched_cartons_list?? > <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton> , From 3de6a2f6a9a7e0030a94c1aa8b3b0bc30b365199 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 24 Jun 2024 08:38:44 +0200 Subject: [PATCH 066/147] add json_string --- RPtoRFX_PrepOrder.ftl | 4 ++-- RPtoRFX_Receipt.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 3616f05..1aa6431 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -15,7 +15,7 @@ { - "id" : {"refid" : "${executionflow.OrderID}"}, + "id" : {"refid" : "${executionflow.OrderID?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders", "method" : "POST", "uri_substitutions": { @@ -25,7 +25,7 @@ }, "payload" : { - "originator_reference": "${executionflow.OrderID}", + "originator_reference": "${executionflow.OrderID?json_string}", "preparation_type_code": "${preparation_type_code}", "end_consignee_code": "${actorID}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 2125ae5..80eafaa 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -1,7 +1,7 @@ <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl"> { - "id" : {"refid" : "${executionflow.OrderID}"}, + "id" : {"refid" : "${executionflow.OrderID?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts", "method" : "POST", "uri_substitutions": { @@ -11,7 +11,7 @@ }, "payload" : { - "receipt_reference": "${executionflow.OrderID}", + "receipt_reference": "${executionflow.OrderID?json_string}", "receipt_type": "${receipt_type}", "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", From 28659b1157b7134c10ca6c43ce220f8a278d6bc8 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Mon, 24 Jun 2024 10:54:19 +0200 Subject: [PATCH 067/147] Release 1.2.17+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a540dea..c7a4827 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.16+5 +1.2.17+1 From 0b3f07add9240972711032fc0cfd637b5334d026 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 24 Jun 2024 11:47:44 +0200 Subject: [PATCH 068/147] adjust json-string --- RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl | 4 ++-- RFXtoRP_HsaItm_ItemCreated.ftl | 4 ++-- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 18 +++++++++--------- RPtoRFX_PrepOrder.ftl | 18 +++++++++--------- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl index 81560f3..c61e73b 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl @@ -16,8 +16,8 @@ "Codes": [ <#list lv.id_list as id> { - "Key": "${id.logistical_variant_ID_type_code?json_string!""}", - "Value": "${id.logistical_variant_ID_code?json_string!""}" + "Key": "${(id.logistical_variant_ID_type_code!"")?json_string}", + "Value": "${(id.logistical_variant_ID_code!"")?json_string}" }<#sep>, ], diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 6ef16c0..a8ce5c9 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -39,8 +39,8 @@ "Codes": [ <#list logistical_variant.id_list as id> { - "Key": "${id.logistical_variant_ID_type_code?json_string!""}", - "Value": "${id.logistical_variant_ID_code?json_string!""}" + "Key": "${(id.logistical_variant_ID_type_code!"")?json_string}", + "Value": "${(id.logistical_variant_ID_code!"")?json_string}" }<#sep>, ], diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index d1f4107..1de6b02 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -52,23 +52,23 @@ <#else> "Actor": { - "Name" : "${preparation_order.address.name_or_company_name?json_string!""}", + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", "Address" : { - "City" : "${preparation_order.address.post_code_area_name?json_string!""}", + "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", "CountryCode" : "${preparation_order.address.iso_country_code!""}", "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}", - "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}", - "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" + "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", + "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", + "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" } }, "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?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ] + "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!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] } }, diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 1aa6431..a33d6d5 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -52,21 +52,21 @@ "title_code" : "${titlecode}", "contact_type_code" : "${contacttypecode}", "address_type_code" : "${adresstypecode}", - "first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}", - "last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}", - "name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}", + "first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}", + "last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}", + "name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}", <#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!=""> "mail_address": "${executionflow.ShipTo.Contact.Emails[0]}", <#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!=""> "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}", - "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}", - "additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}", - "additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}", - "postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}", - "post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}", - "iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}" + "street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}", + "additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}", + "additional_address_data_2": "${(executionflow.ShipTo.Actor.Address.StreetAddressThree!"")?json_string}", + "postal_code": "${(executionflow.ShipTo.Actor.Address.PostalCode!"")?json_string}", + "post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}", + "iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}" } <#if executionflow.Lines??> From 22b26ac7d3bf8d37e3463660dab1d02a8de3bc7a Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 25 Jun 2024 17:29:36 +0200 Subject: [PATCH 069/147] adjust json_string (cherry picked from commit af29a11b220facebebc3e39e5eb49ed84cf732b6) --- RFXtoRP_PrepOrder_ShipFromAcked.ftl | 2 +- RFXtoRP_Receipt_ShipToAcked.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_PrepOrder_ShipFromAcked.ftl b/RFXtoRP_PrepOrder_ShipFromAcked.ftl index 6a4ab2c..cf47d44 100644 --- a/RFXtoRP_PrepOrder_ShipFromAcked.ftl +++ b/RFXtoRP_PrepOrder_ShipFromAcked.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${id.refid}" + "RefID": "${id.refid?json_string}" }, "Payload": { diff --git a/RFXtoRP_Receipt_ShipToAcked.ftl b/RFXtoRP_Receipt_ShipToAcked.ftl index ae00aae..a094aeb 100644 --- a/RFXtoRP_Receipt_ShipToAcked.ftl +++ b/RFXtoRP_Receipt_ShipToAcked.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${id.refid}" + "RefID": "${id.refid?json_string}" }, "Payload": { From 23a87c1995be037b9f233360119d58cde8755e37 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 28 Jun 2024 15:12:20 +0200 Subject: [PATCH 070/147] Release 1.2.17+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index c7a4827..48ebb5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.17+1 +1.2.17+2 From b80623e631666188927e4b83e4a791d3d39073a9 Mon Sep 17 00:00:00 2001 From: freat Date: Fri, 12 Jul 2024 10:51:31 +0200 Subject: [PATCH 071/147] Release 1.2.18+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 48ebb5d..d2007ef 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.17+2 +1.2.18+1 From fea5691dddc39c0794246c9eadcd2ad85cbb6c59 Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 22 Jul 2024 10:18:15 +0200 Subject: [PATCH 072/147] Release 1.2.19+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d2007ef..2d99881 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.18+1 +1.2.19+1 From 68622896f0aa71cc54dde69ad26f22be3e8c01f6 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 24 Jul 2024 10:47:24 +0200 Subject: [PATCH 073/147] Release 1.2.20+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2d99881..0ca8721 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.19+1 +1.2.20+1 From ccca6d15922523cfe6174984d4f419b36022bc1f Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 29 Jul 2024 17:32:32 +0200 Subject: [PATCH 074/147] Release 1.2.21+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0ca8721..e7812d8 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.20+1 +1.2.21+1 From 46421972a8185ee45b76b9e5c2fbd5e93b9eaf3d Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 29 Jul 2024 17:33:09 +0200 Subject: [PATCH 075/147] Release 1.2.22+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e7812d8..fa909d2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.21+1 +1.2.22+1 From d21204a94901d64f5d344271ba26356e4f04882a Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 6 Aug 2024 15:41:22 +0200 Subject: [PATCH 076/147] SCPN1-6998 --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 7 ++++++- RFXtoRP_HsaCons_ActorCreated.ftl | 7 ++++++- RFXtoRP_HsaSup_ActorCreated.ftl | 7 ++++++- RFXtoRP_HsrDepot_ActorCreated.ftl | 7 ++++++- 4 files changed, 24 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 8c35239..f5afbd2 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -29,7 +29,12 @@ "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}", + <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) /> + <#if isCountryCode> + "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}", + <#else> + "CountryCode" : "", + "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}", "State": "${carrier.carrier_structured_address.country_designation?json_string}" diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 97b21f8..3448388 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -29,7 +29,12 @@ "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}", + <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) /> + <#if isCountryCode> + "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}", + <#else> + "CountryCode" : "", + "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}", "State": "${actor.consignee_structured_address.country_designation?json_string}" diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index fb804ac..042a51b 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -28,7 +28,12 @@ "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}", + <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) /> + <#if isCountryCode> + "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}", + <#else> + "CountryCode" : "", + "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", "State": "${actor.supplier_structured_address.country_designation?json_string}" diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 31774f9..b3042e2 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -28,7 +28,12 @@ "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}", + <#assign isCountryCode = JsonUtil.isCountryCode(depot.physical_depot_structured_address.country_code?upper_case) /> + <#if isCountryCode > + "CountryCode" : "${depot.physical_depot_structured_address.country_code?upper_case?json_string}", + <#else> + "CountryCode" : "", + "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}", "State": "${depot.physical_depot_structured_address.country_designation?json_string}" From 0468700574c357bfa302929285d34161c0b9f920 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 6 Aug 2024 16:08:37 +0200 Subject: [PATCH 077/147] Release 1.2.23+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fa909d2..7babec0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.22+1 +1.2.23+1 From 26003c24f2bc6de0f2eca985ce787b590ba94871 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 7 Aug 2024 08:38:34 +0200 Subject: [PATCH 078/147] SCPN1-6998 --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 3 ++- RFXtoRP_HsaCons_ActorCreated.ftl | 3 ++- RFXtoRP_HsaSup_ActorCreated.ftl | 3 ++- RFXtoRP_HsrDepot_ActorCreated.ftl | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index f5afbd2..c516655 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -44,7 +44,8 @@ "Name": "${carrier.address.company_name?json_string}", "StreetAddressOne" : "${carrier.address.address_1?json_string}", "StreetAddressTwo" : "${carrier.address.address_2?json_string}", - "StreetAddressThree" : "${carrier.address.address_3?json_string}" + "StreetAddressThree" : "${carrier.address.address_3?json_string}", + "CountryCode" : "" }, diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 3448388..e317219 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -45,7 +45,8 @@ "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}" + "StreetAddressThree" : "${actor.address.address_3?json_string}", + "CountryCode" : "" }, diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 042a51b..4a48aec 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -43,7 +43,8 @@ "Name": "${actor.optional_attributes.company_name?json_string}", "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", - "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" + "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}", + "CountryCode" : "" diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index b3042e2..86379b1 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -42,7 +42,8 @@ "Name": "${depot.physical_depot_address.company_name?json_string}", "StreetAddressOne" : "${depot.physical_depot_address.address_1?json_string}", "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}", - "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}" + "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}", + "CountryCode" : "" }, From b00302c8e31590b83511dc3804b6501e8c72d8f0 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 7 Aug 2024 08:44:43 +0200 Subject: [PATCH 079/147] Release 1.2.23+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7babec0..965c36b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.23+1 +1.2.23+2 From 0a4263d551f32f904f7229fbf2fe9a5cf417f283 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 7 Aug 2024 12:23:46 +0200 Subject: [PATCH 080/147] Release 1.2.24+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 965c36b..6dbd04c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.23+2 +1.2.24+1 From 087346139d238d8257a10d40f4c29969e9cb8a0a Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 8 Aug 2024 16:55:33 +0200 Subject: [PATCH 081/147] Release 1.2.25+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6dbd04c..7306069 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.24+1 +1.2.25+1 From 04b7974c774189e58a7695e6006f99e882db732f Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 29 Aug 2024 10:34:55 +0200 Subject: [PATCH 082/147] SCPN1-7065 (cherry picked from commit ca33a85694e8b3a7a2f32a40b32453c533cd9ba8) --- ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index c6ad759..b5e3f74 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -74,37 +74,38 @@ "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 /> - "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_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 (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_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": "1970-01-01T00:00:00Z", - - - - + <#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_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 (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": "1970-01-01T00:00:00Z", + + - + + + <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> From 8425747b42fba2a9b4e1d400477e2a9c2d172459 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 29 Aug 2024 10:59:28 +0200 Subject: [PATCH 083/147] Release 1.2.25+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7306069..95488c4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.25+1 +1.2.25+2 From 7963b351aad1fcde24bfbe10cede645c481bdf9f Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 12 Sep 2024 14:11:04 +0200 Subject: [PATCH 084/147] SCPN1-7155 --- RFXtoRP_HsrPrepa.ftl | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index ba650af..f7834cc 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -49,17 +49,21 @@ <#assign refIDHmap ={}> + <#assign hd_numberHmap ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> <#if despatched_ipg.consignment_unit_id!=""> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } + <#if !hd_numberHmap[despatched_ipg.hd_number]?? > + <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#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 > , From 4c84e4195be531dc6c4119df3ac3712f9d5d9d19 Mon Sep 17 00:00:00 2001 From: freat Date: Fri, 13 Sep 2024 10:38:27 +0200 Subject: [PATCH 085/147] Release 1.2.26+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 95488c4..f888fc4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.25+2 +1.2.26+1 From eaa7ef1b9bb29be2a4d4c5f9673f4037d1e6abc2 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 25 Sep 2024 16:12:56 +0200 Subject: [PATCH 086/147] Release 1.2.27+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index f888fc4..aa67e26 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.26+1 +1.2.27+1 From de828ed606f9196163a005a14cb82774bde27472 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Oct 2024 14:46:45 +0200 Subject: [PATCH 087/147] modifs (cherry picked from commit 25011e68e69e6f0c1758d8e516e418e959deeb05) --- RPtoRFX_PrepOrder.ftl | 2 +- RPtoRFX_Receipt.ftl | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index a33d6d5..0f18d90 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -89,7 +89,7 @@ "owner_code_to_prepare" :"${owner_code_to_prepare}", "grade_code_to_prepare" :"${grade_code_to_prepare}", "input_order_data": "false", - "batch_1": "${batch_1}", + "batch_1": "${batch_1?json_string}", "base_lv_quantity": "true", "any_lv": "false" <#-- diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 80eafaa..838293a 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -9,16 +9,16 @@ "physical_depot_code": "${executionflow.ShipTo.ActorID!""}", "originator_code": "${originator_code}" }, - "payload" : + "payload" : { "receipt_reference": "${executionflow.OrderID?json_string}", "receipt_type": "${receipt_type}", - "receipt_reason_code": "${receipt_reason_code}", + "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", "original_code" : "${executionflow.ShipFrom.ActorID}", "carrier_code" : "${executionflow.Carrier.ActorID!""}", - <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> + <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> "receipt_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", @@ -26,8 +26,8 @@ "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", "dock_occupation_duration": 1 - - <#if executionflow.Lines??> + + <#if executionflow.Lines??> , "line_list": [ <#list executionflow.Lines as line> @@ -47,7 +47,7 @@ "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", - "batch_1": "${batch_1!""}", + "batch_1": "${batch_1?json_string!""}", "optional_attributes": { <#--"held_for_check": "false", "held _for_repacking": "false", @@ -60,8 +60,8 @@ } --> }<#sep>, - + ] - + } } From 54511c55f12ae4a72d15cdb25301f55ed51c7260 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 26 Sep 2024 15:58:37 +0200 Subject: [PATCH 088/147] modifs (cherry picked from commit e2c0735dc790ccbdbc53f034ce4fe902574155d8) --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 107c511..e3ff52b 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -1,13 +1,16 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - +<#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" + "RefDate": { + "DateTime": "${dispatched_datetime4}", + "AuthorTimeZone": "${time_zone_rfx}" }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> From 96aec6555ce23af2597f382226a51774ed1f56dc Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 3 Oct 2024 15:08:49 +0200 Subject: [PATCH 089/147] SCPN1-7302 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index e3ff52b..cec5f7a 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -11,6 +11,7 @@ "RefDate": { "DateTime": "${dispatched_datetime4}", "AuthorTimeZone": "${time_zone_rfx}" + } }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> From f72bcc25375271fbe0da4867b9327993ed912f79 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 3 Oct 2024 15:30:18 +0200 Subject: [PATCH 090/147] SCPN1-7302 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index cec5f7a..584a500 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", "RefDate": { "DateTime": "${dispatched_datetime4}", "AuthorTimeZone": "${time_zone_rfx}" From 0e3e60b45ada5f9f1432f43c804a8f0de0827809 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 3 Oct 2024 15:39:13 +0200 Subject: [PATCH 091/147] Release 1.2.27+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index aa67e26..ba62301 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.27+1 +1.2.27+2 From a9a357d4ed971500d5f99c88439be6faa273eab3 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 14 Oct 2024 09:56:41 +0200 Subject: [PATCH 092/147] SCPN1-7341 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 1de6b02..6bcc2f9 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -48,7 +48,7 @@ preparation_order.address.territorial_division_code == "" && preparation_order.address.postal_code == "" && preparation_order.address.iso_country_code == ""> - "ActorID": "${preparation_order.end_consignee_code}" + "ActorID": "${preparation_order.end_consignee_code?trim?json_string}" <#else> "Actor": { From 771915ad19cba831d63a2b8c28581103b02390c6 Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 14 Oct 2024 11:51:48 +0200 Subject: [PATCH 093/147] Release 1.2.28+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ba62301..3804166 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.27+2 +1.2.28+1 From 1f2d3ab2120635dc2136cd60d9020076b2447999 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 17 Oct 2024 10:36:14 +0200 Subject: [PATCH 094/147] SCPN1-6728 --- RPtoRFX_PrepOrder.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 0f18d90..a792ab3 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -54,7 +54,11 @@ "address_type_code" : "${adresstypecode}", "first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}", "last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}", - "name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}", + <#if executionflow.ShipTo.Actor.Address.Name?? && executionflow.ShipTo.Actor.Address.Name!=""> + "name_or_company_name" : "${(executionflow.ShipTo.Actor.Address.Name!"")?json_string}", + <#else> + "name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}", + <#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!=""> "mail_address": "${executionflow.ShipTo.Contact.Emails[0]}", From 04bc005cdab2e6f7ec96770eafc2228040e80945 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 17 Oct 2024 11:07:16 +0200 Subject: [PATCH 095/147] Release 1.2.28+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3804166..fef8232 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.28+1 +1.2.28+2 From e63b14d0ff249b83240734211a4814d85af92d80 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 24 Oct 2024 10:05:02 +0200 Subject: [PATCH 096/147] SCPN1-7421 --- RFXtoRP_RfxConfigurationRp.ftl | 42 +++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 19 deletions(-) diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index 78abc62..9d8ef8f 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -2,12 +2,12 @@ <#noparse><#-- /!\ Warning the file is generated, if you modify it manually, do not enable automatic update via the pipeline --> <#noparse><#-- Date of last generation : ${aDateTime}<#noparse> --> -<#noparse> +<#noparse> <#-- if LVID is egal to **quantity_in_base_lv** keyword then LVID is egal to base VL of the item --> - <#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" > - <#assign rfx_date_format_default = "yyyy-MM-dd" > - - + <#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" > + <#assign rfx_date_format_default = "yyyy-MM-dd" > + + <#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}> <#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}> <#assign area_unit_KV_rfx = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}> @@ -15,22 +15,26 @@ - <#noparse><#assign length_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"> - <#noparse><#assign distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"> - <#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"> - <#noparse><#assign weight_unit_rfx = weight_unit_KV_rfx["${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"> - <#noparse><#assign area_unit_rfx = area_unit_KV_rfx["${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"> - <#noparse><#assign volume_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"> - <#noparse><#assign number_of_litres_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"> - + <#noparse><#assign length_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"> + <#noparse><#assign distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"> + <#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"> + <#noparse><#assign weight_unit_rfx = weight_unit_KV_rfx["${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"> + <#noparse><#assign area_unit_rfx = area_unit_KV_rfx["${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"> + <#noparse><#assign volume_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"> + <#noparse><#assign number_of_litres_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"> + + - <#noparse><#assign time_zone_rfx = "${file.author_time_zone!"UTC"}<#noparse>"> - <#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> - - + <#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> + + <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project> - <#noparse><#assign text_language_rfx = "${reflex_platform_project.text_language!"en"}<#noparse>"> + <#noparse><#assign text_language_rfx = "${reflex_platform_project.text_language!"en"}<#noparse>"> - \ No newline at end of file + <#if file.reflex_platform_project_list[0].site_code_unicity??> + <#noparse><#assign uniqueness = ${file.reflex_platform_project_list[0].site_code_unicity?c}<#noparse>> +<#else> + <#noparse><#assign uniqueness = false<#noparse>> + \ No newline at end of file From e190a16ddc9a0a91fddb2ef0c6bae8a78799e2d9 Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 24 Oct 2024 10:22:41 +0200 Subject: [PATCH 097/147] Release 1.2.28+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index fef8232..6ffc752 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.28+2 +1.2.28+3 From 834abe1b78d94c0e1079f72ea859fba8e8c16cce Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Tue, 29 Oct 2024 15:17:50 +0100 Subject: [PATCH 098/147] SCPN1-7418 --- RFXtoRP_RfxConfigurationRp.ftl | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index 9d8ef8f..36b9cb8 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -33,8 +33,11 @@ <#noparse><#assign text_language_rfx = "${reflex_platform_project.text_language!"en"}<#noparse>"> - <#if file.reflex_platform_project_list[0].site_code_unicity??> - <#noparse><#assign uniqueness = ${file.reflex_platform_project_list[0].site_code_unicity?c}<#noparse>> +<#list file.reflex_platform_project_list?filter(j -> j.name == projectRP) as reflex_platform_project_uniqueness> + <#if reflex_platform_project_uniqueness.site_code_unicity??> +<#noparse><#assign uniqueness = ${reflex_platform_project_uniqueness.site_code_unicity?c}<#noparse>> <#else> <#noparse><#assign uniqueness = false<#noparse>> - \ No newline at end of file + + + From b69bfa50ba514451bc2da026a6cdd03f7cfcee0f Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Tue, 29 Oct 2024 15:20:15 +0100 Subject: [PATCH 099/147] Release 1.2.28+4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6ffc752..226d3fc 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.28+3 +1.2.28+4 From 867fdc5743a5149c32573fe12a49dbe0eb133038 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 5 Nov 2024 11:10:04 +0100 Subject: [PATCH 100/147] SCPN1-7496 --- 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 c09d3ae..cc573a9 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -57,7 +57,7 @@ "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", - <#if reflexMvtStockInterface.move_sign == "+"> + <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs < 0 > "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} <#else> "Value": -${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} From a4f3bf8151342ea62507248c543b0d78f1c4fa0a Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 5 Nov 2024 11:28:00 +0100 Subject: [PATCH 101/147] SCPN1-7496 --- 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 cc573a9..bbc1677 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -57,7 +57,7 @@ "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", - <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs < 0 > + <#if reflexMvtStockInterface.move_sign == "+" || reflexMvtStockInterface.ipg_move_quantity_in_base_lvs <= 0 > "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} <#else> "Value": -${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} From e6a27c2ba2f20cc9c0e8dec28d518f3c4c34e160 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 5 Nov 2024 11:31:06 +0100 Subject: [PATCH 102/147] Release 1.2.28+5 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 226d3fc..d056bd2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.28+4 +1.2.28+5 From ed0141584bbdc4e359d10277142ecfca9330fdb4 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 6 Nov 2024 14:48:50 +0100 Subject: [PATCH 103/147] Release 1.2.29+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index d056bd2..8e832dd 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.28+5 +1.2.29+1 From cae9bf80bba296de78092472997d61c9a4dad6d1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Nov 2024 10:16:06 +0100 Subject: [PATCH 104/147] json_string (cherry picked from commit 4d24367b58dce97454d351a1ce13b1b65b956bf6) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- RPtoRFX_PrepOrder.ftl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 6bcc2f9..68bda8e 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -56,8 +56,8 @@ "Address" : { "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - "CountryCode" : "${preparation_order.address.iso_country_code!""}", - "PostalCode" : "${preparation_order.address.postal_code!""}", + "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}", + "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}", "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index a792ab3..074fefd 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -60,10 +60,10 @@ "name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}", <#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!=""> - "mail_address": "${executionflow.ShipTo.Contact.Emails[0]}", + "mail_address": "${executionflow.ShipTo.Contact.Emails[0]?json_string}", <#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!=""> - "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}", + "mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]?json_string}", "street_and_number_and_po_box": "${(executionflow.ShipTo.Actor.Address.StreetAddressOne!"")?json_string}", "additional_address_data_1": "${(executionflow.ShipTo.Actor.Address.StreetAddressTwo!"")?json_string}", From 236c2d754cf26e47968323268854720c2b8dadd8 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 12 Nov 2024 14:28:03 +0100 Subject: [PATCH 105/147] Release 1.2.29+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 8e832dd..9c36ed1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.29+1 +1.2.29+2 From 5fc26e601548e17c1aff48983bcd706418c1c0d8 Mon Sep 17 00:00:00 2001 From: frea Date: Mon, 18 Nov 2024 11:36:01 +0100 Subject: [PATCH 106/147] SCPN1-7578 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 68bda8e..a4d6321 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -56,7 +56,12 @@ "Address" : { "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", + <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) /> + <#if isCountryCode> "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}", + <#else> + "CountryCode" : "", + "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}", "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", From 46a9a82e125b135e18a222349607c4992d3e02b7 Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 18 Nov 2024 11:44:58 +0100 Subject: [PATCH 107/147] Release 1.2.29+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9c36ed1..0433698 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.29+2 +1.2.29+3 From d85abf82351ab545c9b8c28be26a2107bd1ddfaf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 19 Nov 2024 11:17:59 +0100 Subject: [PATCH 108/147] Correction priority date (cherry picked from commit e41309e74488f41991896cced6f285904dce6f7a) --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index c2de1cd..c74a760 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -20,7 +20,7 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", - <#if (priority_date!="") && (priority_date?starts_with("00")== false) > + <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) > "PriorityDate": "${priority_date}", <#else> "PriorityDate": "1970-01-01T00:00:00Z", From 85bfe55af73c6672876cd94aa1addb0a6925d918 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 19 Nov 2024 11:47:55 +0100 Subject: [PATCH 109/147] Release 1.2.29+4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0433698..a52b95a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.29+3 +1.2.29+4 From 173deec755e6eedace39d6aee62014c18c8765f4 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 4 Dec 2024 08:08:26 +0100 Subject: [PATCH 110/147] pour 1.9 --- ActorPrefix.ftl | 162 ++++++++++++++++++ RFXtoRP_HfDtlStockLs.ftl | 4 +- ...RP_HfDtlStockLs_ActorSnapshotCompleted.ftl | 24 +-- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 16 +- RFXtoRP_HfGrade.ftl | 10 +- RFXtoRP_HfLvTypeList.ftl | 2 +- RFXtoRP_HfOwner.ftl | 10 +- RFXtoRP_HfRpConfig.ftl | 14 +- RFXtoRP_HsaCarrier.ftl | 34 ++-- RFXtoRP_HsaCarrier_ActorCreated.ftl | 12 +- RFXtoRP_HsaCarrier_ActorDeleted.ftl | 6 +- RFXtoRP_HsaCons.ftl | 34 ++-- RFXtoRP_HsaCons_ActorCreated.ftl | 14 +- RFXtoRP_HsaCons_ActorDeleted.ftl | 6 +- RFXtoRP_HsaDispute.ftl | 47 +++++ RFXtoRP_HsaDispute_Created.ftl | 70 ++++++++ RFXtoRP_HsaDispute_MessageSent.ftl | 124 ++++++++++++++ ...saDispute_TableReasonCodeToClaimTypeID.ftl | 7 + RFXtoRP_HsaIpgMove.ftl | 9 +- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 +- ...IpgMove_GoodsReceived_SegmentationKeys.ftl | 8 +- RFXtoRP_HsaIpgMove_StockMoved.ftl | 10 +- RFXtoRP_HsaItm.ftl | 32 ++-- RFXtoRP_HsaItmLv.ftl | 30 ++-- RFXtoRP_HsaItm_ItemCreated.ftl | 4 +- RFXtoRP_HsaLstCarSta.ftl | 40 +++++ RFXtoRP_HsaProStatus.ftl | 4 +- RFXtoRP_HsaSup.ftl | 34 ++-- RFXtoRP_HsaSup_ActorCreated.ftl | 12 +- RFXtoRP_HsaSup_ActorDeleted.ftl | 6 +- RFXtoRP_HsrCarrierApt.ftl | 40 +++++ RFXtoRP_HsrDepot.ftl | 34 ++-- RFXtoRP_HsrDepot_ActorCreated.ftl | 23 ++- RFXtoRP_HsrDepot_ActorDeleted.ftl | 6 +- RFXtoRP_HsrLoadInfo.ftl | 40 +++++ RFXtoRP_HsrPrepa.ftl | 36 ++-- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 3 +- ...epa_GoodsPrepared_HandlingUnitMetadata.ftl | 4 +- ...srPrepa_GoodsPrepared_SegmentationKeys.ftl | 7 +- ...P_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl | 27 +++ ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 13 +- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 3 +- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 19 +- RFXtoRP_HsrPro.ftl | 12 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 9 +- RFXtoRP_HsrReceiptList.ftl | 2 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 11 +- RFXtoRP_PlatformLogCreate.ftl | 15 +- RFXtoRP_RestResponse.ftl | 76 +++++++- RFXtoRP_RestResponseAllocationError.ftl | 2 +- RFXtoRP_RfxConfigurationRp.ftl | 38 ++-- RPtoRFX_ExecutionflowEvent.ftl | 26 +-- RPtoRFX_PrepOrder.ftl | 6 +- RPtoRFX_Receipt.ftl | 8 +- RPtoRFX_Receipt_DefaultLineData.ftl | 2 +- ReflexUtils.ftl | 6 +- Table.ftl | 15 ++ 57 files changed, 979 insertions(+), 293 deletions(-) create mode 100644 ActorPrefix.ftl create mode 100644 RFXtoRP_HsaDispute.ftl create mode 100644 RFXtoRP_HsaDispute_Created.ftl create mode 100644 RFXtoRP_HsaDispute_MessageSent.ftl create mode 100644 RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl create mode 100644 RFXtoRP_HsaLstCarSta.ftl create mode 100644 RFXtoRP_HsrCarrierApt.ftl create mode 100644 RFXtoRP_HsrLoadInfo.ftl create mode 100644 RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl create mode 100644 Table.ftl diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl new file mode 100644 index 0000000..e12b76d --- /dev/null +++ b/ActorPrefix.ftl @@ -0,0 +1,162 @@ + +<#-- --------------------------------------------------------------------------------------- --> +<#-- Actor Prefix 4 cars --> +<#-- --------------------------------------------------------------------------------------- --> + +<#-- For Depot --> +<#function RFXtoRPprefixDepot depot> + <#if uniqueness > + <#local actor = depot> + <#else> + <#if text_language_rfx ="fr"> + <#local actor = "DEP_"+depot> + <#else> + <#if text_language_rfx ="it"> + <#local actor = "DEP_"+depot> + <#else> + <#if text_language_rfx ="es"> + <#local actor = "DEP_"+depot> + <#else> + <#if text_language_rfx ="pl"> + <#local actor = "MAG_"+depot> + <#else> + <#if text_language_rfx ="nl"> + <#local actor = "DEP_"+depot> + <#else> + <#local actor = "DEP_"+depot> + + + + + + +<#return (actor)> + + +<#function RPtoRFXprefixDepot actor> + <#if uniqueness> + <#local depot = actor> + <#else> + <#local depot = actor[4..]> + +<#return (depot)> + + + + +<#-- For Supplier --> +<#function RFXtoRPprefixSupplier supplier> + <#if uniqueness> + <#local actor = supplier> + <#else> + <#if text_language_rfx ="fr"> + <#local actor = "FOU_"+supplier> + <#else> + <#if text_language_rfx ="it"> + <#local actor = "FOR_"+supplier> + <#else> + <#if text_language_rfx ="es"> + <#local actor = "PRO_"+supplier> + <#else> + <#if text_language_rfx ="pl"> + <#local actor = "DOS_"+supplier> + <#else> + <#if text_language_rfx ="nl"> + <#local actor = "LEV_"+supplier> + <#else> + <#local actor = "SUP_"+supplier> + + + + + + +<#return (actor)> + + +<#function RPtoRFXprefixSupplier actor> + <#if uniqueness> + <#local supplier = actor> + <#else> + <#local supplier = actor[4..]> + +<#return (supplier)> + + +<#-- For Carrier --> +<#function RFXtoRPprefixCarrier carrier> + <#if uniqueness> + <#local actor = carrier> + <#else> + <#if text_language_rfx ="fr"> + <#local actor = "TRA_"+carrier> + <#else> + <#if text_language_rfx ="it"> + <#local actor = "VET_"+carrier> + <#else> + <#if text_language_rfx ="es"> + <#local actor = "TRA_"+carrier> + <#else> + <#if text_language_rfx ="pl"> + <#local actor = "PRZ_"+carrier> + <#else> + <#if text_language_rfx ="nl"> + <#local actor = "VER_"+carrier> + <#else> + <#local actor = "CAR_"+carrier> + + + + + + +<#return (actor)> + + +<#function RPtoRFXprefixCarrier actor> + <#if uniqueness> + <#local carrier = actor> + <#else> + <#local carrier = actor[4..]> + +<#return (carrier)> + + +<#-- For Consignee --> +<#function RFXtoRPprefixConsignee consignee> + <#if uniqueness> + <#local actor = consignee> + <#else> + <#if text_language_rfx ="fr"> + <#local actor = "DES_"+consignee> + <#else> + <#if text_language_rfx ="it"> + <#local actor = "DES_"+consignee> + <#else> + <#if text_language_rfx ="es"> + <#local actor = "DES_"+consignee> + <#else> + <#if text_language_rfx ="pl"> + <#local actor = "ODB_"+consignee> + <#else> + <#if text_language_rfx ="nl"> + <#local actor = "ONT_"+consignee> + <#else> + <#local actor = "CON_"+consignee> + + + + + + +<#return (actor)> + + +<#function RPtoRFXprefixConsignee actor> + <#if uniqueness> + <#local consignee = actor> + <#else> + <#local consignee = actor[4..]> + +<#return (consignee)> + \ No newline at end of file diff --git a/RFXtoRP_HfDtlStockLs.ftl b/RFXtoRP_HfDtlStockLs.ftl index 1c514ab..28d6d61 100644 --- a/RFXtoRP_HfDtlStockLs.ftl +++ b/RFXtoRP_HfDtlStockLs.ftl @@ -50,11 +50,11 @@ <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> - <#stop "event not supported"> + <#stop > <#break> <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl index 6e6600b..e248350 100644 --- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl +++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl @@ -1,27 +1,29 @@ <#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ <#list reflexStockPicturesInterface.detailled_stock_list as stock> { "Header": { - "ProjectID": "${projectRP}" + "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${stock.physical_depot_code}" - }, - "Payload": { + "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}" + }, + "Payload": { <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> "Snapshot": { "EndDateTime": { - "DateTime": "${generation_date}", - "AuthorTimeZone": "${time_zone_rfx}" - }, - "ID": "${stock.physical_depot_code}-${idSnapshot}", - "MessageNb": ${sum_elt} + "DateTime": "${generation_date}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "ID": "${stock.physical_depot_code}-${idSnapshot}", + "MessageNb": ${sum_elt} } - + } } <#break> - + ] diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index deed817..fcf0f0c 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -1,4 +1,6 @@ <#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ <#list reflexStockPicturesInterface.detailled_stock_list as stock> { @@ -6,19 +8,19 @@ "ProjectID": "${projectRP}" }, "Payload": { - "ActorID": "${stock.physical_depot_code}", + "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}", <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> "Snapshot": { "DateTime": { "DateTime": "${generation_date}", "AuthorTimeZone": "${time_zone_rfx}" }, - "ID": "${stock.physical_depot_code}-${idSnapshot}", - "Quantity": - { - "Value" : "${stock.quantity_in_base_lvs!"0"}", - "LVID": "${quantity_in_base_lv_RP_Cst}" - } + "ID": "${stock.physical_depot_code}-${idSnapshot}", + "Quantity": + { + "Value" : "${stock.quantity_in_base_lvs!"0"}", + "LVID": "${quantity_in_base_lv_RP_Cst}" + } }, "Goods": { diff --git a/RFXtoRP_HfGrade.ftl b/RFXtoRP_HfGrade.ftl index ee9990d..39f6d2f 100644 --- a/RFXtoRP_HfGrade.ftl +++ b/RFXtoRP_HfGrade.ftl @@ -1,5 +1,5 @@ <#-- *********************************************** Parameter global ******************** --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -9,11 +9,11 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Grades"> + <#stop "no generic FTL file available yet for Grades"> <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl index 584df9a..f9b3b04 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -16,6 +16,6 @@ <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HfOwner.ftl b/RFXtoRP_HfOwner.ftl index 571248a..6d23fd2 100644 --- a/RFXtoRP_HfOwner.ftl +++ b/RFXtoRP_HfOwner.ftl @@ -1,5 +1,5 @@ <#-- *********************************************** Parameter global ******************** --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -9,11 +9,11 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Owners"> + <#stop "no generic FTL file available yet for Owners"> <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HfRpConfig.ftl b/RFXtoRP_HfRpConfig.ftl index 8792d92..0d0751e 100644 --- a/RFXtoRP_HfRpConfig.ftl +++ b/RFXtoRP_HfRpConfig.ftl @@ -4,7 +4,7 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of *** --> <#-- *********************************************** Parameter global ******************** --> -<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -16,18 +16,18 @@ those parameters are stored in FTL file HfRpConfig.ftl for later use in some of <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign file = JsonUtil.jsonToMap(dataRfx)> - + <#include "RFXtoRP_RfxConfigurationRp.ftl"> - + <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#stop "deletion of config not supported"> <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaCarrier.ftl b/RFXtoRP_HsaCarrier.ftl index c0b031b..6b47034 100644 --- a/RFXtoRP_HsaCarrier.ftl +++ b/RFXtoRP_HsaCarrier.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,33 +14,33 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign carrier = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign carrier = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl"> + "datas" : + <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl"> } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************************* --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign carrier = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign carrier = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCarrier_ActorDeleted.ftl"> + "datas" : + <#include "RFXtoRP_HsaCarrier_ActorDeleted.ftl"> } - ] + ] <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index c516655..8ac9722 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code?trim?json_string}" + "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}" }, - "Payload": { "Name": "${carrier.carrier_designation?json_string}", "ManagedStock": false, @@ -14,10 +16,8 @@ <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - <#-- - <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, - --> + <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, "Address": { @@ -45,7 +45,7 @@ "StreetAddressOne" : "${carrier.address.address_1?json_string}", "StreetAddressTwo" : "${carrier.address.address_2?json_string}", "StreetAddressThree" : "${carrier.address.address_3?json_string}", - "CountryCode" : "" + "CountryCode" : "" }, diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index 5e131c4..62b69a2 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code?trim?json_string}" + "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}" }, - "Payload": {} } ] diff --git a/RFXtoRP_HsaCons.ftl b/RFXtoRP_HsaCons.ftl index 1c7b34b..8932eb4 100644 --- a/RFXtoRP_HsaCons.ftl +++ b/RFXtoRP_HsaCons.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,33 +14,33 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign actor = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign actor = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCons_ActorCreated.ftl"> + "datas" : + <#include "RFXtoRP_HsaCons_ActorCreated.ftl"> } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign actor = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign actor = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCons_ActorDeleted.ftl"> + "datas" : + <#include "RFXtoRP_HsaCons_ActorDeleted.ftl"> } - ] + ] <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index e317219..84df17a 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?trim?json_string}" + "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}" }, - "Payload": { "Name": "${actor.designation?json_string}", "ManagedStock": false, @@ -14,9 +16,9 @@ <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - <#-- + <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - --> + "Address": { @@ -31,7 +33,7 @@ "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}", <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) /> <#if isCountryCode> - "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}", + "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}", <#else> "CountryCode" : "", @@ -46,7 +48,7 @@ "StreetAddressOne" : "${actor.address.address_1?json_string}", "StreetAddressTwo" : "${actor.address.address_2?json_string}", "StreetAddressThree" : "${actor.address.address_3?json_string}", - "CountryCode" : "" + "CountryCode" : "" }, diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index 6fbfb45..89d4fce 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?trim?json_string}" + "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}" }, - "Payload": {} } ] diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl new file mode 100644 index 0000000..18ea1ec --- /dev/null +++ b/RFXtoRP_HsaDispute.ftl @@ -0,0 +1,47 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#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 dispute = JsonUtil.jsonToMap(dataRfx)> + [ + <#if dispute.dispute_closed == true > + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsaDispute_Created.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsaDispute_MessageSent.ftl"> + } + <#else> + <#stop> + + ] + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#stop> + <#break> + + + <#default> + <#stop> + + diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl new file mode 100644 index 0000000..c85da89 --- /dev/null +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -0,0 +1,70 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "Table.ftl"> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if dispute.dispute_preparation??> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_reception??> + "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + + + }, + "Payload": { + <#if dispute.dispute_reference?? && dispute.dispute_reference!=""> + "Title":"${dispute.dispute_reference?trim?json_string}", + <#else> + "Title":"", + + "Criticality":"${TableCriticality[dispute.dispute_criticity]}", + "Amount": { + <#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) /> + <#if isCurrencyCode> + "Currency" : "${dispute.dispute_amount_unit?upper_case?json_string}", + <#else> + <#if TableAmount[dispute.dispute_amount_unit?json_string]??> + "Currency" : "${TableAmount[dispute.dispute_amount_unit?json_string]}", + <#else> + "Currency" : "XXX", + + + "Value": "${dispute.dispute_amount}" + }, + <#if dispute.dispute_type_code=="050" > + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > + "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", + <#else> + <#stop "Type not supported" > + + + <#-- To configure --> + <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> + + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Claim reason code not supported" > + + + + } + } +] + + + diff --git a/RFXtoRP_HsaDispute_MessageSent.ftl b/RFXtoRP_HsaDispute_MessageSent.ftl new file mode 100644 index 0000000..6b59ba0 --- /dev/null +++ b/RFXtoRP_HsaDispute_MessageSent.ftl @@ -0,0 +1,124 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if dispute.dispute_preparation??> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_reception??> + "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + + + }, + "Payload": { + + <#if dispute.dispute_preparation??> + "Message": "${dispute.dispute_reference?trim?json_string}" + <#else> + <#if dispute.dispute_reception??> + "Message": "${dispute.dispute_reception.reception_reference?trim?json_string}" + + + + } + }, + <#if dispute.dispute_quantity!=0 && dispute.dispute_item??> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if dispute.dispute_preparation??> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_reception??> + "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + + + }, + "Payload": { + "Message": "${dispute.dispute_item.item_code?trim?json_string} - ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}" + } + }, + <#elseif dispute.dispute_item??> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if dispute.dispute_preparation??> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_reception??> + "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + + + }, + "Payload": { + "Message": "${dispute.dispute_item.item_code?trim?json_string}" + } + }, + <#elseif dispute.dispute_quantity!=0> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if dispute.dispute_preparation??> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_reception??> + "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + + + }, + "Payload": { + "Message": "${dispute.dispute_quantity}${dispute.dispute_quantity_unit}" + } + }, + + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + <#if dispute.dispute_preparation??> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + <#else> + <#stop "preparation order list is empty" > + + <#else> + <#if dispute.dispute_reception??> + "RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" + + + }, + "Payload": { + + "Message": " ${dispute.dispute_description?trim?json_string}" + + } + } + +] \ No newline at end of file diff --git a/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl b/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl new file mode 100644 index 0000000..9b2f13a --- /dev/null +++ b/RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl @@ -0,0 +1,7 @@ +<#-- Specify table for reason code --> +<#assign TableReasonCode = {}/> + + + + + diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 18a4a46..0582ada 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -28,7 +28,10 @@ reflexMvtStockInterface.ipg_move_type == "370" || reflexMvtStockInterface.ipg_move_type == "400" || reflexMvtStockInterface.ipg_move_type == "410" || - reflexMvtStockInterface.ipg_move_type == "420" + reflexMvtStockInterface.ipg_move_type == "420" || + reflexMvtStockInterface.ipg_move_type == "455" || + reflexMvtStockInterface.ipg_move_type == "460" || + reflexMvtStockInterface.ipg_move_type == "465" > [ { @@ -68,11 +71,11 @@ <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> - <#stop "event not supported - Case D "> + <#stop > <#break> <#default> - <#stop "event not supported"> + <#stop> diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index c74a760..8653828 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> [ <#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 /> @@ -29,13 +30,14 @@ <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, + <#if reflexMvtStockInterface.receipt_reference!=""> "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?trim?json_string}", + "ActorID": "${RFXtoRPprefixDepot(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_GoodsReceived_SegmentationKeys.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl index bee18d4..4fa3d1d 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl @@ -18,21 +18,21 @@ "Value": { "String" : "no batch"} <#else> "Value": { "String" : "${reflexMvtStockInterface.batch_1}"} - + }, { "Key": "HeldForSpecificCode", "Value": { "Bool" : "${reflexMvtStockInterface.ipg_specific_code_held}"} }, - + { - <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc /> + <#assign manufacturing_date = reflexMvtStockInterface.manufacture_date?datetime(rfx_date_format_default)?iso_utc /> "Key": "ManufacturingDate", "Value": "Timestamp": { "AuthorTimeZone": "${time_zone_rfx}", "DateTime": "${manufacturing_date}" } - } + } ] --> diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index bbc1677..f45d3c1 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> <#assign MoveType_KV = {"130":"STOCK_MOVEMENT_TYPE_PRODUCTION", "200":"STOCK_MOVEMENT_TYPE_FIX", @@ -14,10 +15,13 @@ "370":"STOCK_MOVEMENT_TYPE_USE_OF_GOODS", "400":"STOCK_MOVEMENT_TYPE_FIX", "410":"STOCK_MOVEMENT_TYPE_FIX", - "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION"}> + "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION", + "455":"STOCK_MOVEMENT_TYPE_FIX", + "460":"STOCK_MOVEMENT_TYPE_FIX", + "465":"STOCK_MOVEMENT_TYPE_FIX" + }> <#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": { @@ -38,7 +42,7 @@ "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}" }, - "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", + "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", "Movement": { "DateTime": { diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index d495402..66effc7 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.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> @@ -15,37 +15,37 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign item = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign item = JsonUtil.jsonToMap(dataRfx)> + [ { <#if item.logistical_variant_list?? > - <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaItm_ItemCreated.ftl"> + "datas" : + <#include "RFXtoRP_HsaItm_ItemCreated.ftl"> <#else> <#stop "no LV for the item"> } ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign item = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign item = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaItm_ItemDeleted.ftl"> + "datas" : + <#include "RFXtoRP_HsaItm_ItemDeleted.ftl"> } - ] + ] <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaItmLv.ftl b/RFXtoRP_HsaItmLv.ftl index 2b91ca2..4b914aa 100644 --- a/RFXtoRP_HsaItmLv.ftl +++ b/RFXtoRP_HsaItmLv.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> @@ -15,31 +15,31 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign lv = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign lv = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantUpdated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl"> + "datas" : + <#include "RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl"> } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign lv = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign lv = JsonUtil.jsonToMap(dataRfx)> + [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemLogisticVariantRemoved> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl"> + "datas" : + <#include "RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl"> } - ] - <#break> + ] + <#break> <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index a8ce5c9..c2d33a9 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -24,7 +24,9 @@ <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">, <#-- Item Photo URI could be added here --> - <#--"PhotoURI": " ", --> + <#if item.url?? && item.url!=""> + "PhotoURI": "${item.url?json_string}", + <#-- Loop for the Logistical Variants - LV --> <#if item.logistical_variant_list??> diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl new file mode 100644 index 0000000..635e62b --- /dev/null +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -0,0 +1,40 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#stop> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ + { + + } + ] + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE *************************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ + { + + } + ] + <#break> + + <#default> + <#stop > + \ No newline at end of file diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 99a4993..87d072c 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -72,10 +72,10 @@ <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> - <#stop "event not supported (case D)"> + <#stop > <#break> <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaSup.ftl b/RFXtoRP_HsaSup.ftl index 52fe20f..7250b4e 100644 --- a/RFXtoRP_HsaSup.ftl +++ b/RFXtoRP_HsaSup.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,33 +14,33 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign actor = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign actor = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaSup_ActorCreated.ftl"> + "datas" : + <#include "RFXtoRP_HsaSup_ActorCreated.ftl"> } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign actor = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign actor = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaSup_ActorDeleted.ftl"> + "datas" : + <#include "RFXtoRP_HsaSup_ActorDeleted.ftl"> } - ] + ] <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 4a48aec..23a560c 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?trim?json_string}" + "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}" }, - "Payload": { "Name": "${actor.designation?json_string}", "ManagedStock": false, @@ -14,9 +16,7 @@ <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - <#-- <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">, - --> "Address": { @@ -31,7 +31,7 @@ <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) /> <#if isCountryCode> "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}", - <#else> + <#else> "CountryCode" : "", "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", @@ -44,7 +44,7 @@ "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}", - "CountryCode" : "" + "CountryCode" : "" diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index 6fbfb45..9c00b09 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?trim?json_string}" + "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}" }, - "Payload": {} } ] diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl new file mode 100644 index 0000000..635e62b --- /dev/null +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -0,0 +1,40 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#stop> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ + { + + } + ] + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE *************************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ + { + + } + ] + <#break> + + <#default> + <#stop > + \ No newline at end of file diff --git a/RFXtoRP_HsrDepot.ftl b/RFXtoRP_HsrDepot.ftl index 08a4082..cd822b3 100644 --- a/RFXtoRP_HsrDepot.ftl +++ b/RFXtoRP_HsrDepot.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,33 +14,33 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign depot = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrDepot_ActorCreated.ftl"> + "datas" : + <#include "RFXtoRP_HsrDepot_ActorCreated.ftl"> } - ] + ] <#break> - + <#case "D"> <#-- *********************************************** Action = DELETE *************************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign depot = JsonUtil.jsonToMap(dataRfx)> - [ + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrDepot_ActorDeleted.ftl"> + "datas" : + <#include "RFXtoRP_HsrDepot_ActorDeleted.ftl"> } - ] + ] <#break> - - + + <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 86379b1..e64bb6b 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code?trim?json_string}" + "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}" }, - "Payload": { "Name": "${depot.physical_depot_designation?json_string}", "ManagedStock": true, @@ -14,9 +16,9 @@ <#-- ***Partner ID could be added here *** --> <#-- "PartnerID": "${}", --> - <#-- + <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">, - --> + "Address": { @@ -39,17 +41,20 @@ <#-- if Reflex WMS address is not structured --> <#else> + <#if depot.physical_depot_address??> "Name": "${depot.physical_depot_address.company_name?json_string}", "StreetAddressOne" : "${depot.physical_depot_address.address_1?json_string}", "StreetAddressTwo" : "${depot.physical_depot_address.address_2?json_string}", "StreetAddressThree" : "${depot.physical_depot_address.address_3?json_string}", - "CountryCode" : "" + "CountryCode" : "" + - }, - "Phones": ["${depot.physical_depot_address.telephone?json_string}", - "${depot.physical_depot_address.other_number?json_string}" - ], + <#if depot.physical_depot_address??> + "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 d4e070a..2f59741 100644 --- a/RFXtoRP_HsrDepot_ActorDeleted.ftl +++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl @@ -1,12 +1,14 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code?trim?json_string}" + "RefID": "${RFXtoRPprefixDepot(depot.physical_depot_code?trim?json_string)}" }, - "Payload": {} } ] diff --git a/RFXtoRP_HsrLoadInfo.ftl b/RFXtoRP_HsrLoadInfo.ftl new file mode 100644 index 0000000..635e62b --- /dev/null +++ b/RFXtoRP_HsrLoadInfo.ftl @@ -0,0 +1,40 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#stop> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ + { + + } + ] + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE *************************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign depot = JsonUtil.jsonToMap(dataRfx)> + [ + { + + } + ] + <#break> + + <#default> + <#stop > + \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index f7834cc..d9afb7f 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -50,20 +50,19 @@ <#assign refIDHmap ={}> <#assign hd_numberHmap ={}> + <#assign hd_numberHmapHUadded ={}> <#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!=""> - <#if !hd_numberHmap[despatched_ipg.hd_number]?? > - <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } - + <#if !hd_numberHmap[despatched_ipg.hd_number]?? > + <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#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 > , @@ -79,6 +78,17 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> } + <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??> + <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> + } + + @@ -92,9 +102,9 @@ <#break> <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> -<#stop "event not supported (Case D)"> +<#stop> <#break> <#default> -<#stop "event not supported"> +<#stop> \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index ca87415..112037e 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> @@ -18,7 +19,7 @@ }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" + "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" } <#-- Add transport grade code <#if preparationOrder.transport_grade_code!=""> diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl index 22d1c4d..9f6c877 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl @@ -2,8 +2,6 @@ <#-- "MetaData" :[ - - ] - +] --> "MetaData": [ ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl index e3a46d3..0d28cf4 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl @@ -15,7 +15,7 @@ "Value": { "String" : "no batch"} <#else> "Value": { "String" : "${despatched_ipg.batch_number}"} - + }, { "Key": "HeldForSpecificCode", @@ -24,15 +24,14 @@ <#else> "Value": { "Bool" : "False"} }, - { - <#assign manufacturing_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> + <#assign manufacturing_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> "Key": "ManufacturingDate", "Value": "Timestamp": { "AuthorTimeZone": "${time_zone_rfx}", "DateTime": "${manufacturing_date}" } - } + } ] diff --git a/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl new file mode 100644 index 0000000..f6c8deb --- /dev/null +++ b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl @@ -0,0 +1,27 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> +[ +<#assign dispatched_datetime5 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID":"${despatched_ipg.hd_number}", + "RefDate": { + "DateTime": "${dispatched_datetime5}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + "HandlingunitID": "${despatched_ipg.hd_number}" + <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > + , + "HUCarrier":{ + "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" + } + + } + } +] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index b5e3f74..a8ff88b 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -1,4 +1,6 @@ +<#include "ReflexUtils.ftl"> <#include "HfRpConfig.ftl"> +<#include "ActorPrefix.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> @@ -74,7 +76,7 @@ "Goods": { "ItemID": "${preparation_line.item_code?trim?json_string}", "LVBranchID": "${preparation_line.item_lv_code?json_string}", - + <#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}", @@ -116,16 +118,15 @@ <#else> "LineID": "${preparation_line.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} + "ActorID": "${RFXtoRPprefixDepot(preparationOrder.physical_depot_code?trim?json_string)}", + "Quantity": { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": ${despatched_ipg.quantity_lvs} } } ] } - }<#sep>, <#sep>, diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 7a41e47..96a5905 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> @@ -18,7 +19,7 @@ }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" + "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" } } } diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 584a500..de29490 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> [ <#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> { @@ -7,11 +8,20 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", + <#if despatched_ipg.consignment_unit_id!=""> + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", + <#else> + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID":"${despatched_ipg.carton_number}", + <#else> + "RefID":"${despatched_ipg.hd_number}", + + + "RefDate": { "DateTime": "${dispatched_datetime4}", "AuthorTimeZone": "${time_zone_rfx}" - } + } }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> @@ -22,9 +32,8 @@ <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > , "HUCarrier":{ - "ActorID": "${preparationOrder.load_data.carrier_code?json_string}" - } - + "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" + } } } diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 3258db3..1ef9917 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -28,18 +28,18 @@ "datas" : <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> } - <#else> - <#stop "preparation order already confirmed"> + <#else> + <#-- preparation order already confirmed --> + <#stop> <#else> - <#stop "preparation order type not supported"> + <#-- preparation order type not supported --> + <#stop> <#else> <#stop "PRO reference is empty"> - - ] <#break> @@ -63,6 +63,6 @@ <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index a4d6321..53f554a 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> [ { <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) /> @@ -26,7 +27,7 @@ "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}", --> "ShipFrom": { - "ActorID": "${preparation_order.physical_depot_code?trim?json_string}" + "ActorID": "${RFXtoRPprefixDepot(preparation_order.physical_depot_code?trim?json_string)}" }, "ShipFromAcked": true, "ShipTo": { @@ -48,7 +49,7 @@ preparation_order.address.territorial_division_code == "" && preparation_order.address.postal_code == "" && preparation_order.address.iso_country_code == ""> - "ActorID": "${preparation_order.end_consignee_code?trim?json_string}" + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" <#else> "Actor": { @@ -89,7 +90,6 @@ <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">, - "RequestedContent": { "Goods": @@ -100,10 +100,8 @@ <#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" : { @@ -115,7 +113,6 @@ ], - "RequestedMilestones" : { "RequestedDeliveryDateTime" : diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index d25cd93..18279c7 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -98,6 +98,6 @@ <#default> - <#stop "event not supported"> + <#stop > diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index d941559..b5568df 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -1,5 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> [ { <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) /> @@ -25,19 +26,21 @@ "ShipFrom": { - "ActorID": "${receipt.original_code?trim?json_string}" + "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" }, "ShipTo" : { - "ActorID": "${receipt.physical_depot_code?trim?json_string}" + "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" }, "ShipToAcked": true, <#if receipt.carrier_informations.carrier_code != ""> - "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"}, + "Carrier": + { + "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" + }, - <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index 9e657f1..f48b2b9 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -22,22 +22,21 @@ "AuthorTimeZone": "${time_zone_rfx}" }, "TechMessage": { - "Code": "${restResponsetMsg.status}", + "Code": "${restResponsetMsg.status!"no Code"}", "Label": ${strJsonBody} }, "UserMessage": { - "Code": "${restResponsetMsg.status}", + "Code": "${restResponsetMsg.status!"no Code"}", "Label": ${strJsonBody}, "Params": [] }, "DetailElements": [], - "CorrelationID": "${id.correlationid}", - "ContextPayload": "rfxresponse", + "CorrelationID": "${id.correlationid!"no Correlationid"}", + "ContextPayload": ${strJsonBody}, "Type": "RP_EXECUTIONFLOW_EVENT", - "Task": "${id.apiRestReflexID}", - "OriginalID": "${id.refid?trim?json_string}", + "Task": "${id.apiRestReflexID!"no Task"}", + "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "StackTrace": "" } } -] - +] \ No newline at end of file diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 69983ef..489cedb 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -4,16 +4,57 @@ <#-- organisation : organisationtId in ReflexPlatform --> <#assign restResponsetMsg = JsonUtil.jsonToMap(input)> -<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id)> +<#assign id = JsonUtil.jsonToMap(restResponsetMsg.id!"{}")> <#assign projectRP = project> <#assign organisationRP = organisation> <#assign aDateTime = .now> +<#assign no_apiRestReflexID = "no apiRestReflexID"> +<#assign no_status = -99999> -<#switch id.apiRestReflexID> + +<#switch id.apiRestReflexID!no_apiRestReflexID> + <#case no_apiRestReflexID> + [ + { + <#if restResponsetMsg.body?? > + <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#else> + <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" /> + + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + } + ] + <#break> + <#case "preparation_orders_post"> - <#switch restResponsetMsg.status> + <#switch restResponsetMsg.status!no_status> + <#case no_status> + [ + { + <#if restResponsetMsg.body?? > + <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#else> + <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" /> + + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_RestResponseAllocationError.ftl"> + } + ] + <#break> + <#case 200> <#case 201> <#-- *********************************************** ApiRestID = preparation_orders_post ******************** --> @@ -63,7 +104,7 @@ <#if restResponsetMsg.body?? > <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#else> - <#assign restResponseBody = "{}" /> + <#assign restResponseBody = "${restResponsetMsg?trim?json_string}}" /> <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -81,7 +122,29 @@ <#break> <#case "receipts_post"> - <#switch restResponsetMsg.status> + <#switch restResponsetMsg.status!no_status> + <#case no_status> + [ + { + <#if restResponsetMsg.body?? > + <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#else> + <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" /> + + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_PlatformLogCreate.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_RestResponseAllocationError.ftl"> + } + ] + <#break> + <#case 200> <#case 201> <#-- *********************************************** ApiRestID = receipts_post ******************** --> @@ -121,7 +184,7 @@ <#if restResponsetMsg.body?? > <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#else> - <#assign restResponseBody = "{}" /> + <#assign restResponseBody = "${restResponsetMsg?trim?json_string}" /> <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -137,7 +200,6 @@ ] <#break> - <#default> <#stop> diff --git a/RFXtoRP_RestResponseAllocationError.ftl b/RFXtoRP_RestResponseAllocationError.ftl index 56626f1..1a31357 100644 --- a/RFXtoRP_RestResponseAllocationError.ftl +++ b/RFXtoRP_RestResponseAllocationError.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${id.refid?trim?json_string}", + "RefID": "${id.refid!"no RefID"?trim?json_string}", "RefDate": { "DateTime": "${aDateTime?iso_utc}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index 36b9cb8..d89dac8 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -4,40 +4,40 @@ <#noparse> <#-- if LVID is egal to **quantity_in_base_lv** keyword then LVID is egal to base VL of the item --> - <#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" > - <#assign rfx_date_format_default = "yyyy-MM-dd" > +<#assign quantity_in_base_lv_RP_Cst = "**quantity_in_base_lv**" > +<#assign rfx_date_format_default = "yyyy-MM-dd" > - <#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}> - <#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}> - <#assign area_unit_KV_rfx = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}> - <#assign volume_unit_KV_rfx = {"MM³":"CUBIC_MILLIMETER","CM³":"CUBIC_CENTIMETER","DM³":"CUBIC_DECIMETER","M³":"CUBIC_METER","CI":"CUBIC_INCH","CF":"CUBIC_FOOT","CY":"CUBIC_YARD","ML":"MILLI_LITER","CL":"CENTI_LITER","DL":"DECI_LITER","LIT":"LITER","HL":"HECTO_LITER","FT":"US_FLUID_OUNCE","USG":"US_GAL","PI":"IMPERIAL_PINT","GL":"IMPERIAL_GAL"}> +<#assign length_unit_KV_rfx = {"MET":"MILLIMETER","CM":"CENTIMETER","MM":"METER","DM":"DECIMETER","KM":"KILOMETER","MIL":"MILE","YAR":"YARD","INC":"INCH","FT":"FOOT"}> +<#assign weight_unit_KV_rfx = {"GR":"GRAMME","DG":"DECIGRAM","KG":"KILOGRAM","TON":"TONNE","OCE":"ONCE","LTO":"LONG_TON","STO":"SHORT_TON","PND":"POUND"}> +<#assign area_unit_KV_rfx = {"MM²":"SQUARE_MILLIMETER","CM²":"SQUARE_CENTIMETER","DM²":"SQUARE_DECIMETER","M²":"SQUARE_METER","SQI":"SQUARE_INCH","SQF":"SQUARE_FOOT","SQY":"SQUARE_YARD"}> +<#assign volume_unit_KV_rfx = {"MM³":"CUBIC_MILLIMETER","CM³":"CUBIC_CENTIMETER","DM³":"CUBIC_DECIMETER","M³":"CUBIC_METER","CI":"CUBIC_INCH","CF":"CUBIC_FOOT","CY":"CUBIC_YARD","ML":"MILLI_LITER","CL":"CENTI_LITER","DL":"DECI_LITER","LIT":"LITER","HL":"HECTO_LITER","FT":"US_FLUID_OUNCE","USG":"US_GAL","PI":"IMPERIAL_PINT","GL":"IMPERIAL_GAL"}> - + - <#noparse><#assign length_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"> - <#noparse><#assign distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"> - <#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"> - <#noparse><#assign weight_unit_rfx = weight_unit_KV_rfx["${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"> - <#noparse><#assign area_unit_rfx = area_unit_KV_rfx["${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"> - <#noparse><#assign volume_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"> - <#noparse><#assign number_of_litres_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"> +<#noparse><#assign length_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.length}"<#noparse>]!"CENTIMETER"> +<#noparse><#assign distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.distance}"<#noparse>]!"CENTIMETER"> +<#noparse><#assign transport_distance_unit_rfx = length_unit_KV_rfx["${file.measurement_unit.transport_distance}"<#noparse>]!"CENTIMETER"> +<#noparse><#assign weight_unit_rfx = weight_unit_KV_rfx["${file.measurement_unit.weight}"<#noparse>]!"KILOGRAM"> +<#noparse><#assign area_unit_rfx = area_unit_KV_rfx["${file.measurement_unit.area}"<#noparse>]!"SQUARE_METER"> +<#noparse><#assign volume_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.volume}"<#noparse>]!"CUBIC_DECIMETER"> +<#noparse><#assign number_of_litres_unit_rfx = volume_unit_KV_rfx["${file.measurement_unit.litres_number}"<#noparse>]!"CUBIC_DECIMETER"> - <#noparse><#assign time_zone_rfx = "${file.author_time_zone!"UTC"}<#noparse>"> - <#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> +<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"UTC"}<#noparse>"> +<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> - <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project> - <#noparse><#assign text_language_rfx = "${reflex_platform_project.text_language!"en"}<#noparse>"> +<#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project> +<#noparse><#assign text_language_rfx = "${reflex_platform_project.text_language!"en"}<#noparse>"> <#list file.reflex_platform_project_list?filter(j -> j.name == projectRP) as reflex_platform_project_uniqueness> <#if reflex_platform_project_uniqueness.site_code_unicity??> <#noparse><#assign uniqueness = ${reflex_platform_project_uniqueness.site_code_unicity?c}<#noparse>> <#else> - <#noparse><#assign uniqueness = false<#noparse>> +<#noparse><#assign uniqueness = false<#noparse>> diff --git a/RPtoRFX_ExecutionflowEvent.ftl b/RPtoRFX_ExecutionflowEvent.ftl index 95d8132..89519e8 100644 --- a/RPtoRFX_ExecutionflowEvent.ftl +++ b/RPtoRFX_ExecutionflowEvent.ftl @@ -5,7 +5,7 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign eventRP = JsonUtil.jsonToMap(input)> +<#assign eventRP = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> @@ -24,28 +24,28 @@ <#if executionflow.MetaData??> <#assign Header_MetaData_Map = JsonUtil.sequenceToMap(executionflow.MetaData, "Key", "Value") /> - - [ - <#if eventRP.partnerAppRole == "ShipFrom" && executionflow.ShipFrom.ActorID != "" && executionflow.ShipFrom.Actor.IsShipFromConnected?? && executionflow.ShipFrom.Actor.IsShipFromConnected> + + [ + <#if eventRP.partnerAppRole == "ShipFrom" && executionflow.ShipFrom.ActorID != "" && executionflow.ShipFrom.Actor.IsShipFromConnected?? && executionflow.ShipFrom.Actor.IsShipFromConnected> { - <#assign apiRestReflexID = ApiRestReflexID.preparation_orders_post> + <#assign apiRestReflexID = ApiRestReflexID.preparation_orders_post> "apiRestReflexID" : "${apiRestReflexID}", - "datas" : - <#include "RPtoRFX_PrepOrder.ftl"> + "datas" : + <#include "RPtoRFX_PrepOrder.ftl"> } - <#if eventRP.partnerAppRole == "ShipTo" && executionflow.ShipTo.ActorID != "" && executionflow.ShipTo.Actor.IsShipToConnected?? && executionflow.ShipTo.Actor.IsShipToConnected> + <#if eventRP.partnerAppRole == "ShipTo" && executionflow.ShipTo.ActorID != "" && executionflow.ShipTo.Actor.IsShipToConnected?? && executionflow.ShipTo.Actor.IsShipToConnected> { - <#assign apiRestReflexID = ApiRestReflexID.receipts_post> + <#assign apiRestReflexID = ApiRestReflexID.receipts_post> "apiRestReflexID" : "${apiRestReflexID}", - "datas" : - <#include "RPtoRFX_Receipt.ftl"> + "datas" : + <#include "RPtoRFX_Receipt.ftl"> } - ] + ] <#break> <#default> - <#stop "Event not processed"> + <#stop > diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 074fefd..0debca9 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -1,4 +1,6 @@ <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl"> +<#include "ActorPrefix.ftl"> +<#include "HfRpConfig.ftl"> <#-- Valeurs par défaut Adresse --> <#-- Default values --> <#assign typecode ="010"> @@ -9,7 +11,7 @@ <#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature --> <#assign defaultactor ="VIZ"> <#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!=""> - <#assign actorID = executionflow.ShipTo.ActorID > + <#assign actorID = "${RPtoRFXprefixConsignee(executionflow.ShipTo.ActorID)}" > <#else> <#assign actorID = defaultactor > @@ -20,7 +22,7 @@ "method" : "POST", "uri_substitutions": { "activity_code": "${activity_code}", - "physical_depot_code": "${executionflow.ShipFrom.ActorID}", + "physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipFrom.ActorID)}", "originator_code": "${originator_code}" }, "payload" : diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 838293a..763cf12 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -1,4 +1,6 @@ <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl"> +<#include "ActorPrefix.ftl"> +<#include "HfRpConfig.ftl"> { "id" : {"refid" : "${executionflow.OrderID?json_string}"}, @@ -6,7 +8,7 @@ "method" : "POST", "uri_substitutions": { "activity_code": "${activity_code}", - "physical_depot_code": "${executionflow.ShipTo.ActorID!""}", + "physical_depot_code": "${RPtoRFXprefixDepot(executionflow.ShipTo.ActorID!"")}", "originator_code": "${originator_code}" }, "payload" : @@ -15,8 +17,8 @@ "receipt_type": "${receipt_type}", "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", - "original_code" : "${executionflow.ShipFrom.ActorID}", - "carrier_code" : "${executionflow.Carrier.ActorID!""}", + "original_code" : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}", + "carrier_code" : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", diff --git a/RPtoRFX_Receipt_DefaultLineData.ftl b/RPtoRFX_Receipt_DefaultLineData.ftl index 112da79..8c09d53 100644 --- a/RPtoRFX_Receipt_DefaultLineData.ftl +++ b/RPtoRFX_Receipt_DefaultLineData.ftl @@ -2,7 +2,7 @@ <#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map --> <#-- How to use MD or SK map - Example : + Example : <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/> If your SK is : diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index b7071f6..afa299e 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -17,14 +17,14 @@ <#function splitEmailsIntoArray emails > <#local str = "["> <#list emails?split(";|,| |à|/","r")?filter(l -> l != "") as email> -<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")> -<#if str != "["> +<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")> +<#if str != "["> <#local str += ","> <#local str += "\""> <#local str += email> <#local str += "\""> - + <#local str += "]"> <#return (str)> diff --git a/Table.ftl b/Table.ftl new file mode 100644 index 0000000..f9bce7b --- /dev/null +++ b/Table.ftl @@ -0,0 +1,15 @@ +<#-- Table criticality --> +<#assign TableCriticality = { + "1": "CLAIM_CRITICALITY_LOW", + "2":"CLAIM_CRITICALITY_MEDIUM", + "3":"CLAIM_CRITICALITY_HIGH", + "4":"CLAIM_CRITICALITY_BLOCKING" + }> + + <#-- Table Amount --> +<#assign TableAmount = { + "$": "USD", + "£":"GBP", + "DH":"MAD" + }> + From bf0ae15a504100d3ce0fb96c13a0af170dcd1118 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 4 Dec 2024 09:05:53 +0100 Subject: [PATCH 111/147] Release 1.2.30+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a52b95a..a3a67f6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.29+4 +1.2.30+1 From 08e4b04f7f8bb1135c7cdd82d51a77959ac45efd Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 13 Dec 2024 15:34:11 +0100 Subject: [PATCH 112/147] Release 1.2.31+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index a3a67f6..ec97bde 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.30+1 +1.2.31+1 From 432cca8ec9e056ff8d95fe166173b2c2b94cc582 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 12 Feb 2025 10:24:01 +0100 Subject: [PATCH 113/147] Release 1.2.32+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ec97bde..3c5ca2f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.31+1 +1.2.32+1 From fab2238278b89d1f5646b9752e7cd12109b265ed Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 18 Feb 2025 09:35:16 +0100 Subject: [PATCH 114/147] SCPN1-8383 --- RFXtoRP_HsaIpgMove.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 0582ada..9884ec8 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -31,7 +31,8 @@ reflexMvtStockInterface.ipg_move_type == "420" || reflexMvtStockInterface.ipg_move_type == "455" || reflexMvtStockInterface.ipg_move_type == "460" || - reflexMvtStockInterface.ipg_move_type == "465" + reflexMvtStockInterface.ipg_move_type == "465" || + (reflexMvtStockInterface.ipg_move_type == "520" && reflexMvtStockInterface.ipg_move_creation_program == "HFST69") > [ { From 29e16f12ccf567758f054f744bc983f95e9dd7cc Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 18 Feb 2025 10:08:14 +0100 Subject: [PATCH 115/147] Release 1.2.33+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3c5ca2f..0a6be65 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.32+1 +1.2.33+1 From c16c48b2701d47c7feb0ce0201c4bed413ed7de1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 21 Jan 2025 15:41:31 +0100 Subject: [PATCH 116/147] move 520 (cherry picked from commit df2332b17e7f81f56602a2a68a0efb9cbde85806) --- RFXtoRP_HsaIpgMove_StockMoved.ftl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index f45d3c1..d9d0fd7 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -18,7 +18,8 @@ "420":"STOCK_MOVEMENT_TYPE_REQUALIFICATION", "455":"STOCK_MOVEMENT_TYPE_FIX", "460":"STOCK_MOVEMENT_TYPE_FIX", - "465":"STOCK_MOVEMENT_TYPE_FIX" + "465":"STOCK_MOVEMENT_TYPE_FIX", + "520":"STOCK_MOVEMENT_TYPE_OUTBOUND" }> <#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 /> @@ -52,7 +53,11 @@ "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?json_string}", + <#if reflexMvtStockInterface.ipg_move_type == "520" > + "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}", + <#else> + "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}", From 58bcf838bdedf9db0d830893ce82c9a5f6cf3cd7 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 25 Feb 2025 17:42:12 +0100 Subject: [PATCH 117/147] Release 1.2.33+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 0a6be65..29f16f1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.33+1 +1.2.33+2 From d4765890e5aa96140ade0131738c128ae8dd8446 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 4 Mar 2025 14:28:12 +0100 Subject: [PATCH 118/147] SCPN1-8401 (syntaxe error in RXftoRP-HsrPro_ExecutionflowDetected.ftl) (cherry picked from commit 9380d39bb65bc4dcf46c80f711e187721b2f3159) --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 9157f57..ee97306 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -4,7 +4,7 @@ [ { <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) /> - <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezoneWithTimezone(preparation_order.creation_datetime,time_zone_rfx) /> + <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, From 9aee7a9448b27b575c3eeec8f75846138ba7325b Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 6 Mar 2025 16:13:36 +0100 Subject: [PATCH 119/147] SCPN1-8401 (syntaxe error in RXftoRP-HsrReceiptList_ExecutionflowDetected.ftl et RXftoRP-HsrReceiptList_ExecutionflowReceiptComplet.ftl) (cherry picked from commit 2681a4dc2477fbf33e73e1d28dad708968855c94) --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index d00662c..be2fc6a 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -4,7 +4,7 @@ [ { <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> - <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezoneWithTimezone(receipt.creation_datetime,time_zone_rfx) /> + <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index e92a2a5..91390fb 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezoneWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> [ { "Header": { From 1dc77965ced36c5ae2d2bb917f5303d87a0c91c2 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 27 Feb 2025 17:56:12 +0100 Subject: [PATCH 120/147] SCPN1-8401 --- RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl | 2 +- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 2 +- ...oRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl | 8 ++++---- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- RFXtoRP_HsaIpgMove_StockMoved.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_HsrPrepa.ftl | 2 +- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 4 ++-- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- RFXtoRP_RfxConfigurationRp.ftl | 4 ++-- ReflexUtils.ftl | 5 +++++ 24 files changed, 34 insertions(+), 29 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl index e248350..f507c4a 100644 --- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl +++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl @@ -11,7 +11,7 @@ "RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}" }, "Payload": { - <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> + <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) /> "Snapshot": { "EndDateTime": { "DateTime": "${generation_date}", diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index fcf0f0c..4914bac 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -9,7 +9,7 @@ }, "Payload": { "ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}", - <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> + <#assign generation_date = RfxDateTimetoUTCWithTimezone(stock.generation_date,time_zone_rfx) /> "Snapshot": { "DateTime": { "DateTime": "${generation_date}", diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl index a26d58e..9a24817 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl @@ -17,21 +17,21 @@ "Value": { "String" : "no batch"} <#else> "Value": { "String" : "${stock.batch_1}"} - + }, { "Key": "HeldForSpecificCode", "Value": { "Bool" : "${stock.held_for_specific_code}"} }, - + { - <#assign manufacturing_datetime = RfxDateTimetoUTC(stock.Date_of_manufacture,time_zone_offset_rfx) /> + <#assign manufacturing_datetime = RfxDateTimetoUTCWithTimezone(stock.Date_of_manufacture,time_zone_rfx) /> "Key": "ManufacturingDate", "Value": "Timestamp": { "AuthorTimeZone": "${time_zone_rfx}", "DateTime": "${manufacturing_datetime}" } - } + } ] --> diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 8653828..8ab1721 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -2,7 +2,7 @@ <#include "ReflexUtils.ftl"> <#include "ActorPrefix.ftl"> [ - <#assign receipt_confirmation_datetime = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> + <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) /> <#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> { "Header": { diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index d9d0fd7..8077536 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -21,7 +21,7 @@ "465":"STOCK_MOVEMENT_TYPE_FIX", "520":"STOCK_MOVEMENT_TYPE_OUTBOUND" }> -<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> +<#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) /> <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> [ { diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index 0a1b945..db1899a 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) /> [ { diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 7f9c79a..04c48ae 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 7f9c79a..04c48ae 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 7f9c79a..04c48ae 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 7f9c79a..04c48ae 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(preparationStatusInterface.preparation_status_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparationStatusInterface.preparation_status_datetime,time_zone_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index d9afb7f..cda3dab 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -53,7 +53,7 @@ <#assign hd_numberHmapHUadded ={}> <#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) /> + <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> <#if !hd_numberHmap[despatched_ipg.hd_number]?? > <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> , diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 1a780d5..4b7da84 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -1,7 +1,7 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ -<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> +<#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> diff --git a/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl index f6c8deb..1adfad0 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl @@ -2,7 +2,7 @@ <#include "ReflexUtils.ftl"> <#include "ActorPrefix.ftl"> [ -<#assign dispatched_datetime5 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> +<#assign dispatched_datetime5 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index a1b31be..7a6abd1 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -1,7 +1,7 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ -<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> +<#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index a8ff88b..8aed82c 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -4,7 +4,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 packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) /> + <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index de29490..e88a3b0 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -2,7 +2,7 @@ <#include "ReflexUtils.ftl"> <#include "ActorPrefix.ftl"> [ -<#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> +<#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> { "Header": { "ProjectID": "${projectRP}" diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 9cdd1b6..b518fa7 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign preparation_status_datetime = RfxDateTimetoUTC(preparation_order.modification_datetime,time_zone_offset_rfx) /> +<#assign preparation_status_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.modification_datetime,time_zone_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 53f554a..ee97306 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -3,8 +3,8 @@ <#include "ActorPrefix.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) /> + <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.planned_final_delivery_start_datetime,time_zone_rfx) /> + <#assign pro_creation_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.creation_datetime,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 46a8692..e262117 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.modification_datetime,time_zone_offset_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> [ { diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index b5568df..be2fc6a 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -3,8 +3,8 @@ <#include "ActorPrefix.ftl"> [ { - <#assign receipt_datetime = RfxDateTimetoUTC(receipt.receipt_datetime,time_zone_offset_rfx) /> - <#assign receipt_creation_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> + <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> + <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> "Header": { "ProjectID": "${projectRP}" }, diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 485a5c5..91390fb 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.confirmation_datetime,time_zone_offset_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> [ { "Header": { diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 65f257c..23cf130 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTC(receipt.creation_datetime,time_zone_offset_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> [ { diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index d89dac8..1b19bf7 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -25,8 +25,8 @@ -<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"UTC"}<#noparse>"> -<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> +<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"Europe/Paris"}<#noparse>"> +<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+01:00"}<#noparse>"> <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project> diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index afa299e..7bc33f6 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -9,6 +9,11 @@ <#return dateutc?datetime.iso?iso_nz(locale)> +<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone> + <#setting time_zone=timezone> + <#return (rfxdatetime?datetime.iso?iso_utc)> + + <#-- --------------------------------------------------------------------------------------- --> <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" --> From 810e0eaa89bc7c963f8e44cc500cb70b5693b138 Mon Sep 17 00:00:00 2001 From: frea Date: Fri, 7 Mar 2025 14:16:54 +0100 Subject: [PATCH 121/147] SCPN1-8401 (cherry picked from commit 0cec20a8aa91ce5d958a9d6087d4778f86f2c5fd) --- RFXtoRP_RfxConfigurationRp.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_RfxConfigurationRp.ftl b/RFXtoRP_RfxConfigurationRp.ftl index d89dac8..1b19bf7 100644 --- a/RFXtoRP_RfxConfigurationRp.ftl +++ b/RFXtoRP_RfxConfigurationRp.ftl @@ -25,8 +25,8 @@ -<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"UTC"}<#noparse>"> -<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+00:00"}<#noparse>"> +<#noparse><#assign time_zone_rfx = "${file.author_time_zone!"Europe/Paris"}<#noparse>"> +<#noparse><#assign time_zone_offset_rfx = "${file.time_zone_offset!"+01:00"}<#noparse>"> <#list file.reflex_platform_project_list?filter(l -> l.name == projectRP) as reflex_platform_project> From a849b1c92e38abe8bb1d31e6827d0feee60520d5 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 12 Mar 2025 15:05:01 +0100 Subject: [PATCH 122/147] update URL in readme.md (cherry picked from commit 596394863581bf2ad87a33641dfb96a5a5f0eb61) --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index d20fd83..6606269 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Reflex Platform Core FTLs - + These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API. - -You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/ - +You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/ + + From 18808b6033f8f807b52c5851b11a8069a69ff766 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 10:01:06 +0100 Subject: [PATCH 123/147] modifs Claim_order --- RFXtoRP_HsaDispute_Created.ftl | 41 +++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index c85da89..620007e 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,26 +39,35 @@ "Value": "${dispute.dispute_amount}" }, - <#if dispute.dispute_type_code=="050" > - <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - <#else> - <#stop "preparation order list is empty" > - - <#else> - <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - <#else> - <#stop "Type not supported" > - - <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}" + <#if dispute.dispute_type_code=="050" > + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Reason code not supported"> + + <#else> + <#stop "Preparation order list is empty"> + <#else> - <#stop "Claim reason code not supported" > + <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > + <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> + "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Reason code not supported"> + + <#else> + <#stop "Reception reference is empty"> + + <#else> + <#stop "Type not supported"> + From 5b3de10184da87b957d4dcf92d99fd318675db45 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 10:27:05 +0100 Subject: [PATCH 124/147] modif claim --- RFXtoRP_HsaDispute_Created.ftl | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 620007e..4d6ebb5 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,41 +39,29 @@ "Value": "${dispute.dispute_amount}" }, - <#-- To configure --> - <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> - <#if dispute.dispute_type_code=="050" > <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - <#else> - <#stop "Preparation order list is empty"> + <#stop "preparation order list is empty" > <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> - "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - - <#else> - <#stop "Reception reference is empty"> - + "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", <#else> - <#stop "Type not supported"> + <#stop "Type not supported" > + <#-- To configure --> + <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> + + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Claim reason code not supported" > + } } ] - - - From 9f63f0ee6229e514c469a8b56925457d7d290f26 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 13 Mar 2025 10:35:14 +0100 Subject: [PATCH 125/147] Modifs Claim --- RFXtoRP_HsaDispute_Created.ftl | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index fb66661..499d4f4 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -47,18 +47,26 @@ <#if TableReasonCode[dispute.dispute_reason_code]??> "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" <#else> - <#stop "preparation order list is empty" > + <#stop "Reason code not supported"> + <#else> + <#stop "Preparation order list is empty"> <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> + "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + <#else> + <#stop "Reason code not supported"> + <#else> - <#stop "Type not supported" > + <#stop "Reception reference is empty"> + <#else> + <#stop "Type not supported"> } } From eb6182c337e9cb84bdccc7e3948c4f9c1dd02e5a Mon Sep 17 00:00:00 2001 From: freat Date: Thu, 13 Mar 2025 10:38:21 +0100 Subject: [PATCH 126/147] Release 1.2.33+3 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 29f16f1..98e68e4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.33+2 +1.2.33+3 From dec9a4b17fe8c70b4ca9d52067f1314df7a93bca Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 19 Mar 2025 10:38:29 +0100 Subject: [PATCH 127/147] displayID --- RFXtoRP_HsaDispute_Created.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 499d4f4..70709ce 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -26,6 +26,7 @@ "Title":"", "Criticality":"${TableCriticality[dispute.dispute_criticity]}", + "DisplayID":"${dispute.dispute_reference?trim?json_string}", "Amount": { <#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) /> <#if isCurrencyCode> From 1be67f65b2f2b7512298ec5800209d19be767367 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 19 Mar 2025 10:41:13 +0100 Subject: [PATCH 128/147] modif --- RFXtoRP_HsaDispute_Created.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 70709ce..499d4f4 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -26,7 +26,6 @@ "Title":"", "Criticality":"${TableCriticality[dispute.dispute_criticity]}", - "DisplayID":"${dispute.dispute_reference?trim?json_string}", "Amount": { <#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) /> <#if isCurrencyCode> From 8ee7527ba4e01017073183ec99a8db8b0fc625c0 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 19 Mar 2025 10:52:07 +0100 Subject: [PATCH 129/147] SCPN1-8483 --- ReflexUtils.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index 7bc33f6..afa299e 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -9,11 +9,6 @@ <#return dateutc?datetime.iso?iso_nz(locale)> -<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone> - <#setting time_zone=timezone> - <#return (rfxdatetime?datetime.iso?iso_utc)> - - <#-- --------------------------------------------------------------------------------------- --> <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" --> From cdc78d71b13e37c3264ae36f18834ad38d85e27d Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 19 Mar 2025 11:16:37 +0100 Subject: [PATCH 130/147] Release 1.2.34+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 98e68e4..33d28f7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.33+3 +1.2.34+1 From 1670a2221858d902768f9b99ee2d43c43fba5e29 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 19 Mar 2025 10:52:07 +0100 Subject: [PATCH 131/147] SCPN1-8483 (cherry picked from commit 8ee7527ba4e01017073183ec99a8db8b0fc625c0) --- ReflexUtils.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index 7bc33f6..afa299e 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -9,11 +9,6 @@ <#return dateutc?datetime.iso?iso_nz(locale)> -<#function RfxDateTimetoUTCWithTimezone rfxdatetime timezone> - <#setting time_zone=timezone> - <#return (rfxdatetime?datetime.iso?iso_utc)> - - <#-- --------------------------------------------------------------------------------------- --> <#-- Split email reflex into json array string --> <#-- Example : splitemail "john.doe@hardis-group.com,; name@hardis-group.com" --> From bcf77601b9126a40b09495dc2f462664577c6eff Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 20 Mar 2025 13:52:24 +0100 Subject: [PATCH 132/147] SCPN1-8496 --- RFXtoRP_HsaCarrier.ftl | 20 -------------------- RFXtoRP_HsaCarrier_ActorCreated.ftl | 3 +++ RFXtoRP_HsaCarrier_ActorDeleted.ftl | 3 +++ RFXtoRP_HsaCons.ftl | 23 +---------------------- RFXtoRP_HsaCons_ActorCreated.ftl | 3 +++ RFXtoRP_HsaCons_ActorDeleted.ftl | 3 +++ RFXtoRP_HsaSup.ftl | 20 -------------------- RFXtoRP_HsaSup_ActorCreated.ftl | 3 +++ RFXtoRP_HsaSup_ActorDeleted.ftl | 3 +++ 9 files changed, 19 insertions(+), 62 deletions(-) diff --git a/RFXtoRP_HsaCarrier.ftl b/RFXtoRP_HsaCarrier.ftl index a724924..6b47034 100644 --- a/RFXtoRP_HsaCarrier.ftl +++ b/RFXtoRP_HsaCarrier.ftl @@ -2,9 +2,6 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#include "ReflexUtils.ftl"> -<#include "HfRpConfig.ftl"> -<#include "ActorPrefix.ftl"> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -18,22 +15,6 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign carrier = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)> - - <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payLoad) /> - <#assign actorRP = JsonUtil.jsonToMap(response)> - <#if actorRP?? && actorRP.Objects?? && actorRP.Objects[0]?? && actorRP.Objects[0].ID.RefID?? > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCarrier_ActorUpdated.ftl"> - } - ] - <#else> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> @@ -42,7 +23,6 @@ <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl"> } ] - <#break> <#case "D"> diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 65876a4..8ac9722 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -1,3 +1,6 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index e3082b4..62b69a2 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -1,3 +1,6 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { diff --git a/RFXtoRP_HsaCons.ftl b/RFXtoRP_HsaCons.ftl index e0fd096..8932eb4 100644 --- a/RFXtoRP_HsaCons.ftl +++ b/RFXtoRP_HsaCons.ftl @@ -2,10 +2,6 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#include "ReflexUtils.ftl"> -<#include "HfRpConfig.ftl"> -<#include "ActorPrefix.ftl"> - <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -19,23 +15,7 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign actor = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixConsignee(actor.code?trim?json_string)> - - <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payLoad) /> - <#assign actorRP = JsonUtil.jsonToMap(response)> - <#if actorRP?? && actorRP.Objects?? && actorRP.Objects[0]?? && actorRP.Objects[0].ID.RefID?? > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaCons_ActorUpdated.ftl"> - } - ] - <#else> - [ + [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -43,7 +23,6 @@ <#include "RFXtoRP_HsaCons_ActorCreated.ftl"> } ] - <#break> <#case "D"> diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 502da80..84df17a 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -1,3 +1,6 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index dd83c6f..89d4fce 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -1,3 +1,6 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { diff --git a/RFXtoRP_HsaSup.ftl b/RFXtoRP_HsaSup.ftl index 309bc71..7250b4e 100644 --- a/RFXtoRP_HsaSup.ftl +++ b/RFXtoRP_HsaSup.ftl @@ -2,9 +2,6 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> -<#include "ReflexUtils.ftl"> -<#include "HfRpConfig.ftl"> -<#include "ActorPrefix.ftl"> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -18,22 +15,6 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign actor = JsonUtil.jsonToMap(dataRfx)> - <#assign refID = RFXtoRPprefixSupplier(actor.code?trim?json_string)> - - <#assign payLoad = '{"Header": {"ProjectID": "${projectRP!""}"},"IDs": [{"RefID": "${refID}"}]}' /> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.ActorGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payLoad) /> - <#assign actorRP = JsonUtil.jsonToMap(response)> - <#if actorRP?? && actorRP.Objects?? && actorRP.Objects[0]?? && actorRP.Objects[0].ID.RefID?? > - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaSup_ActorUpdated.ftl"> - } - ] - <#else> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> @@ -42,7 +23,6 @@ <#include "RFXtoRP_HsaSup_ActorCreated.ftl"> } ] - <#break> <#case "D"> diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 6c57b1f..23a560c 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -1,3 +1,6 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index 0927eca..9c00b09 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -1,3 +1,6 @@ +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> [ { "Header": { From f9c62d5ee4a9782c3000127fe2b2570e9eac42fb Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 20 Mar 2025 17:09:41 +0100 Subject: [PATCH 133/147] SCPN1-8474 (cherry picked from commit 02e8dc2566e1d504b95004d4b480b5519aa8f1d3) --- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 7a6abd1..b7cb7a8 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l ->l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > From eefc7070ac5eb76123e1532dd2fd19533925e260 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 20 Mar 2025 17:28:57 +0100 Subject: [PATCH 134/147] SCPN1-8474 (cherry picked from commit 53c400be4995877955366c54c8ca67d664f77fac) --- RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 4b7da84..c15dc98 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> <#if !refIDHmap[despatched_ipg3.carton_number]?? > <#if refIDHmap?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index b7cb7a8..5fe5ad8 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l ->l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 8aed82c..ea3c72b 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,7 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> [ - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { From 1e9ce7cdc4e374cf5ea2ba69436ea37c24cc3fc4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 20 Mar 2025 18:02:43 +0100 Subject: [PATCH 135/147] claim --- RFXtoRP_HsaDispute.ftl | 13 ++++++++++--- RFXtoRP_HsaDispute_Created.ftl | 29 +++++++++-------------------- 2 files changed, 19 insertions(+), 23 deletions(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 18ea1ec..160f8f9 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -16,13 +16,16 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ - <#if dispute.dispute_closed == true > + <#if dispute.dispute_closed == true > + <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaDispute_Created.ftl"> - }, + } + <#if TableReasonCode[dispute.dispute_reason_code]??> + , { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -30,7 +33,11 @@ <#include "RFXtoRP_HsaDispute_MessageSent.ftl"> } <#else> - <#stop> + <#stop> + + <#else> + <#stop > + ] <#break> diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 499d4f4..335e29b 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -42,31 +42,20 @@ <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > - <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - - <#else> - <#stop "Preparation order list is empty"> - + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" - <#else> - <#stop "Reason code not supported"> - - <#else> - <#stop "Reception reference is empty"> - + <#else> + <#stop "WMS type code not supported"> + + + <#if TableReasonCode[dispute.dispute_reason_code]??> + "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" <#else> - <#stop "Type not supported"> + <#stop "Reason code not supported"> } } From 3a0bbdc479b72094cfe5c9e1e4ef792db10ddf5a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 11:21:59 +0100 Subject: [PATCH 136/147] claim reference empty --- RFXtoRP_HsaDispute.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 160f8f9..8b37074 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -36,7 +36,7 @@ <#stop> <#else> - <#stop > + <#stop "Reference is empty"> ] From c280b2c83a8dd29088d31c1a29746c119476e654 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 14:27:52 +0100 Subject: [PATCH 137/147] hsrdepot --- RFXtoRP_HsrDepot_ActorCreated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index e64bb6b..c64e285 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -55,7 +55,7 @@ "${depot.physical_depot_address.other_number?json_string}" ], - "Typology": "TYPOLOGY_UNKNOWN" + "Typology": "TYPOLOGY_WAREHOUSE" } } ] From 79ad7f53e846b43620ea315717b9e265598505af Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 21 Mar 2025 14:30:15 +0100 Subject: [PATCH 138/147] dispute --- RFXtoRP_HsaDispute_Created.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 335e29b..de64de8 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -47,6 +47,7 @@ <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}", <#else> <#stop "WMS type code not supported"> From 830db1493b137ac13cff1b21740a5ad923602963 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 24 Mar 2025 15:58:33 +0100 Subject: [PATCH 139/147] modifs receipt --- RPtoRFX_Receipt.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 763cf12..905c3bb 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -52,7 +52,6 @@ "batch_1": "${batch_1?json_string!""}", "optional_attributes": { <#--"held_for_check": "false", - "held _for_repacking": "false", "hold_code": "false", --> "hold_for_specific_code": "false" } From 4553507e3bca898e24e2501bac6d3cb7be084fe2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 26 Mar 2025 14:59:09 +0100 Subject: [PATCH 140/147] modifs HU --- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index ea3c72b..bf280b6 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -112,6 +112,7 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, + "OrderID": "${preparation_line.preparation_order_originator_reference?trim?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}", From 2828c01cc4ec20e5ac663b92febdb1590deb8acc Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 26 Mar 2025 15:08:56 +0100 Subject: [PATCH 141/147] modifs HU received --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 8ab1721..0196de8 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -26,15 +26,15 @@ <#else> "PriorityDate": "1970-01-01T00:00:00Z", - <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, - <#if reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", + "OrderID": "${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}", + "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", @@ -47,4 +47,4 @@ } } -] +] \ No newline at end of file From c754edaafbcfd8de6eb476f12f0c0be44e6d7298 Mon Sep 17 00:00:00 2001 From: freat Date: Mon, 7 Apr 2025 12:31:37 +0200 Subject: [PATCH 142/147] Release 1.2.35+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 33d28f7..6f2c18e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.34+1 +1.2.35+1 From 4624bab7ad81da4de4c8f788e162ac14831f7f16 Mon Sep 17 00:00:00 2001 From: freat Date: Tue, 8 Apr 2025 15:41:19 +0200 Subject: [PATCH 143/147] Release 1.2.36+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6f2c18e..3720fb4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.35+1 +1.2.36+1 From 4a26fd92495108bd67f131363b364f1b74c79326 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 9 Apr 2025 10:24:39 +0200 Subject: [PATCH 144/147] Release 1.2.37+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 3720fb4..9b0a54d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.36+1 +1.2.37+1 From 3ca4b61e3baf98e2705a7951d151957050ced0b1 Mon Sep 17 00:00:00 2001 From: frea Date: Wed, 9 Apr 2025 11:44:48 +0200 Subject: [PATCH 145/147] SCPN1-8597 --- README.md | 8 ++-- RFXtoRP_HsaDispute.ftl | 13 ++---- RFXtoRP_HsaDispute_Created.ftl | 25 ++++++----- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 5 +-- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 2 +- RFXtoRP_HsrPrepa.ftl | 23 +++++----- ...rPrepa_HUsAdded_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- ...oRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 3 +- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 45 ++++--------------- RPtoRFX_Receipt.ftl | 1 + 12 files changed, 48 insertions(+), 83 deletions(-) diff --git a/README.md b/README.md index 6606269..d20fd83 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Reflex Platform Core FTLs - + These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API. + +You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/ -You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/ - - + diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 8b37074..18ea1ec 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -16,16 +16,13 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ - <#if dispute.dispute_closed == true > - <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")> + <#if dispute.dispute_closed == true > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaDispute_Created.ftl"> - } - <#if TableReasonCode[dispute.dispute_reason_code]??> - , + }, { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -33,11 +30,7 @@ <#include "RFXtoRP_HsaDispute_MessageSent.ftl"> } <#else> - <#stop> - - <#else> - <#stop "Reference is empty"> - + <#stop> ] <#break> diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index de64de8..4d6ebb5 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,28 +39,29 @@ "Value": "${dispute.dispute_amount}" }, - <#-- To configure --> - <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + <#else> + <#stop "preparation order list is empty" > + <#else> <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - "DisplayID":"${dispute.dispute_reception.reception_reference?trim?json_string}", + "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", <#else> - <#stop "WMS type code not supported"> + <#stop "Type not supported" > + <#-- To configure --> + <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"CLAIMTYPE_${projectRP}_ORDER_${TableReasonCode[dispute.dispute_reason_code]}" + "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}" <#else> - <#stop "Reason code not supported"> + <#stop "Claim reason code not supported" > + + } } ] - - - diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 337563c..8ab1721 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -26,16 +26,15 @@ <#else> "PriorityDate": "1970-01-01T00:00:00Z", + <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, <#if reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", - "OrderID": "${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}", - "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", @@ -48,4 +47,4 @@ } } -] \ No newline at end of file +] diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 1be2932..8077536 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -54,7 +54,7 @@ "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}", "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}", <#if reflexMvtStockInterface.ipg_move_type == "520" > - "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}", + "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}", <#else> "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}", diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index c64e285..e64bb6b 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -55,7 +55,7 @@ "${depot.physical_depot_address.other_number?json_string}" ], - "Typology": "TYPOLOGY_WAREHOUSE" + "Typology": "TYPOLOGY_UNKNOWN" } } ] diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 5bbd320..cda3dab 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -6,7 +6,6 @@ <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> -<#include "RFX_PartnerAPP_Settings.ftl"> <#assign aDateTime = .now> @@ -55,7 +54,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 = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> - <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))> + <#if !hd_numberHmap[despatched_ipg.hd_number]?? > <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> , { @@ -79,16 +78,16 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> } - <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )> - <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> - } - + <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??> + <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> + } + diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index c15dc98..4b7da84 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> <#if !refIDHmap[despatched_ipg3.carton_number]?? > <#if refIDHmap?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 5fe5ad8..7a6abd1 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") 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 !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index bf280b6..8aed82c 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,7 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> [ - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") 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> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { @@ -112,7 +112,6 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "OrderID": "${preparation_line.preparation_order_originator_reference?trim?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}", diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 9f96b31..e88a3b0 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -1,7 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> <#include "ActorPrefix.ftl"> -<#include "RFX_PartnerAPP_Settings.ftl"> [ <#assign dispatched_datetime4 = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> { @@ -9,41 +8,15 @@ "ProjectID": "${projectRP}" }, "ID": { - <#switch trackingNumberSource> - <#case 1> - <#if despatched_ipg.consignment_unit_id!=""> - "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", - - <#break> - <#case 2> - <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID":"${despatched_ipg.carton_number}", - <#else> - "RefID":"${despatched_ipg.hd_number}", - - <#break> - <#case 3> - <#if despatched_ipg.consignment_unit_id!=""> - "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", - <#else> - <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID":"${despatched_ipg.carton_number}", - <#else> - "RefID":"${despatched_ipg.hd_number}", - - - <#break> - <#default> - <#if despatched_ipg.consignment_unit_id!=""> - "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", - <#else> - <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID":"${despatched_ipg.carton_number}", - <#else> - "RefID":"${despatched_ipg.hd_number}", - - - + <#if despatched_ipg.consignment_unit_id!=""> + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", + <#else> + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID":"${despatched_ipg.carton_number}", + <#else> + "RefID":"${despatched_ipg.hd_number}", + + "RefDate": { "DateTime": "${dispatched_datetime4}", diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 905c3bb..763cf12 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -52,6 +52,7 @@ "batch_1": "${batch_1?json_string!""}", "optional_attributes": { <#--"held_for_check": "false", + "held _for_repacking": "false", "hold_code": "false", --> "hold_for_specific_code": "false" } From 9cadf3329e3515870798b770fd1805993a558ce4 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 9 Apr 2025 11:46:44 +0200 Subject: [PATCH 146/147] Release 1.2.37+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 9b0a54d..6f0f778 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.37+1 +1.2.37+2 From a33210827a185ea81baea0ff8669b8e2505a4459 Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 17 Apr 2025 14:13:41 +0200 Subject: [PATCH 147/147] update version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 5de072f..33e6c81 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1+1 \ No newline at end of file +2.0.1+2 \ No newline at end of file