From 293a4fb65c343186a38a75c228112069545f79e1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 16:57:25 +0100 Subject: [PATCH 01/83] 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 0485a637af427785aa95e97e2e279c4a042ecece Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 17:20:54 +0100 Subject: [PATCH 02/83] 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 6b4f7e2ccc4f7fd898738323b87dce69d8e684d2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:43:53 +0100 Subject: [PATCH 03/83] 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 3d9ec5b813fe301e45e6f8feb25fb8b2de33ba36 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:59:25 +0100 Subject: [PATCH 04/83] 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 e093ea7c07e520e394c17fbae01259cb415ef62b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 16:45:11 +0100 Subject: [PATCH 05/83] 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 9bb625bade5794410cb0016b2d86f5f09a1ed322 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 1 Dec 2023 10:20:01 +0100 Subject: [PATCH 06/83] 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 1de8a56410996dcc5d0bd64f20f59134d94e3299 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 8 Dec 2023 12:23:16 +0100 Subject: [PATCH 07/83] modifs lmo --- RFXtoRP_HsrPrepa.ftl | 2 -- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 22 ++++++++++++++++++---- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 2d5075d..1b06b7d 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -32,7 +32,6 @@ } <#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> @@ -40,7 +39,6 @@ "datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> } - diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index dd55a18..332c691 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -7,14 +7,28 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id}" + <#if despatched_ipg.consignment_unit_id!=""> + "RefID": "${despatched_ipg.consignment_unit_id}" + <#else> + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID": "${despatched_ipg.carton_number}" + <#else> + "RefID": "${despatched_ipg.hd_number}" + + }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> - "HandlingunitID": "${despatched_ipg.carton_number}" + "HandlingunitID": "${despatched_ipg.carton_number}", <#else> - "HandlingunitID": "${despatched_ipg.hd_number}" + "HandlingunitID": "${despatched_ipg.hd_number}", + <#if preparationOrder.load_data!="" > + "HUCarrier":{ + "ActorID": "${preparationOrder.load_data.carrier_code}", + + } + } } -] +] \ No newline at end of file From 1ed9617af7524e42d09c7145483dfb2f943f2359 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 11 Dec 2023 13:31:26 +0100 Subject: [PATCH 08/83] Modifs hsrprepa 111223 --- RFXtoRP_HsrPrepa.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 1b06b7d..2cdadb0 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -32,7 +32,6 @@ } <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> - , { <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 43553eb1e4ebaa66a0253deb48499967103656e1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 11 Dec 2023 13:56:25 +0100 Subject: [PATCH 09/83] Modifs HSRprepa 111223 --- RFXtoRP_HsrPrepa.ftl | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 2cdadb0..8dd9c37 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -32,12 +32,13 @@ } <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> + } From fe66e643c07bc01286534e29b24999ca449fe09f Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 12 Dec 2023 08:44:05 +0100 Subject: [PATCH 10/83] =?UTF-8?q?SCPN1-5358=20mise=20=C3=A0=20vide=20des?= =?UTF-8?q?=20valeurs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RPtoRFX_PrepOrder_DefaultHeaderData.ftl | 8 ++++---- RPtoRFX_Receipt_DefaultHeaderData.ftl | 10 +++++----- RPtoRFX_Receipt_DefaultLineData.ftl | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl index 1879fd8..89d07dc 100644 --- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl +++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl @@ -6,10 +6,10 @@ --> -<#assign activity_code = "PEN"/> -<#assign originator_code = "50000189"/> -<#assign preparation_type_code = "010"/> -<#assign requested_delivery_date_type = "010"/> +<#assign activity_code = ""/> +<#assign originator_code = ""/> +<#assign preparation_type_code = ""/> +<#assign requested_delivery_date_type = ""/> <#assign consolidated_delivery_flag ="false"/> <#assign pick_sequence_code = ""/> <#assign protected_flag ="false"/> diff --git a/RPtoRFX_Receipt_DefaultHeaderData.ftl b/RPtoRFX_Receipt_DefaultHeaderData.ftl index f2d8220..e510b3c 100644 --- a/RPtoRFX_Receipt_DefaultHeaderData.ftl +++ b/RPtoRFX_Receipt_DefaultHeaderData.ftl @@ -5,8 +5,8 @@ <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/> --> -<#assign activity_code = "PEN"/> -<#assign originator_code = "STANDARD"/> -<#assign receipt_type = "010"/> -<#assign receipt_reason_code = "REC"/> -<#assign work_mode_code = "LPA"/> +<#assign activity_code = ""/> +<#assign originator_code = ""/> +<#assign receipt_type = ""/> +<#assign receipt_reason_code = ""/> +<#assign work_mode_code = ""/> diff --git a/RPtoRFX_Receipt_DefaultLineData.ftl b/RPtoRFX_Receipt_DefaultLineData.ftl index d7383f7..7ed934d 100644 --- a/RPtoRFX_Receipt_DefaultLineData.ftl +++ b/RPtoRFX_Receipt_DefaultLineData.ftl @@ -7,6 +7,6 @@ --> -<#assign owner_code = "PEN"/> -<#assign grade_code = "STD"/> -<#assign batch_1 = "STD"/> \ No newline at end of file +<#assign owner_code = ""/> +<#assign grade_code = ""/> +<#assign batch_1 = ""/> \ No newline at end of file From adaedeec31f8d168981e1e49142cde60c0006a26 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 09:46:28 +0100 Subject: [PATCH 11/83] Modifs HsrPrepa 121223 --- 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 332c691..9a748f3 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -25,7 +25,7 @@ <#if preparationOrder.load_data!="" > "HUCarrier":{ - "ActorID": "${preparationOrder.load_data.carrier_code}", + "ActorID": "${preparationOrder.load_data.carrier_code}" } From dbde25f5d3e7ea2e3f8fe2f0ee5f8ac3c220e8a8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 10:47:56 +0100 Subject: [PATCH 12/83] Modifs 1212231047 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 5 ++--- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 12 +++++++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 9a748f3..cf10a72 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -24,9 +24,8 @@ "HandlingunitID": "${despatched_ipg.hd_number}", <#if preparationOrder.load_data!="" > - "HUCarrier":{ - "ActorID": "${preparationOrder.load_data.carrier_code}" - + "HUCarrier":{ + "ActorID": "${preparationOrder.load_data.carrier_code}" } } diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 8ccf98a..65e92cc 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -21,7 +21,14 @@ }, <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, - + <#if preparation_order.transport_grade_code!=""> + "Carrier": { + "Actor":{ + "CarrierServices":{ + "ID"="{preparation_order.transport_grade_code}" + } + } + }, "ShipFrom": { "ActorID": "${preparation_order.physical_depot_code}" }, @@ -49,8 +56,7 @@ "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!""}" ] - } - + } }, From 02eb8cbe4efbc7211323b4ecf8cda0db6af9f3f2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 10:52:22 +0100 Subject: [PATCH 13/83] Modifs 1212231052 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 65e92cc..6cfdcfd 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -28,7 +28,8 @@ "ID"="{preparation_order.transport_grade_code}" } } - }, + } + , "ShipFrom": { "ActorID": "${preparation_order.physical_depot_code}" }, From ba7ce14568429b267b41a110c5215c65e2f30f2d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 10:58:30 +0100 Subject: [PATCH 14/83] modifs 1212231058 --- 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 6cfdcfd..7be6b7e 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -25,7 +25,7 @@ "Carrier": { "Actor":{ "CarrierServices":{ - "ID"="{preparation_order.transport_grade_code}" + "ID"="${preparation_order.transport_grade_code}" } } } From b286711d5688dc770ae74961100bb0695486a1a5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 11:04:13 +0100 Subject: [PATCH 15/83] Modifs 1212231104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 7be6b7e..5d42a74 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -28,8 +28,8 @@ "ID"="${preparation_order.transport_grade_code}" } } - } - , + }, + "ShipFrom": { "ActorID": "${preparation_order.physical_depot_code}" }, From c27aec2730e5f7bb01e82a227f47798b1bcc44c3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 11:11:59 +0100 Subject: [PATCH 16/83] modifs 1212231111 --- 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 5d42a74..7cc7d00 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -25,7 +25,7 @@ "Carrier": { "Actor":{ "CarrierServices":{ - "ID"="${preparation_order.transport_grade_code}" + "ID": "${preparation_order.transport_grade_code}" } } }, From 5222b56cc340e358accf9daa18fbb04165a0ee50 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 11:50:23 +0100 Subject: [PATCH 17/83] Modifs 1212231150 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 7cc7d00..2bf495e 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -23,11 +23,9 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, <#if preparation_order.transport_grade_code!=""> "Carrier": { - "Actor":{ - "CarrierServices":{ + "CarrierService":{ "ID": "${preparation_order.transport_grade_code}" } - } }, "ShipFrom": { From 01151595074cedf198e626a32954f9bb00256d68 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 11:56:33 +0100 Subject: [PATCH 18/83] Modifs 1212231156 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 2bf495e..6318438 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -23,10 +23,8 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, <#if preparation_order.transport_grade_code!=""> "Carrier": { - "CarrierService":{ - "ID": "${preparation_order.transport_grade_code}" - } - }, + "CarrierService":"${preparation_order.transport_grade_code}" + }, "ShipFrom": { "ActorID": "${preparation_order.physical_depot_code}" From 97474cf5e493cbba7b47d17cb0ce99139445d082 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 12:01:40 +0100 Subject: [PATCH 19/83] Modifs 1212231201 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 6318438..86a71fe 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -22,9 +22,7 @@ <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, <#if preparation_order.transport_grade_code!=""> - "Carrier": { - "CarrierService":"${preparation_order.transport_grade_code}" - }, + "CarrierService":"${preparation_order.transport_grade_code}", "ShipFrom": { "ActorID": "${preparation_order.physical_depot_code}" From c79ab16480f71e2b3bd140c39a45b0f62280a5de Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 14:25:58 +0100 Subject: [PATCH 20/83] Modifs 1212231425 --- RFXtoRP_HsrPrepa.ftl | 9 +++++++++ RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 RFXtoRP_HsrPrepa_CarrierUpdated.ftl diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 8dd9c37..14c8cea 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -29,7 +29,15 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> + }, + <#if preparationOrder.load_data.carrier_code!=""> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.CarrierUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> } + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> , @@ -43,6 +51,7 @@ ] + <#else> <#stop "no confirmed quantity for the preparation - preparation closed"> diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl new file mode 100644 index 0000000..859f095 --- /dev/null +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -0,0 +1,17 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +[ + + { + "Header": { + "ProjectID": "${projectRP}" + }, + "RefID": "preparationOrder.preparation_line.preparation_order_originator_reference" + + }, + "Payload":{ + "Carrier": { + "ActorID":"${preparationOrder.load_data.carrier_code}" + } + } +] \ No newline at end of file From edc5142c3f254ef7fe52e4d86977c9c212e3a30b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 15:11:12 +0100 Subject: [PATCH 21/83] Modifs 1212231511 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 859f095..2bc22c8 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -6,7 +6,7 @@ "Header": { "ProjectID": "${projectRP}" }, - "RefID": "preparationOrder.preparation_line.preparation_order_originator_reference" + "RefID": "preparationOrder.preparation_line_lst[0].preparation_order_originator_reference" }, "Payload":{ From c5c5f2bef7225c17ef0120942ed1c80e55c3b14c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 15:32:53 +0100 Subject: [PATCH 22/83] Modifs 1212231532 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 14c8cea..b6b249a 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -32,7 +32,7 @@ }, <#if preparationOrder.load_data.carrier_code!=""> { - <#assign apiReflexPlatformID = ApiReflexPlatformID.CarrierUpdated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> From 14243be12fd3b64dfb6a88bb4838dbc51d031f0a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 15:45:36 +0100 Subject: [PATCH 23/83] Modifs 1212231545 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 2bc22c8..9c7d1f0 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -8,10 +8,11 @@ }, "RefID": "preparationOrder.preparation_line_lst[0].preparation_order_originator_reference" - }, + , "Payload":{ "Carrier": { "ActorID":"${preparationOrder.load_data.carrier_code}" } } + } ] \ No newline at end of file From ae338b00d18326b7ea3ef3acbdf002a8692774bc Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 15:49:58 +0100 Subject: [PATCH 24/83] Modifs 12121549 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 9c7d1f0..d0d7ada 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -6,7 +6,7 @@ "Header": { "ProjectID": "${projectRP}" }, - "RefID": "preparationOrder.preparation_line_lst[0].preparation_order_originator_reference" + "RefID": "preparationOrder.preparation_line[0].preparation_order_originator_reference" , "Payload":{ From 41447dbc35a8f79e064b54a54cb1c5fb4da58177 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 16:43:56 +0100 Subject: [PATCH 25/83] Modifs 1212231643 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index d0d7ada..7b3176a 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -6,9 +6,9 @@ "Header": { "ProjectID": "${projectRP}" }, - "RefID": "preparationOrder.preparation_line[0].preparation_order_originator_reference" - - , + "ID":{ + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}" + }, "Payload":{ "Carrier": { "ActorID":"${preparationOrder.load_data.carrier_code}" From dfdfd8c60e7df25fb807e0a7773b8c89b3700c0f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 13 Dec 2023 12:18:31 +0100 Subject: [PATCH 26/83] Modifs 1312231218 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 3 ++- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 0 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 7b3176a..ff6eba1 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -12,7 +12,8 @@ "Payload":{ "Carrier": { "ActorID":"${preparationOrder.load_data.carrier_code}" - } + }, + "CarrierService":"${preparationOrder.transport_grade_code}" } } ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl new file mode 100644 index 0000000..e69de29 From 8f066d7f6279a56dea01e3df28147bff591d99d3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 13 Dec 2023 14:11:22 +0100 Subject: [PATCH 27/83] Modifs 1312231411 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index ff6eba1..23b5e3c 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -13,6 +13,7 @@ "Carrier": { "ActorID":"${preparationOrder.load_data.carrier_code}" }, + <#-- Add transport grade code --> "CarrierService":"${preparationOrder.transport_grade_code}" } } From 4636ca6c427e9054487c8ab769bdbca1f51dd4de Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 13 Dec 2023 14:24:04 +0100 Subject: [PATCH 28/83] modifs 1312231423 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 23b5e3c..f95c99c 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -14,7 +14,9 @@ "ActorID":"${preparationOrder.load_data.carrier_code}" }, <#-- Add transport grade code --> + <#if preparationOrder.transport_grade_code!=""> "CarrierService":"${preparationOrder.transport_grade_code}" + } } ] \ No newline at end of file From 97d08b554cce7d4f63240d2fccfb27207c168177 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 13 Dec 2023 14:34:51 +0100 Subject: [PATCH 29/83] Modifs 1312231434 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index f95c99c..b819fca 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -12,9 +12,10 @@ "Payload":{ "Carrier": { "ActorID":"${preparationOrder.load_data.carrier_code}" - }, + } <#-- Add transport grade code --> <#if preparationOrder.transport_grade_code!=""> + , "CarrierService":"${preparationOrder.transport_grade_code}" } From ac731180dbd94bc2e7bb220dbc9c73191bb1632d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 11:10:02 +0100 Subject: [PATCH 30/83] Modifs 1512231109 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index b819fca..89cae0e 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -13,11 +13,11 @@ "Carrier": { "ActorID":"${preparationOrder.load_data.carrier_code}" } - <#-- Add transport grade code --> + <#-- Add transport grade code <#if preparationOrder.transport_grade_code!=""> , "CarrierService":"${preparationOrder.transport_grade_code}" - + --> } } ] \ No newline at end of file From 03f53c0fd02d9be975ff154445b73fa6526c9b54 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 14:07:51 +0100 Subject: [PATCH 31/83] Modifs 1512231407 --- RFXtoRP_HsrPrepa.ftl | 7 +++++++ RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index b6b249a..f5639d8 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -36,6 +36,13 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> + }, + <#if preparationOrder.load_data.carrier_code!=""> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> } <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index e69de29..7b3176a 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -0,0 +1,18 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +[ + + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID":{ + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}" + }, + "Payload":{ + "Carrier": { + "ActorID":"${preparationOrder.load_data.carrier_code}" + } + } + } +] \ No newline at end of file From e709d7d78afb76031fff7c15041d0425ee4bdf4c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 14:24:36 +0100 Subject: [PATCH 32/83] Modifs 1512231424 --- RFXtoRP_HsrPrepa.ftl | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index f5639d8..f21c9bc 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -35,10 +35,9 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> + <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">, }, - <#if preparationOrder.load_data.carrier_code!=""> - { + { <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : From 2bdc02a1d4ea2f8226a008f242e147801c19f4d3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 15:31:40 +0100 Subject: [PATCH 33/83] Motifs 1512231531 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index f21c9bc..3ea4130 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -35,7 +35,7 @@ <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">, + <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> }, { <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> From 88307561d24df887236aee3e4fa4e2524290f613 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 15:45:27 +0100 Subject: [PATCH 34/83] Modifs 1512231545 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 86a71fe..99c913c 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -21,9 +21,10 @@ }, <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, + <#-- Add transport grade code <#if preparation_order.transport_grade_code!=""> "CarrierService":"${preparation_order.transport_grade_code}", - + --> "ShipFrom": { "ActorID": "${preparation_order.physical_depot_code}" }, From 7d32478c1ba5328296bf4a4ff9f3b3b942375aca Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 15:48:26 +0100 Subject: [PATCH 35/83] modifs 1512231548 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 3ea4130..efea7f8 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -30,7 +30,7 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> }, - <#if preparationOrder.load_data.carrier_code!=""> + <#if preparationOrder.load_data.carrier_code??> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 7a3223a1acc1a62741cd8851268dec7b506a7d72 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 16:15:49 +0100 Subject: [PATCH 36/83] Modifs 1512231613 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index efea7f8..04eadad 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -30,7 +30,7 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> }, - <#if preparationOrder.load_data.carrier_code??> + <#if preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!=""> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 26facb3d6aea37f7f9a0cd826b4156a13f5ed0fe Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:05:22 +0100 Subject: [PATCH 37/83] Modifs 1512231705 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 04eadad..2ceab30 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -30,7 +30,7 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> }, - <#if preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!=""> + <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 68e6840512de5f978e533514a1537a8150d518d2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:12:36 +0100 Subject: [PATCH 38/83] Modifs 1512231712 --- 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 cf10a72..358a855 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -23,7 +23,7 @@ <#else> "HandlingunitID": "${despatched_ipg.hd_number}", - <#if preparationOrder.load_data!="" > + <#if preparationOrder.load_data?? && preparationOrder.load_data!="" > "HUCarrier":{ "ActorID": "${preparationOrder.load_data.carrier_code}" } From 943a02d5f3a00cb30b30b0cf3f76b66ab73055bf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:20:40 +0100 Subject: [PATCH 39/83] Modifs 1512231720 --- RFXtoRP_HsrPrepa.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 2ceab30..2a7ea7a 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -46,7 +46,6 @@ <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> - , { <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> "apiReflexPlatformID" : "${apiReflexPlatformID}", From cd75521f8160807bd2f0f6768473df070c4f041a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:21:12 +0100 Subject: [PATCH 40/83] Modifs 1512231721 --- 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 358a855..cfa2ad1 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -21,7 +21,7 @@ <#if despatched_ipg.carton_number != "000000000000000000"> "HandlingunitID": "${despatched_ipg.carton_number}", <#else> - "HandlingunitID": "${despatched_ipg.hd_number}", + "HandlingunitID": "${despatched_ipg.hd_number}" <#if preparationOrder.load_data?? && preparationOrder.load_data!="" > "HUCarrier":{ From 38ef2bd3dffcceaa08fc1839096730081d583c3a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:27:23 +0100 Subject: [PATCH 41/83] modifs 1512231727 --- 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 cfa2ad1..f389861 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -23,7 +23,7 @@ <#else> "HandlingunitID": "${despatched_ipg.hd_number}" - <#if preparationOrder.load_data?? && preparationOrder.load_data!="" > + <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > "HUCarrier":{ "ActorID": "${preparationOrder.load_data.carrier_code}" } From 882709f01b76cacda88dc67f7a565a468cd1aa79 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:35:01 +0100 Subject: [PATCH 42/83] Modifs 1512231734 --- RFXtoRP_HsrPrepa.ftl | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 2a7ea7a..578c046 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -30,6 +30,20 @@ "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>, + + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> + } + + + + <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> @@ -44,17 +58,8 @@ <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> } - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> - <#list preparation_line.despatched_ipg_list as despatched_ipg> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } - - - + + ] <#else> From b3cfa5c66d69cda45a9c154f8f1bc840b7cc13e7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:45:03 +0100 Subject: [PATCH 43/83] modifs 1512231745 --- RFXtoRP_HsrPrepa.ftl | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 578c046..9c53fbd 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -31,19 +31,6 @@ <#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>, - - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } - - - - <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> @@ -60,6 +47,19 @@ + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> + <#list preparation_line.despatched_ipg_list as despatched_ipg> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> + } + + + + + ] <#else> From ba43f65277855e2966206fa50bec6c1fdfff5581 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 15 Dec 2023 17:50:45 +0100 Subject: [PATCH 44/83] Modifs 1512231750 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 9c53fbd..ea7f9cf 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -43,7 +43,7 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> - } + }, From eac8ddc59886e793adfaa0feb53fc914eb0aa0a5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 18 Dec 2023 10:38:42 +0100 Subject: [PATCH 45/83] Modifs 1812231038 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index f389861..0cc76c8 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -19,14 +19,16 @@ }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> - "HandlingunitID": "${despatched_ipg.carton_number}", + "HandlingunitID": "${despatched_ipg.carton_number}" <#else> "HandlingunitID": "${despatched_ipg.hd_number}" <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" > + , "HUCarrier":{ "ActorID": "${preparationOrder.load_data.carrier_code}" } + } } From cb1793bf2257bd95fee08e45db7cd220b1b854b0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 19 Dec 2023 17:17:54 +0100 Subject: [PATCH 46/83] Modifs 1912231717 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 0 RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 19 ++++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl new file mode 100644 index 0000000..e69de29 diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 99c913c..bf15429 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -30,7 +30,24 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.address.type_code == "" && preparation_order.address.title_code == "" && preparation_order.address.first_name == "" && preparation_order.address.last_name == "" && preparation_order.address.mail_address == "" && preparation_order.address.contact_type_code == "" && preparation_order.address.mobile_phone_number == "" && preparation_order.address.land_line_phone_number == "" && 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 == ""> + <#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": From e319d273bbbe8616015863b36ad9a76e9d4ec33f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 10:44:03 +0100 Subject: [PATCH 47/83] Modifs 2012231044 --- RFXtoRP_HsrPrepa.ftl | 20 +++++++++++-- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 34 +++++++++++++++++++++++ 2 files changed, 52 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index ea7f9cf..cba206c 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -47,6 +47,7 @@ + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> { @@ -54,8 +55,23 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } - + }, + <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > + { + <#assign includeHU = []> + <#list preparation_line.despatched_ipg_list as despatched_ipg2> + <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > + <#assign includeHU += ["despatched_ipg2.carton_number"] + + + + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> + } + + diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index e69de29..b953a5b 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -0,0 +1,34 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +[ + + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${despatched_ipg.hd_number}" + }, + + "Payload": { + + "IncludedHandlingunitIDs": ${includeHU}, + "Information": { + "ContainerType": "${preparation_line.despached_hds-list[0].hd_type_code}", + "Length": { + "Unit": "${length_unit_rfx}", + "Value": ${preparation_line.despached_hds-list[0].hd_type_depth} + }, + "Weight": { + "Unit": "${weight_unit_rfx}", + "Value": ${preparation_line.despached_hds-list[0].hd_type_weight} + }, + "Width": { + "Unit": "${length_unit_rfx}", + "Value": ${preparation_line.despached_hds-list[0].hd_type_width} + } + } + + } + } +] \ No newline at end of file From 783d7efd0493c8477c6a5c9b8509ff33ead04bd8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 10:47:18 +0100 Subject: [PATCH 48/83] Modifs 2012231047 --- RFXtoRP_HsrPrepa.ftl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index cba206c..21d3d1c 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -61,10 +61,9 @@ <#assign includeHU = []> <#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > - <#assign includeHU += ["despatched_ipg2.carton_number"] + <#assign includeHU += ["despatched_ipg2.carton_number"]> - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : From 27f2e18f0fd6e6cb6398d880bd98633ab85b553d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 11:22:03 +0100 Subject: [PATCH 49/83] Modifs 2012231122 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index b953a5b..0dcf2fb 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,20 +12,20 @@ "Payload": { - "IncludedHandlingunitIDs": ${includeHU}, + "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>], "Information": { - "ContainerType": "${preparation_line.despached_hds-list[0].hd_type_code}", + "ContainerType": "${preparation_line.despached_hds_list[0].hd_type_code}", "Length": { "Unit": "${length_unit_rfx}", - "Value": ${preparation_line.despached_hds-list[0].hd_type_depth} + "Value": ${preparation_line.despached_hds_list[0].hd_type_depth} }, "Weight": { "Unit": "${weight_unit_rfx}", - "Value": ${preparation_line.despached_hds-list[0].hd_type_weight} + "Value": ${preparation_line.despached_hds_list[0].hd_type_weight} }, "Width": { "Unit": "${length_unit_rfx}", - "Value": ${preparation_line.despached_hds-list[0].hd_type_width} + "Value": ${preparation_line.despached_hds_list[0].hd_type_width} } } From 7e2c22b4c977ff3ec86e030eb6ab991a4f702cb4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 11:36:00 +0100 Subject: [PATCH 50/83] Modifs 2012231135 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index 0dcf2fb..fa89b95 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -14,18 +14,18 @@ "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>], "Information": { - "ContainerType": "${preparation_line.despached_hds_list[0].hd_type_code}", + "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { "Unit": "${length_unit_rfx}", - "Value": ${preparation_line.despached_hds_list[0].hd_type_depth} + "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth} }, "Weight": { "Unit": "${weight_unit_rfx}", - "Value": ${preparation_line.despached_hds_list[0].hd_type_weight} + "Value": ${preparation_line.despatched_hds_list[0].hd_type_weight} }, "Width": { "Unit": "${length_unit_rfx}", - "Value": ${preparation_line.despached_hds_list[0].hd_type_width} + "Value": ${preparation_line.despatched_hds_list[0].hd_type_width} } } From 705ad9be639261c161c16a930775bd05f484fdfc Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 11:40:05 +0100 Subject: [PATCH 51/83] Modifs 2012231139 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index fa89b95..ed5edfb 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -21,7 +21,7 @@ }, "Weight": { "Unit": "${weight_unit_rfx}", - "Value": ${preparation_line.despatched_hds_list[0].hd_type_weight} + "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight} }, "Width": { "Unit": "${length_unit_rfx}", From 7505c15a4ab18d991a70fd97e96944dc5a2c11ba Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 11:48:59 +0100 Subject: [PATCH 52/83] Modifs 2012231148 --- RFXtoRP_HsrPrepa.ftl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 21d3d1c..4d6f725 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -56,12 +56,13 @@ "datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> }, + <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > { <#assign includeHU = []> <#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > - <#assign includeHU += ["despatched_ipg2.carton_number"]> + <#assign includeHU += ["${despatched_ipg2.carton_number}"]> <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> @@ -70,7 +71,7 @@ <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> } - + <#sep> From c2e0cb7a15d21a52e81d83b7619feaf4ba570c7d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 11:53:09 +0100 Subject: [PATCH 53/83] Modifs 2012231153 --- RFXtoRP_HsrPrepa.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 4d6f725..d9d3ca7 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -73,6 +73,7 @@ <#sep> + <#sep> From 8f212cf7c9d2b92afcc57ddc9cc60c58af6d4da9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 20 Dec 2023 12:01:56 +0100 Subject: [PATCH 54/83] modifs 2012231201 --- RFXtoRP_HsrPrepa.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index d9d3ca7..034c47f 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -71,9 +71,9 @@ <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> } - <#sep> + <#sep>, - <#sep> + <#sep>, From dd1d4980a84457efd28d3a39d8b63c4dd43e4c55 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 21 Dec 2023 11:16:23 +0100 Subject: [PATCH 55/83] Modifs 2112231116 --- RFXtoRP_HsrPrepa.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 034c47f..1ffa770 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -46,8 +46,7 @@ }, - - + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> { @@ -55,9 +54,10 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - }, + } <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > + , { <#assign includeHU = []> <#list preparation_line.despatched_ipg_list as despatched_ipg2> From 108e30d129a934f7c453b07c37831755d64a1e3b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 27 Dec 2023 15:07:45 +0100 Subject: [PATCH 56/83] Modifs 2712231507 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index ed5edfb..f5dd847 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,7 +12,7 @@ "Payload": { - "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>], + "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,<#sep>], "Information": { "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { From 86a41807187e4beb9cd61f1f0da755213d64256e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 27 Dec 2023 15:20:53 +0100 Subject: [PATCH 57/83] Modifs 2712231520 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index f5dd847..79b7ec3 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,7 +12,7 @@ "Payload": { - "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,<#sep>], + "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,], "Information": { "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { From b6bf4d2be8d47dccbf8856712e5d537a0fa7d557 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 27 Dec 2023 15:44:15 +0100 Subject: [PATCH 58/83] Modifs 2712231544 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index 79b7ec3..aa6e765 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,7 +12,8 @@ "Payload": { - "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,], + <#-- "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,], --> + "IncludedHandlingunitIDs": [ includeHU <#sep>,<#sep>], "Information": { "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { From 64c35417b3c0c012fe7a14b19e4437fd24f783ea Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 27 Dec 2023 16:22:25 +0100 Subject: [PATCH 59/83] Modifs 2712231622 --- RFXtoRP_HsrPrepa.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 1ffa770..4f4e04f 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -62,7 +62,7 @@ <#assign includeHU = []> <#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > - <#assign includeHU += ["${despatched_ipg2.carton_number}"]> + <#assign includeHU = ["${despatched_ipg2.carton_number}"]> <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index aa6e765..d0d5ded 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,8 +12,7 @@ "Payload": { - <#-- "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,], --> - "IncludedHandlingunitIDs": [ includeHU <#sep>,<#sep>], +"IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,], "Information": { "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { From 137982fcc0236903236d9af596df3449fa99c18a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 27 Dec 2023 16:41:21 +0100 Subject: [PATCH 60/83] Modifs 2712231641 --- RFXtoRP_HsrPrepa.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 4f4e04f..9b86b94 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -62,13 +62,13 @@ <#assign includeHU = []> <#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > - <#assign includeHU = ["${despatched_ipg2.carton_number}"]> + <#assign includeHU += ["${despatched_ipg2.carton_number}"]> - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> + } <#sep>, From 07188a5c2070fd5dd7f56a405a215454ec0aedef Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 27 Dec 2023 16:59:30 +0100 Subject: [PATCH 61/83] Modifs 2712231659 --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 9b86b94..1ffa770 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -64,11 +64,11 @@ <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > <#assign includeHU += ["${despatched_ipg2.carton_number}"]> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> - } <#sep>, From 59afa9fd65366b8961a4fdc3d1566941101585f4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 28 Dec 2023 09:30:10 +0100 Subject: [PATCH 62/83] Modifs 2812230930 --- RFXtoRP_HsrPrepa.ftl | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 1ffa770..b86c521 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -60,11 +60,12 @@ , { <#assign includeHU = []> - <#list preparation_line.despatched_ipg_list as despatched_ipg2> + <#--<#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > <#assign includeHU += ["${despatched_ipg2.carton_number}"]> - - + + --> + <#assign includeHU += ["${despatched_ipg.carton_number}"]> <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : From fcfb9206c0784ddb6715dffc7db886f2c36197ad Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 28 Dec 2023 10:48:31 +0100 Subject: [PATCH 63/83] Modifs 2812231048 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index d0d5ded..e3fe773 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,8 +12,10 @@ "Payload": { -"IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,], +"IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,] "Information": { + <#if preparation_line.despatched_hds_list?? > + , "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { "Unit": "${length_unit_rfx}", @@ -27,6 +29,7 @@ "Unit": "${length_unit_rfx}", "Value": ${preparation_line.despatched_hds_list[0].hd_type_width} } + } } From 8211fcebf005a956ef60c1758f8bd85fe4d6d4fe Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 28 Dec 2023 10:56:19 +0100 Subject: [PATCH 64/83] Modifs 2812231056 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index e3fe773..b07038a 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -13,9 +13,9 @@ "Payload": { "IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,] - "Information": { - <#if preparation_line.despatched_hds_list?? > + <#if preparation_line.despatched_hds_list?? > , + "Information": { "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}", "Length": { "Unit": "${length_unit_rfx}", From 18f1bb3749b28b78609f8e9c316b7cb23c45e56e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 28 Dec 2023 10:59:43 +0100 Subject: [PATCH 65/83] Modifs 2812231059 --- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index b07038a..6246dcf 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -28,9 +28,9 @@ "Width": { "Unit": "${length_unit_rfx}", "Value": ${preparation_line.despatched_hds_list[0].hd_type_width} - } - + } } + } } From 0b71455e6f42f1155466726de817f24b2ca6a016 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 2 Jan 2024 10:34:43 +0100 Subject: [PATCH 66/83] Modifs 0201241034 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 926bc9b..7070611 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -78,6 +78,25 @@ "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${despatched_ipg.quantity_lvs} } + + <#if preparation_line.despatched_cartons_list?? > + , + "Information": { + "ContainerType": "${preparation_line.despatched_cartons_list.carton_type_code}", + "Length": { + "Unit": "${length_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list.overall_depth}" + }, + "Weight": { + "Unit": "${weight_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list.carton_gross_weight}" + }, + "Width": { + "Unit": "${length_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list.overall_width}" + } + } + } ] } From bff543d852ffa68891ea09f9c63d492872bb4ee2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 2 Jan 2024 10:57:46 +0100 Subject: [PATCH 67/83] Modifs 0201241057 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 34 ++++++++++++++++-------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 7070611..cf838fe 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -80,22 +80,24 @@ } <#if preparation_line.despatched_cartons_list?? > - , - "Information": { - "ContainerType": "${preparation_line.despatched_cartons_list.carton_type_code}", - "Length": { - "Unit": "${length_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list.overall_depth}" - }, - "Weight": { - "Unit": "${weight_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list.carton_gross_weight}" - }, - "Width": { - "Unit": "${length_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list.overall_width}" - } - } + <#if despatched_ipg.carton_number == preparation_line.despatched_cartons_list.carton_number > + , + "Information": { + "ContainerType": "${preparation_line.despatched_cartons_list[0].carton_type_code}", + "Length": { + "Unit": "${length_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list[0].overall_depth}" + }, + "Weight": { + "Unit": "${weight_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list[0].carton_gross_weight}" + }, + "Width": { + "Unit": "${length_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list[0].overall_width}" + } + } + } ] From 8b4103e50ddd94b715de10d37b90fc41c0171a75 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 2 Jan 2024 11:09:20 +0100 Subject: [PATCH 68/83] Modifs 0201241109 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index cf838fe..a36f363 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -77,28 +77,7 @@ "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${despatched_ipg.quantity_lvs} - } - - <#if preparation_line.despatched_cartons_list?? > - <#if despatched_ipg.carton_number == preparation_line.despatched_cartons_list.carton_number > - , - "Information": { - "ContainerType": "${preparation_line.despatched_cartons_list[0].carton_type_code}", - "Length": { - "Unit": "${length_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list[0].overall_depth}" - }, - "Weight": { - "Unit": "${weight_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list[0].carton_gross_weight}" - }, - "Width": { - "Unit": "${length_unit_rfx}", - "Value": "${preparation_line.despatched_cartons_list[0].overall_width}" - } - } - - + } } ] } From 6faa6bb4fc6d5cc31bac9d0917341fc39fb4f660 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 3 Jan 2024 09:42:44 +0100 Subject: [PATCH 69/83] Modifs 0301240942 --- RFXtoRP_HsrPrepa.ftl | 6 +++--- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index b86c521..98f831b 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -60,12 +60,12 @@ , { <#assign includeHU = []> - <#--<#list preparation_line.despatched_ipg_list as despatched_ipg2> + <#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > <#assign includeHU += ["${despatched_ipg2.carton_number}"]> - --> - <#assign includeHU += ["${despatched_ipg.carton_number}"]> + + <#--<#assign includeHU += ["${despatched_ipg.carton_number}"]>--> <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index 6246dcf..1461312 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,7 +12,7 @@ "Payload": { -"IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,] +"IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,] <#if preparation_line.despatched_hds_list?? > , "Information": { From 980a44c1be71faa9a9086742a1950c6340ee9885 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 3 Jan 2024 10:14:45 +0100 Subject: [PATCH 70/83] Modifs 0301231014 --- RFXtoRP_HsrPrepa.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 98f831b..b86c521 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -60,12 +60,12 @@ , { <#assign includeHU = []> - <#list preparation_line.despatched_ipg_list as despatched_ipg2> + <#--<#list preparation_line.despatched_ipg_list as despatched_ipg2> <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > <#assign includeHU += ["${despatched_ipg2.carton_number}"]> - - <#--<#assign includeHU += ["${despatched_ipg.carton_number}"]>--> + --> + <#assign includeHU += ["${despatched_ipg.carton_number}"]> <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : From ca2dfe3fb26e637a8738d773b634f47343d64877 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 3 Jan 2024 10:29:22 +0100 Subject: [PATCH 71/83] Modifs 0301231029 --- RFXtoRP_HsrPrepa.ftl | 9 ++------- RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index b86c521..1f889a6 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -59,13 +59,8 @@ <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > , { - <#assign includeHU = []> - <#--<#list preparation_line.despatched_ipg_list as despatched_ipg2> - <#if despatched_ipg.hd_number == despatched_ipg2.hd_number > - <#assign includeHU += ["${despatched_ipg2.carton_number}"]> - - --> - <#assign includeHU += ["${despatched_ipg.carton_number}"]> + + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : diff --git a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl index 1461312..93c49ff 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl @@ -12,7 +12,7 @@ "Payload": { -"IncludedHandlingunitIDs": [ <#list includeHU as hu> "${hu}"<#sep>,] +"IncludedHandlingunitIDs": [ "${despatched_ipg.carton_number}" ] <#if preparation_line.despatched_hds_list?? > , "Information": { From a5fa0dbfd9ee6cb22f138648b649d41f5d0df028 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 3 Jan 2024 11:59:20 +0100 Subject: [PATCH 72/83] Modifs HsrPro_ExecutionflowCancelled 0301231159 --- 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 cb0385a64fa3b48b2be4cdab85dc59c3d0774b72 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 4 Jan 2024 14:57:31 +0100 Subject: [PATCH 73/83] Modifs 0401241457 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index a36f363..29dd15a 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -19,11 +19,26 @@ "Information" :{ <#if despatched_ipg.carton_number != "000000000000000000"> "ContainerType": "${despatched_ipg.carton_type_code}" + <#if preparation_line.despatched_cartons_list?? > + , + "Length": { + "Unit": "${length_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list.overall_depth}" + }, + "Weight": { + "Unit": "${weight_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list.carton_gross_weight}" + }, + "Width": { + "Unit": "${length_unit_rfx}", + "Value": "${preparation_line.despatched_cartons_list.overall_width}" + } + <#else> "ContainerType": "${despatched_ipg.hd_type_code}" - - }, + }, + <#-- HU Metadata inclusin inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl"> , @@ -77,7 +92,8 @@ "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${despatched_ipg.quantity_lvs} - } + } + } ] } From 47326a6b0cc6830928bad51d4998dc26a462c6cf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 4 Jan 2024 15:51:04 +0100 Subject: [PATCH 74/83] Modifs 0401241551 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 29dd15a..a4337fd 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -19,7 +19,7 @@ "Information" :{ <#if despatched_ipg.carton_number != "000000000000000000"> "ContainerType": "${despatched_ipg.carton_type_code}" - <#if preparation_line.despatched_cartons_list?? > + <#-- <#if preparation_line.despatched_cartons_list?? > , "Length": { "Unit": "${length_unit_rfx}", @@ -32,8 +32,8 @@ "Width": { "Unit": "${length_unit_rfx}", "Value": "${preparation_line.despatched_cartons_list.overall_width}" - } - + } + --> <#else> "ContainerType": "${despatched_ipg.hd_type_code}" From 7acf5298705603edce10e44a75831837c10166b0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 5 Jan 2024 14:04:58 +0100 Subject: [PATCH 75/83] Modifs RPtoRFX_Order --- RPtoRFX_PrepOrder.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 735abba..ebff2ce 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -28,6 +28,7 @@ "intermediate_consignee": "false", "protected": "${protected_flag}", "automatic_generation": "${automatic_generation_flag}", + "deactivate": "false", "optional_attributes": { "apt_with_end_consignee": "${apt_with_end_consignee_flag}", "apt_with_intermediate": "false", From aaf8fc5bb693937bfd96c1fc7ec7fd5804d8f788 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 5 Jan 2024 17:02:33 +0100 Subject: [PATCH 76/83] Modifs 0501241702 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 +-- RPtoRFX_Receipt.ftl | 37 ++++++++++-------------- ReflexUtils.ftl | 20 ++++++++++++- 3 files changed, 36 insertions(+), 25 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index bf15429..9fcfc52 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -63,11 +63,11 @@ "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" } }, - "Contact" : + "Contact" : { "FirstName" : "${preparation_order.address.first_name?json_string!""}", "LastName" : "${preparation_order.address.last_name?json_string!""}", - "Emails" : ["${preparation_order.address.mail_address?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!""}" ] } diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 4fa8873..b9bb455 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -19,30 +19,26 @@ "carrier_code" : "${executionflow.Carrier.ActorID!""}", <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> - "receipt_datetime": "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}", + "receipt_datetime": "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}", <#else> - "receipt_datetime": "${aDateTime?iso_utc}", + "receipt_datetime": "${aDateTime?iso_utc}", - - <#-- - "carrier_appointment_made": "false", - "receipt_in_cross_docking": "false", - "dock_occupation_duration": 10, - --> + "carrier_appointment_made": "false", + "receipt_in_cross_docking": "false", + "dock_occupation_duration": 0, <#if executionflow.Lines??> - "line_list": [ - <#list executionflow.Lines as line> + "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") /> - + <#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_Receipt_DefaultLineData.ftl"> - { "receipt_reference_line_no": ${line.LineID?number}, "item_code": "${line.RequestedContent.Goods.ItemID!""}", @@ -50,18 +46,15 @@ "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", - "batch_1": "${batch_1!""}", - - <#-- + "batch_1": "${batch_1!""}", "optional_attributes": { "held_for_check": "false", "held _for_repacking": "false", "hold_for_specific_code": "false", "hold_code": "false" }, - --> "quality_control_attributes": { - <#--"qcf_to_create_for_receipt_line": "false",--> + "qcf_to_create_for_receipt_line": "false", "exclude_item_from_inspection": "false" } diff --git a/ReflexUtils.ftl b/ReflexUtils.ftl index 35a703c..d1e2569 100644 --- a/ReflexUtils.ftl +++ b/ReflexUtils.ftl @@ -6,4 +6,22 @@ <#return (datetimeUTC)> - \ No newline at end of file +<#-- --------------------------------------------------------------------------------------- --> +<#-- 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> +<#if str != "["> +<#local str += ","> + +<#local str += "\""> +<#local str += email> +<#local str += "\""> + +<#local str += "]"> +<#return (str)> + \ No newline at end of file From 1a9454cd2f921a90a2686726d07b6d0c71d6eafb Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 8 Jan 2024 10:09:17 +0100 Subject: [PATCH 77/83] Modifs Email 0801241009 --- 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 9fcfc52..00a2f46 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -67,7 +67,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!"")}, + "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!""}" ] } From c103fc7f5a43c20aad049eb1b4fe1fa3da8da689 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 9 Jan 2024 09:56:00 +0100 Subject: [PATCH 78/83] Modifs RPtoRFX 0901240955 --- RPtoRFX_PrepOrder.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index ebff2ce..8d8c1de 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -36,13 +36,13 @@ }, <#if executionflow.ShipTo.ActorID == ""> "address": { - "first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}", - "last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}", + "first_name": "${executionflow.ShipTo.Contact.FirstName}", + "last_name" :"${executionflow.ShipTo.Contact.Lastname}", "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!""}", - "additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo?json_string!""}", - "additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree?json_string!""}", + "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne}", + "additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo}", + "additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree}", "postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}", "iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}" }, From e808925e0a199798932dd60ce4f3aeb79c6953c9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 9 Jan 2024 10:08:49 +0100 Subject: [PATCH 79/83] Modifs RPtoRFX 0901241007 --- RPtoRFX_Receipt.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index b9bb455..a2d160d 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -25,7 +25,7 @@ "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", - "dock_occupation_duration": 0, + "dock_occupation_duration": 1, <#if executionflow.Lines??> "line_list": [ From 39ab7c4ce7cfa756ca7c807c6077b6f5bc6c05b9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 9 Jan 2024 16:22:10 +0100 Subject: [PATCH 80/83] Modifs RPtoRFX 0901241622 --- RPtoRFX_Receipt.ftl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index a2d160d..e9fa3b3 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -48,15 +48,15 @@ "grade_code": "${grade_code}", "batch_1": "${batch_1!""}", "optional_attributes": { - "held_for_check": "false", + <#--"held_for_check": "false", "held _for_repacking": "false", - "hold_for_specific_code": "false", - "hold_code": "false" - }, - "quality_control_attributes": { + "hold_code": "false", --> + "hold_for_specific_code": "false" + } + <#--"quality_control_attributes": { "qcf_to_create_for_receipt_line": "false", "exclude_item_from_inspection": "false" - } + } --> }<#sep>, From c6a91f1980649d63b1ad51ce805b39edd7c9e28f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 9 Jan 2024 16:39:30 +0100 Subject: [PATCH 81/83] Modifs RestResponse 0901241639 --- RFXtoRP_RestResponse.ftl | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index eb4cdd4..2b62793 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -43,7 +43,11 @@ <#default> [ { - <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#if restResponsetMsg.body?? > + <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#else> + <#assign restResponseBody = "{}" /> + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : @@ -57,7 +61,7 @@ <#switch restResponsetMsg.status> <#case 200> <#case 201> - <#-- *********************************************** ApiRestID = preparation_orders_post ******************** --> + <#-- *********************************************** ApiRestID = receipts_post ******************** --> <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> <#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" > @@ -85,7 +89,11 @@ <#default> [ { - <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#if restResponsetMsg.body?? > + <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> + <#else> + <#assign restResponseBody = "{}" /> + <#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : From 61753efabe81ede69362bf6c71039583bf941f5b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 9 Jan 2024 17:01:45 +0100 Subject: [PATCH 82/83] Modifs JsonString 0901241701 --- RPtoRFX_PrepOrder.ftl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 8d8c1de..eba3211 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -36,13 +36,13 @@ }, <#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}", - "additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo}", - "additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree}", + "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!""}", "iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}" }, From fc8290648ff92190efffded47df61c38aafafc92 Mon Sep 17 00:00:00 2001 From: freat Date: Wed, 10 Jan 2024 10:40:42 +0100 Subject: [PATCH 83/83] 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