From e02218f7b1ec936f97053afdb88887d71feef43e Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 1 Dec 2023 14:23:58 +0100 Subject: [PATCH 01/10] Release 1.2.6+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cc013e2..2f0fe93 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6+1 +1.2.6+2 From 80aecb3aa7f6aaa02b76b72cc63e5217789b84d5 Mon Sep 17 00:00:00 2001 From: Vincent LEMAITRE Date: Fri, 1 Dec 2023 13:27:11 +0000 Subject: [PATCH 02/10] Update VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 2f0fe93..cc013e2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6+2 +1.2.6+1 From b4ea1e779866154da717c7ad223115247772d056 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 1 Dec 2023 14:29:46 +0100 Subject: [PATCH 03/10] Release 1.2.7+1 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index cc013e2..ada06a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.6+1 +1.2.7+1 From 3bcdec1d5d805d88917296be98c68a006cd92e7d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 16:57:25 +0100 Subject: [PATCH 04/10] Modif alignement champs techniques Reflex HsrPro 2011231657 --- RFXtoRP_HsrPro.ftl | 8 +-- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 54 +++++++++---------- ...o_ExecutionflowDetected_HeaderMetadata.ftl | 2 +- ...ExecutionflowDetected_SegmentationKeys.ftl | 6 +-- 5 files changed, 36 insertions(+), 36 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 089092a..6f1864b 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -14,14 +14,14 @@ <#case "U"> <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign order = JsonUtil.jsonToMap(dataRfx)> + <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ { <#-- check preparation type code (internal order and reservation are ignored) --> - <#if order.preparation_type_code == "010" || order.preparation_type_code == "030"> + <#if preparation_order.preparation_type_code == "010" || order.preparation_type_code == "030"> <#-- Only if preparation order not confirmed --> - <#if order.preparation_order_confirmed == "false" > + <#if preparation_order.preparation_order_confirmed == "false" > <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : @@ -41,7 +41,7 @@ <#case "D"> <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign order = JsonUtil.jsonToMap(dataRfx)> + <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index bac9ea4..bb28371 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${order.originator_reference}", + "RefID": "${preparation_order.originator_reference}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 353d997..3b3f258 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -2,13 +2,13 @@ <#include "ReflexUtils.ftl"> [ { - <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(order.planned_final_delivery_start_datetime,time_zone_offset_rfx) /> - <#assign pro_creation_datetime = RfxDateTimetoUTC(order.creation_datetime,time_zone_offset_rfx) /> + <#assign planned_final_delivery_start_datetime = RfxDateTimetoUTC(preparation_order.planned_final_delivery_start_datetime,time_zone_offset_rfx) /> + <#assign pro_creation_datetime = RfxDateTimetoUTC(preparation_order.creation_datetime,time_zone_offset_rfx) /> "Header": { "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${order.originator_reference}", + "RefID": "${preparation_order.originator_reference}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -23,45 +23,45 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, "ShipFrom": { - "ActorID": "${order.physical_depot_code}" + "ActorID": "${preparation_order.physical_depot_code}" }, "ShipFromAcked": true, "ShipTo": { - <#if order.address.type_code == "" && order.address.title_code == "" && order.address.first_name == "" && order.address.last_name == "" && order.address.mail_address == "" && order.address.contact_type_code == "" && order.address.mobile_phone_number == "" && order.address.land_line_phone_number == "" && order.address.fax_number == "" && order.address.address_type_code == "" && order.address.name_or_company_name == "" && order.address.additional_address_data_1 == "" && order.address.additional_address_data_2 == "" && order.address.post_code_area_name == "" && order.address.territorial_division_code == "" && order.address.postal_code == "" && order.address.iso_country_code == ""> - "ActorID": "${order.end_consignee_code}" + <#if preparation_order.address.type_code == "" && preparation_order.address.title_code == "" && preparation_order.address.first_name == "" && preparation_order.address.last_name == "" && preparation_order.address.mail_address == "" && preparation_order.address.contact_type_code == "" && preparation_order.address.mobile_phone_number == "" && preparation_order.address.land_line_phone_number == "" && preparation_order.address.fax_number == "" && preparation_order.address.address_type_code == "" && preparation_order.address.name_or_company_name == "" && preparation_order.address.additional_address_data_1 == "" && preparation_order.address.additional_address_data_2 == "" && preparation_order.address.post_code_area_name == "" && preparation_order.address.territorial_division_code == "" && preparation_order.address.postal_code == "" && preparation_order.address.iso_country_code == ""> + "ActorID": "${preparation_order.end_consignee_code}" <#else> "Actor": { - "Name" : "${order.address.name_or_company_name!""}", + "Name" : "${preparation_order.address.name_or_company_name!""}", "Address" : { - "City" : "${order.address.post_code_area_name!""}", - "CountryCode" : "${order.address.iso_country_code!""}", - "PostalCode" : "${order.address.postal_code!""}", - "StreetAddressOne" : "${order.address.street_and_number_and_po_box!""}", - "StreetAddressTwo" : "${order.address.additional_address_data_1!""}", - "StreetAddressThree" : "${order.address.additional_address_data_2!""}" + "City" : "${preparation_order.address.post_code_area_name!""}", + "CountryCode" : "${preparation_order.address.iso_country_code!""}", + "PostalCode" : "${preparation_order.address.postal_code!""}", + "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box!""}", + "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1!""}", + "StreetAddressThree" : "${preparation_order.address.additional_address_data_2!""}" } }, "Contact" : { - "FirstName" : "${order.address.first_name!""}", - "LastName" : "${order.address.last_name!""}", - "Emails" : ["${order.address.mail_address!""}"], - "Phones" : ["${order.address.mobile_phone_number!""}","${order.address.land_line_phone_number!""}", "${order.address.fax_number!""}" ] + "FirstName" : "${preparation_order.address.first_name!""}", + "LastName" : "${preparation_order.address.last_name!""}", + "Emails" : ["${preparation_order.address.mail_address!""}"], + "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ] } }, - <#if order.line_list??> + <#if preparation_order_line_list??> "Lines" : [ - <#list order.line_list as line> + <#list preparation_order_line_list > { - <#if (line.originator_reference_line_number!0) != 0> - "LineID": "${line.originator_reference_line_number}", + <#if (preparation_order_line_list.originator_reference_line_number!0) != 0> + "LineID": "${preparation_order_line_list.originator_reference_line_number}", <#else> - "LineID": "${line.preparation_order_line_number!0}", + "LineID": "${preparation_order_line_list.preparation_order_line_number!0}", <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">, @@ -70,10 +70,10 @@ { "Goods": { - "ItemID": "${line.item_code!"0"}", - "LVBranchID": "${line.item_lv_code!"0"}", - <#if (line.optional_attributes.forced_priority_date?length != 0) && (line.optional_attributes.forced_priority_date?starts_with("00") == false)> - <#assign forced_priority_date = line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> + "ItemID": "${preparation_order_line_list.item_code!"0"}", + "LVBranchID": "${preparation_order_line_list.item_lv_code!"0"}", + <#if (preparation_order_line_list.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line_list.optional_attributes.forced_priority_date?starts_with("00") == false)> + <#assign forced_priority_date = preparation_order_line_list.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${forced_priority_date}", @@ -84,7 +84,7 @@ "Quantity" : { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${line.base_lv_quantity_to_prepare!0}" + "Value": "${preparation_order_line_list.base_lv_quantity_to_prepare!0}" } } }<#sep>, diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl index 125bbd5..64a37f6 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl @@ -5,7 +5,7 @@ "MetaData": [ { "Key": "OrderType", - "Value": { "String" : "${order.optional_attributes.reason_code}"} + "Value": { "String" : "${preparation_order.optional_attributes.reason_code}"} } ], --> diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl index 5c9da3d..818abbd 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl @@ -4,18 +4,18 @@ "SegmentationKeys": [ { "Key": "Grade", - "Value": { "String" : "${line.grade_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line_list.grade_code_to_prepare}"} }, { "Key": "Owner", - "Value": { "String" : "${line.owner_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line_list.owner_code_to_prepare}"} }, { "Key": "BatchNumber", <#if reflexMvtStockInterface.batch_1 == ""> "Value": { "String" : "no batch"} <#else> - "Value": { "String" : "${line.batch_1}"} + "Value": { "String" : "${preparation_order_line_list.batch_1}"} } ] From d09fa33577e6643fe608b5d28ef6e95efb4a3407 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 17:20:54 +0100 Subject: [PATCH 05/10] Modif 2011231720 HsrPro --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 20 +++++++++---------- ...ExecutionflowDetected_SegmentationKeys.ftl | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 3b3f258..44022e4 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -54,14 +54,14 @@ }, - <#if preparation_order_line_list??> + <#if preparation_order.line_list??> "Lines" : [ - <#list preparation_order_line_list > + <#list preparation_order.line_list as preparation_order_line > { - <#if (preparation_order_line_list.originator_reference_line_number!0) != 0> - "LineID": "${preparation_order_line_list.originator_reference_line_number}", + <#if (preparation_order_line.originator_reference_line_number!0) != 0> + "LineID": "${preparation_order_line.originator_reference_line_number}", <#else> - "LineID": "${preparation_order_line_list.preparation_order_line_number!0}", + "LineID": "${preparation_order_line.preparation_order_line_number!0}", <#-- Line Metadata inclusion --> <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">, @@ -70,10 +70,10 @@ { "Goods": { - "ItemID": "${preparation_order_line_list.item_code!"0"}", - "LVBranchID": "${preparation_order_line_list.item_lv_code!"0"}", - <#if (preparation_order_line_list.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line_list.optional_attributes.forced_priority_date?starts_with("00") == false)> - <#assign forced_priority_date = preparation_order_line_list.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> + "ItemID": "${preparation_order_line.item_code!"0"}", + "LVBranchID": "${preparation_order_line.item_lv_code!"0"}", + <#if (preparation_order_line.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)> + <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${forced_priority_date}", @@ -84,7 +84,7 @@ "Quantity" : { "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${preparation_order_line_list.base_lv_quantity_to_prepare!0}" + "Value": "${preparation_order_line.base_lv_quantity_to_prepare!0}" } } }<#sep>, diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl index 818abbd..8cb3286 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl @@ -4,18 +4,18 @@ "SegmentationKeys": [ { "Key": "Grade", - "Value": { "String" : "${preparation_order_line_list.grade_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line.grade_code_to_prepare}"} }, { "Key": "Owner", - "Value": { "String" : "${preparation_order_line_list.owner_code_to_prepare}"} + "Value": { "String" : "${preparation_order_line.owner_code_to_prepare}"} }, { "Key": "BatchNumber", <#if reflexMvtStockInterface.batch_1 == ""> "Value": { "String" : "no batch"} <#else> - "Value": { "String" : "${preparation_order_line_list.batch_1}"} + "Value": { "String" : "${preparation_order_line.batch_1}"} } ] From 957df514870ffd4e200c3280b5c674b3e53c193e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:43:53 +0100 Subject: [PATCH 06/10] Modifs FTL 2211231443 --- RFXtoRP_HsaCarrier_ActorCreated.ftl | 17 ++++++++++------- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 16 ++++++++-------- RPtoRFX_PrepOrder.ftl | 4 ++-- 4 files changed, 21 insertions(+), 18 deletions(-) diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index d581b2e..fd16db5 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -22,7 +22,7 @@ "Address": { <#-- if Reflex WMS address is structured --> - <#if carrier.carrier_structured_address?? > + <#if carrier.carrier_structured_address?? > "Name": "${carrier.carrier_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}", @@ -35,16 +35,19 @@ <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${carrier.address.company_name?json_string}", - "StreetAddressOne" : "${carrier.address.address_1?json_string}", - "StreetAddressTwo" : "${carrier.address.address_2?json_string}", - "StreetAddressThree" : "${carrier.address.address_3?json_string}" + <#if carrier.address??> + "Name": "${carrier.address.company_name?json_string}", + "StreetAddressOne" : "${carrier.address.address_1?json_string}", + "StreetAddressTwo" : "${carrier.address.address_2?json_string}", + "StreetAddressThree" : "${carrier.address.address_3?json_string}" + }, - - "Phones": ["${carrier.address.telephone?json_string}", + <#if carrier.address??> + "Phones": ["${carrier.address.telephone?json_string}", "${carrier.address.other_number?json_string}" ], + "Typology": "TYPOLOGY_CARRIER" } } diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 1735316..754b2d2 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -43,7 +43,7 @@ "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}", "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}", "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code}", - "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference}", + "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}", <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 44022e4..8ccf98a 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -32,22 +32,22 @@ <#else> "Actor": { - "Name" : "${preparation_order.address.name_or_company_name!""}", + "Name" : "${preparation_order.address.name_or_company_name?json_string!""}", "Address" : { - "City" : "${preparation_order.address.post_code_area_name!""}", + "City" : "${preparation_order.address.post_code_area_name?json_string!""}", "CountryCode" : "${preparation_order.address.iso_country_code!""}", "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box!""}", - "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1!""}", - "StreetAddressThree" : "${preparation_order.address.additional_address_data_2!""}" + "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}", + "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}", + "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}" } }, "Contact" : { - "FirstName" : "${preparation_order.address.first_name!""}", - "LastName" : "${preparation_order.address.last_name!""}", - "Emails" : ["${preparation_order.address.mail_address!""}"], + "FirstName" : "${preparation_order.address.first_name?json_string!""}", + "LastName" : "${preparation_order.address.last_name?json_string!""}", + "Emails" : ["${preparation_order.address.mail_address?json_string!""}"], "Phones" : ["${preparation_order.address.mobile_phone_number!""}","${preparation_order.address.land_line_phone_number!""}", "${preparation_order.address.fax_number!""}" ] } diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index f55bfbb..735abba 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -35,8 +35,8 @@ }, <#if executionflow.ShipTo.ActorID == ""> "address": { - "first_name": "${executionflow.ShipTo.Contact.FirstName!""}", - "last_name" :"${executionflow.ShipTo.Contact.Lastname!""}", + "first_name": "${executionflow.ShipTo.Contact.FirstName?json_string!""}", + "last_name" :"${executionflow.ShipTo.Contact.Lastname?json_string!""}", "mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}", "mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}", "street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne?json_string!""}", From 2409cf3a01ffd69a7de1632f6cc44798c0e028ad Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 14:59:25 +0100 Subject: [PATCH 07/10] Modif FTL 2211231459 --- RFXtoRP_HsaCons_ActorCreated.ftl | 18 ++++++++++-------- RFXtoRP_HsaSup_ActorCreated.ftl | 18 +++++++++++------- 2 files changed, 21 insertions(+), 15 deletions(-) diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 8f09d9c..06bc6c2 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -35,18 +35,20 @@ <#-- if Reflex WMS is not structured --> <#else> + <#if actor.address?? > - "Name": "${actor.address.company_name?json_string}", - "StreetAddressOne" : "${actor.address.address_1?json_string}", - "StreetAddressTwo" : "${actor.address.address_2?json_string}", - "StreetAddressThree" : "${actor.address.address_3?json_string}" - + "Name": "${actor.address.company_name?json_string}", + "StreetAddressOne" : "${actor.address.address_1?json_string}", + "StreetAddressTwo" : "${actor.address.address_2?json_string}", + "StreetAddressThree" : "${actor.address.address_3?json_string}" + }, - - "Phones": ["${actor.address.telephone?json_string}", + <#if actor.address?? > + "Phones": ["${actor.address.telephone?json_string}", "${actor.address.other_number?json_string}" - ], + ], + "Typology": "TYPOLOGY_UNKNOWN" } } diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index a4e5d12..5a219ad 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -34,16 +34,20 @@ <#-- if Reflex WMS address is not structured --> <#else> - "Name": "${actor.optional_attributes.company_name?json_string}", - "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", - "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", - "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" + <#if actor.optional_attributes?? > + "Name": "${actor.optional_attributes.company_name?json_string}", + "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", + "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", + "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}" + }, - "Phones": ["${actor.optional_attributes.telephone?json_string}", - "${actor.optional_attributes.other_number?json_string}" - ], + <#if actor.optional_attributes?? > + "Phones": ["${actor.optional_attributes.telephone?json_string}", + "${actor.optional_attributes.other_number?json_string}" + ], + "Typology": "TYPOLOGY_UNKNOWN" } } From b5c85220b51014ee0f98e0535d972511705235d8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 22 Nov 2023 16:45:11 +0100 Subject: [PATCH 08/10] Modifs FTL 2211231645 --- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 043fa12..926bc9b 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -68,7 +68,11 @@ <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, "ExecutionflowID": "${preparation_line.preparation_order_originator_reference}", - "LineID": "${preparation_line.pro_line_number}", + <#if (preparation_line.pro_originator_reference_line_number!0) != 0> + "LineID": "${preparation_line.pro_originator_reference_line_number}", + <#else> + "LineID": "${preparation_line.pro_line_number!0}", + "ActorID": "${preparationOrder.physical_depot_code}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", From 270f90a9b3494a6c3c927b65ad4cacbc470fe7bf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 1 Dec 2023 10:20:01 +0100 Subject: [PATCH 09/10] Modif HsrPrepa 0112231019 --- RFXtoRP_HsaProStatus.ftl | 2 +- RFXtoRP_HsrPrepa.ftl | 72 +++++++++++++++++++++------------------- 2 files changed, 38 insertions(+), 36 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 63f96df..2a1aa97 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ - <#--**Pick batch runned (100) **--> + <#--**Pick batch runned (200) **--> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index f365bc0..2d5075d 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -2,57 +2,59 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> - + <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> - + <#assign aDateTime = .now> - + <#switch cloudEventMsg.action> - <#case "C"> - <#--<#case "U"> - <#-- *********************************************** Action = CREATE or UPDATE ******************** --> - <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> - <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> - [ +<#case "C"> +<#--<#case "U"> +<#-- *********************************************** Action = CREATE or UPDATE ******************** --> +<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> +<#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> + +<#if preparationOrder.total_lv_validated !=0> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> + <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsPrepared> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_GoodsPrepared.ftl"> }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> } - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line> - <#list preparation_line.despatched_ipg_list as despatched_ipg> - <#if despatched_ipg.consignment_unit_id != ""> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } - - + <#list preparation_line.despatched_ipg_list as despatched_ipg> + <#if despatched_ipg.consignment_unit_id != ""> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> + } + + - ] - <#break> - - <#case "D"> - <#-- *********************************************** Action = DELETE ******************** --> - <#stop "event not supported (Case D)"> - <#break> - - - <#default> - <#stop "event not supported"> - + ] +<#else> + <#stop "no confirmed quantity for the preparation - preparation closed"> + + +<#break> +<#case "D"> +<#-- *********************************************** Action = DELETE ******************** --> +<#stop "event not supported (Case D)"> +<#break> +<#default> +<#stop "event not supported"> + \ No newline at end of file From 64e03640d1fad340ede2538a02e828ff6c58bf08 Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Fri, 1 Dec 2023 16:06:45 +0100 Subject: [PATCH 10/10] Release 1.2.7+2 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index ada06a7..745444b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.7+1 +1.2.7+2