From 09ec0e450931ae23c5392596c8a033d0bccb74d9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 17 Sep 2024 11:46:24 +0200 Subject: [PATCH] modifs --- ActorPrefix.ftl | 8 ++++---- RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl | 9 ++------- RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl | 6 +----- RFXtoRP_HsaCarrier_ActorCreated.ftl | 4 +--- RFXtoRP_HsaCarrier_ActorDeleted.ftl | 2 +- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- RFXtoRP_HsaCons_ActorDeleted.ftl | 2 +- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- RFXtoRP_HsaIpgMove_StockMoved.ftl | 3 +-- RFXtoRP_HsaSup_ActorCreated.ftl | 2 +- RFXtoRP_HsaSup_ActorDeleted.ftl | 2 +- RFXtoRP_HsrDepot_ActorCreated.ftl | 2 +- RFXtoRP_HsrDepot_ActorDeleted.ftl | 2 +- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 2 +- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 4 ++-- 19 files changed, 24 insertions(+), 36 deletions(-) diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl index 986ef01..9b9ee15 100644 --- a/ActorPrefix.ftl +++ b/ActorPrefix.ftl @@ -1,7 +1,7 @@ <#-- --------------------------------------------------------------------------------------- --> <#-- Prefix --> <#-- --------------------------------------------------------------------------------------- --> -<#assign depot = "" > -<#assign carrier = "" > -<#assign supplier = "" > -<#assign consignee = "" > \ No newline at end of file +<#assign prefixdepot = "" > +<#assign prefixcarrier = "" > +<#assign prefixsupplier = "" > +<#assign prefixconsignee = "" > \ No newline at end of file diff --git a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl index 85dcd70..806ce6c 100644 --- a/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl +++ b/RFXtoRP_HfDtlStockLs_ActorSnapshotCompleted.ftl @@ -11,7 +11,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${stock.physical_depot_code}" <#else> - "ActorID": "${depot}${stock.physical_depot_code}" + "ActorID": "${prefixdepot}${stock.physical_depot_code}" }, "Payload": { @@ -21,12 +21,7 @@ "DateTime": "${generation_date}", "AuthorTimeZone": "${time_zone_rfx}" }, - - <#if uniqueness?? && uniqueness!="" > - "ID": "${stock.physical_depot_code}-${idSnapshot}", - <#else> - "ID": "${depot}${stock.physical_depot_code}-${idSnapshot}", - + "ID": "${stock.physical_depot_code}-${idSnapshot}", "MessageNb": ${sum_elt} } diff --git a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl index cd500e1..27775b7 100644 --- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl +++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl @@ -11,7 +11,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${stock.physical_depot_code}", <#else> - "ActorID": "${depot}${stock.physical_depot_code}", + "ActorID": "${prefixdepot}${stock.physical_depot_code}", <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> @@ -20,11 +20,7 @@ "DateTime": "${generation_date}", "AuthorTimeZone": "${time_zone_rfx}" }, - <#if uniqueness?? && uniqueness!="" > "ID": "${stock.physical_depot_code}-${idSnapshot}", - <#else> - "ID": "${depot}${stock.physical_depot_code}-${idSnapshot}", - "Quantity": { "Value" : "${stock.quantity_in_base_lvs!"0"}", diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 7cd7dd2..a1fa2d3 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${carrier.carrier_code?trim?json_string}" <#else> - "RefID": "${carrier}${carrier.carrier_code?trim?json_string}" + "RefID": "${prefixcarrier}${carrier.carrier_code?trim?json_string}" }, "Payload": { @@ -23,8 +23,6 @@ <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, - - "Address": { <#-- if Reflex WMS address is structured --> diff --git a/RFXtoRP_HsaCarrier_ActorDeleted.ftl b/RFXtoRP_HsaCarrier_ActorDeleted.ftl index 9b8559a..89a3c3f 100644 --- a/RFXtoRP_HsaCarrier_ActorDeleted.ftl +++ b/RFXtoRP_HsaCarrier_ActorDeleted.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${carrier.carrier_code?trim?json_string}" <#else> - "RefID": "${carrier}${carrier.carrier_code?trim?json_string}" + "RefID": "${prefixcarrier}${carrier.carrier_code?trim?json_string}" }, diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 9cbe7e5..f342a4e 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${actor.code?trim?json_string}" <#else> - "RefID": "${consignee}${actor.code?trim?json_string}" + "RefID": "${prefixconsignee}${actor.code?trim?json_string}" }, diff --git a/RFXtoRP_HsaCons_ActorDeleted.ftl b/RFXtoRP_HsaCons_ActorDeleted.ftl index 4d1956d..f314e77 100644 --- a/RFXtoRP_HsaCons_ActorDeleted.ftl +++ b/RFXtoRP_HsaCons_ActorDeleted.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${actor.code?trim?json_string}" <#else> - "RefID": "${consignee}${actor.code?trim?json_string}" + "RefID": "${prefixconsignee}${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index f63084d..cd36940 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -40,7 +40,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", <#else> - "ActorID": "${depot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}", + "ActorID": "${prefixdepot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 4ee24aa..87d78b7 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -22,7 +22,6 @@ }> <#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc /> - [ { "Header": { @@ -46,7 +45,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", <#else> - "ActorID": "${depot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}", + "ActorID": "${prefixdepot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "Movement": { diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 490d254..16c2f84 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${actor.code?trim?json_string}" <#else> - "RefID": "${supplier}${actor.code?trim?json_string}" + "RefID": "${prefixsupplier}${actor.code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsaSup_ActorDeleted.ftl b/RFXtoRP_HsaSup_ActorDeleted.ftl index 94179b2..e4745a1 100644 --- a/RFXtoRP_HsaSup_ActorDeleted.ftl +++ b/RFXtoRP_HsaSup_ActorDeleted.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${actor.code?trim?json_string}" <#else> - "RefID": "${supplier}${actor.code?trim?json_string}" + "RefID": "${prefixsupplier}${actor.code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index 28bbb91..56f93f7 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${depot.physical_depot_code?trim?json_string}" <#else> - "RefID": "${depot}${depot.physical_depot_code?trim?json_string}" + "RefID": "${prefixdepot}${depot.physical_depot_code?trim?json_string}" }, "Payload": { diff --git a/RFXtoRP_HsrDepot_ActorDeleted.ftl b/RFXtoRP_HsrDepot_ActorDeleted.ftl index 7dcb8eb..d08aa72 100644 --- a/RFXtoRP_HsrDepot_ActorDeleted.ftl +++ b/RFXtoRP_HsrDepot_ActorDeleted.ftl @@ -10,7 +10,7 @@ <#if uniqueness?? && uniqueness!="" > "RefID": "${depot.physical_depot_code?trim?json_string}" <#else> - "RefID": "${depot}${depot.physical_depot_code?trim?json_string}" + "RefID": "${prefixdepot}${depot.physical_depot_code?trim?json_string}" }, "Payload": {} diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index cc16cdd..daf74db 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -22,7 +22,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" <#else> - "ActorID":"${carrier}${preparationOrder.load_data.carrier_code?trim?json_string}" + "ActorID":"${prefixcarrier}${preparationOrder.load_data.carrier_code?trim?json_string}" } <#-- Add transport grade code diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index bfd6160..cb1141c 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -121,7 +121,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}", <#else> - "ActorID": "${depot}${preparationOrder.physical_depot_code?trim?json_string}", + "ActorID": "${prefixdepot}${preparationOrder.physical_depot_code?trim?json_string}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index de08ad2..905c839 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -22,7 +22,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" <#else> - "ActorID":"${carrier}${preparationOrder.load_data.carrier_code?trim?json_string}" + "ActorID":"${prefixcarrier}${preparationOrder.load_data.carrier_code?trim?json_string}" } } diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 0498bbb..cdcd4d0 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -22,7 +22,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" <#else> - "ActorID":"${carrier}${preparationOrder.load_data.carrier_code?trim?json_string}" + "ActorID":"${prefixcarrier}${preparationOrder.load_data.carrier_code?trim?json_string}" } diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index dc2cb46..602af26 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -30,7 +30,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${preparation_order.physical_depot_code?trim?json_string}" <#else> - "ActorID": "${depot}${preparation_order.physical_depot_code?trim?json_string}" + "ActorID": "${prefixdepot}${preparation_order.physical_depot_code?trim?json_string}" }, "ShipFromAcked": true, diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 3d647f8..10ce9e5 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -33,7 +33,7 @@ <#if uniqueness?? && uniqueness!="" > "ActorID": "${receipt.physical_depot_code?trim?json_string}" <#else> - "ActorID": "${depot}${receipt.physical_depot_code?trim?json_string}" + "ActorID": "${prefixdepot}${receipt.physical_depot_code?trim?json_string}" }, "ShipToAcked": true, @@ -42,7 +42,7 @@ <#if uniqueness?? && uniqueness!="" > "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"}, <#else> - "Carrier" : {"ActorID": "${carrier}${receipt.carrier_informations.carrier_code?trim?json_string}"}, + "Carrier" : {"ActorID": "${prefixcarrier}${receipt.carrier_informations.carrier_code?trim?json_string}"},