From 3ed530fb0946ba4705f57c39c4d272083942a9bf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 29 Feb 2024 13:34:59 +0100 Subject: [PATCH] modifs trim json --- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 2 +- RFXtoRP_HsaCarrier_ActorCreated.ftl | 2 +- RFXtoRP_HsaCarrier_ActorDeleted.ftl | 2 +- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- RFXtoRP_HsaCons_ActorDeleted.ftl | 2 +- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 8 ++++---- RFXtoRP_HsaIpgMove_StockMoved.ftl | 4 ++-- RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl | 2 +- RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl | 2 +- RFXtoRP_HsaItm_ItemCreated.ftl | 2 +- RFXtoRP_HsaItm_ItemDeleted.ftl | 2 +- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 2 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 2 +- RFXtoRP_HsaSup_ActorCreated.ftl | 2 +- RFXtoRP_HsaSup_ActorDeleted.ftl | 2 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 2 +- RFXtoRP_HsrDepot_ActorDeleted.ftl | 2 +- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++--- RFXtoRP_HsrPrepa_GoodsPrepared.ftl | 6 +++--- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 4 ++-- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 8 ++++---- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 10 +++++----- RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 30 files changed, 46 insertions(+), 46 deletions(-) diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index bc2f003..9152df1 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -22,7 +22,7 @@ }, "Goods": { - "ItemID": "${stock.item_code?json_string}", + "ItemID": "${stock.item_code?trim?json_string}", "LVBranchID": "${stock.item_logistical_variant_code}", <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc /> <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) > diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index e9b707a..8c35239 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code?json_string}" + "RefID": "${carrier.carrier_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index da3b214..5e131c4 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${carrier.carrier_code?json_string}" + "RefID": "${carrier.carrier_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 2aac723..97b21f8 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index bb838af..6fbfb45 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index f1c5d4b..4a65641 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${reflexMvtStockInterface.hd_number}" + "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}" }, "Payload": { "ReceivedContents" :[ @@ -18,7 +18,7 @@ "AuthorTimeZone": "${time_zone_rfx}" }, "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code?json_string}", + "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", "PriorityDate": "${priority_date}", @@ -26,12 +26,12 @@ <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?json_string}", + "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", - "ActorID": "${reflexMvtStockInterface.physical_depot_code?json_string}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${reflexMvtStockInterface.ipg_move_quantity_in_base_lvs} diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 9421f70..86c7d55 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -23,7 +23,7 @@ }, "Payload": { "Goods": { - "ItemID": "${reflexMvtStockInterface.item_code?json_string}", + "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "PriorityDate": "${ipg_priority_datetime}", <#-- Segmentation keys inclusions --> @@ -32,7 +32,7 @@ "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}" }, - "ActorID": "${reflexMvtStockInterface.physical_depot_code?json_string}", + "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "Movement": { "DateTime": { diff --git a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl index 467028b..edc0760 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantRemoved.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code?json_string}" + "RefID": "${lv.item_code?trim?json_string}" }, "Payload": { "RemovedLogisticVariantIDs":["${lv.logistical_variant_code}"] diff --git a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl index ac9267a..81560f3 100644 --- a/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl +++ b/RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${lv.item_code?json_string}" + "RefID": "${lv.item_code?trim?json_string}" }, "Payload": { "LogisticVariants": [ diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 943f331..9ef083d 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -6,7 +6,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code?json_string}" + "RefID": "${item.item_code?trim?json_string}" }, "Payload": { "DescriptionsByLanguage": [{ diff --git a/RFXtoRP_HsaItm_ItemDeleted.ftl b/RFXtoRP_HsaItm_ItemDeleted.ftl index c8775d9..a9de0f1 100644 --- a/RFXtoRP_HsaItm_ItemDeleted.ftl +++ b/RFXtoRP_HsaItm_ItemDeleted.ftl @@ -5,7 +5,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${item.item_code?json_string}" + "RefID": "${item.item_code?trim?json_string}" }, "Payload": {} } diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index e0f1939..0a1b945 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 3c66b75..7f9c79a 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index e5b33cc..fb804ac 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index bb838af..6fbfb45 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${actor.code?json_string}" + "RefID": "${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 187fae8..31774f9 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code?json_string}" + "RefID": "${depot.physical_depot_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsrDepot_ActorDeleted.ftl b/RFXtoRP_HsrDepot_ActorDeleted.ftl index 0e82294..d4e070a 100644 --- a/RFXtoRP_HsrDepot_ActorDeleted.ftl +++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl @@ -4,7 +4,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${depot.physical_depot_code?json_string}" + "RefID": "${depot.physical_depot_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 6e5d826..50d8214 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -7,16 +7,16 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?json_string}" + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}" }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?json_string}" + "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" } <#-- Add transport grade code <#if preparationOrder.transport_grade_code!=""> , - "CarrierService":"${preparationOrder.transport_grade_code?json_string}" + "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}" --> } } diff --git a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl index 607fcd3..20b9138 100644 --- a/RFXtoRP_HsrPrepa_GoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_GoodsPrepared.ftl @@ -67,7 +67,7 @@ "PreparedContents" :[ { "Goods": { - "ItemID": "${preparation_line.item_code?json_string}", + "ItemID": "${preparation_line.item_code?trim?json_string}", "LVBranchID": "${preparation_line.item_lv_code?json_string}", <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> @@ -104,13 +104,13 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?json_string}", + "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", <#else> "LineID": "${preparation_line.pro_line_number!0}", - "ActorID": "${preparationOrder.physical_depot_code?json_string}", + "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", "Value": ${despatched_ipg.quantity_lvs} diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index e9da77f..51675ba 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -7,11 +7,11 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?json_string}" + "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}" }, "Payload":{ "Carrier": { - "ActorID":"${preparationOrder.load_data.carrier_code?json_string}" + "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" } } } diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 495a261..107c511 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${despatched_ipg.consignment_unit_id?json_string}" + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 952e8b8..9cdd1b6 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?json_string}", + "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 8cfafad..d1f4107 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?json_string}", + "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -23,10 +23,10 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl">, <#-- Add transport grade code <#if preparation_order.transport_grade_code!=""> - "CarrierService":"${preparation_order.transport_grade_code?json_string}", + "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}", --> "ShipFrom": { - "ActorID": "${preparation_order.physical_depot_code?json_string}" + "ActorID": "${preparation_order.physical_depot_code?trim?json_string}" }, "ShipFromAcked": true, "ShipTo": { @@ -89,7 +89,7 @@ { "Goods": { - "ItemID": "${preparation_order_line.item_code?json_string!"0"}", + "ItemID": "${preparation_order_line.item_code?trim?json_string!"0"}", "LVBranchID": "${preparation_order_line.item_lv_code?json_string!"0"}", <#if (preparation_order_line.optional_attributes.forced_priority_date?length != 0) && (preparation_order_line.optional_attributes.forced_priority_date?starts_with("00") == false)> <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc /> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 368c776..46a8692 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index d2b5463..5919440 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -25,16 +25,16 @@ "ShipFrom": { - "ActorID": "${receipt.original_code?json_string}" + "ActorID": "${receipt.original_code?trim?json_string}" }, "ShipTo" : { - "ActorID": "${receipt.physical_depot_code?json_string}" + "ActorID": "${receipt.physical_depot_code?trim?json_string}" }, "ShipToAcked": true, <#if receipt.carrier_informations.carrier_code != ""> - "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?json_string}"}, + "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"}, @@ -49,7 +49,7 @@ { "Goods": { - "ItemID": "${line.item_code?json_string!"0"}", + "ItemID": "${line.item_code?trim?json_string!"0"}", "LVBranchID": "${line.item_lv_code?json_string!"0"}", <#if line.line_without_detail??> <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)> diff --git a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl index 7c3171f..485a5c5 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index c82554d..65f257c 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?json_string}", + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}"