From dbde25f5d3e7ea2e3f8fe2f0ee5f8ac3c220e8a8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 12 Dec 2023 10:47:56 +0100 Subject: [PATCH] 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!""}" ] - } - + } },