This commit is contained in:
Laurie MONTANT 2024-09-17 11:46:24 +02:00
parent c05a4653ba
commit 09ec0e4509
19 changed files with 24 additions and 36 deletions

View File

@ -1,7 +1,7 @@
<#-- --------------------------------------------------------------------------------------- --> <#-- --------------------------------------------------------------------------------------- -->
<#-- Prefix --> <#-- Prefix -->
<#-- --------------------------------------------------------------------------------------- --> <#-- --------------------------------------------------------------------------------------- -->
<#assign depot = "" > <#assign prefixdepot = "" >
<#assign carrier = "" > <#assign prefixcarrier = "" >
<#assign supplier = "" > <#assign prefixsupplier = "" >
<#assign consignee = "" > <#assign prefixconsignee = "" >

View File

@ -11,7 +11,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${stock.physical_depot_code}" "ActorID": "${stock.physical_depot_code}"
<#else> <#else>
"ActorID": "${depot}${stock.physical_depot_code}" "ActorID": "${prefixdepot}${stock.physical_depot_code}"
</#if> </#if>
}, },
"Payload": { "Payload": {
@ -21,12 +21,7 @@
"DateTime": "${generation_date}", "DateTime": "${generation_date}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
}, },
"ID": "${stock.physical_depot_code}-${idSnapshot}",
<#if uniqueness?? && uniqueness!="" >
"ID": "${stock.physical_depot_code}-${idSnapshot}",
<#else>
"ID": "${depot}${stock.physical_depot_code}-${idSnapshot}",
</#if>
"MessageNb": ${sum_elt} "MessageNb": ${sum_elt}
} }

View File

@ -11,7 +11,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${stock.physical_depot_code}", "ActorID": "${stock.physical_depot_code}",
<#else> <#else>
"ActorID": "${depot}${stock.physical_depot_code}", "ActorID": "${prefixdepot}${stock.physical_depot_code}",
</#if> </#if>
<#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) /> <#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
@ -20,11 +20,7 @@
"DateTime": "${generation_date}", "DateTime": "${generation_date}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
}, },
<#if uniqueness?? && uniqueness!="" >
"ID": "${stock.physical_depot_code}-${idSnapshot}", "ID": "${stock.physical_depot_code}-${idSnapshot}",
<#else>
"ID": "${depot}${stock.physical_depot_code}-${idSnapshot}",
</#if>
"Quantity": "Quantity":
{ {
"Value" : "${stock.quantity_in_base_lvs!"0"}", "Value" : "${stock.quantity_in_base_lvs!"0"}",

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${carrier.carrier_code?trim?json_string}" "RefID": "${carrier.carrier_code?trim?json_string}"
<#else> <#else>
"RefID": "${carrier}${carrier.carrier_code?trim?json_string}" "RefID": "${prefixcarrier}${carrier.carrier_code?trim?json_string}"
</#if> </#if>
}, },
"Payload": { "Payload": {
@ -23,8 +23,6 @@
<#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">,
"Address": "Address":
{ {
<#-- if Reflex WMS address is structured --> <#-- if Reflex WMS address is structured -->

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${carrier.carrier_code?trim?json_string}" "RefID": "${carrier.carrier_code?trim?json_string}"
<#else> <#else>
"RefID": "${carrier}${carrier.carrier_code?trim?json_string}" "RefID": "${prefixcarrier}${carrier.carrier_code?trim?json_string}"
</#if> </#if>
}, },

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${actor.code?trim?json_string}" "RefID": "${actor.code?trim?json_string}"
<#else> <#else>
"RefID": "${consignee}${actor.code?trim?json_string}" "RefID": "${prefixconsignee}${actor.code?trim?json_string}"
</#if> </#if>
}, },

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${actor.code?trim?json_string}" "RefID": "${actor.code?trim?json_string}"
<#else> <#else>
"RefID": "${consignee}${actor.code?trim?json_string}" "RefID": "${prefixconsignee}${actor.code?trim?json_string}"
</#if> </#if>
}, },
"Payload": {} "Payload": {}

View File

@ -40,7 +40,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
<#else> <#else>
"ActorID": "${depot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "ActorID": "${prefixdepot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
</#if> </#if>
"Quantity": { "Quantity": {
"LVID": "${quantity_in_base_lv_RP_Cst}", "LVID": "${quantity_in_base_lv_RP_Cst}",

View File

@ -22,7 +22,6 @@
}> }>
<#assign generation_date = RfxDateTimetoUTC(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_offset_rfx) /> <#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 /> <#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
[ [
{ {
"Header": { "Header": {
@ -46,7 +45,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "ActorID": "${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
<#else> <#else>
"ActorID": "${depot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}", "ActorID": "${prefixdepot}${reflexMvtStockInterface.physical_depot_code?trim?json_string}",
</#if> </#if>
"Movement": { "Movement": {

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${actor.code?trim?json_string}" "RefID": "${actor.code?trim?json_string}"
<#else> <#else>
"RefID": "${supplier}${actor.code?trim?json_string}" "RefID": "${prefixsupplier}${actor.code?trim?json_string}"
</#if> </#if>
}, },
"Payload": { "Payload": {

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${actor.code?trim?json_string}" "RefID": "${actor.code?trim?json_string}"
<#else> <#else>
"RefID": "${supplier}${actor.code?trim?json_string}" "RefID": "${prefixsupplier}${actor.code?trim?json_string}"
</#if> </#if>
}, },
"Payload": {} "Payload": {}

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${depot.physical_depot_code?trim?json_string}" "RefID": "${depot.physical_depot_code?trim?json_string}"
<#else> <#else>
"RefID": "${depot}${depot.physical_depot_code?trim?json_string}" "RefID": "${prefixdepot}${depot.physical_depot_code?trim?json_string}"
</#if> </#if>
}, },
"Payload": { "Payload": {

View File

@ -10,7 +10,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"RefID": "${depot.physical_depot_code?trim?json_string}" "RefID": "${depot.physical_depot_code?trim?json_string}"
<#else> <#else>
"RefID": "${depot}${depot.physical_depot_code?trim?json_string}" "RefID": "${prefixdepot}${depot.physical_depot_code?trim?json_string}"
</#if> </#if>
}, },
"Payload": {} "Payload": {}

View File

@ -22,7 +22,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
<#else> <#else>
"ActorID":"${carrier}${preparationOrder.load_data.carrier_code?trim?json_string}" "ActorID":"${prefixcarrier}${preparationOrder.load_data.carrier_code?trim?json_string}"
</#if> </#if>
} }
<#-- Add transport grade code <#-- Add transport grade code

View File

@ -121,7 +121,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparationOrder.physical_depot_code?trim?json_string}", "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
<#else> <#else>
"ActorID": "${depot}${preparationOrder.physical_depot_code?trim?json_string}", "ActorID": "${prefixdepot}${preparationOrder.physical_depot_code?trim?json_string}",
</#if> </#if>
"Quantity": { "Quantity": {
"LVID": "${quantity_in_base_lv_RP_Cst}", "LVID": "${quantity_in_base_lv_RP_Cst}",

View File

@ -22,7 +22,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
<#else> <#else>
"ActorID":"${carrier}${preparationOrder.load_data.carrier_code?trim?json_string}" "ActorID":"${prefixcarrier}${preparationOrder.load_data.carrier_code?trim?json_string}"
</#if> </#if>
} }
} }

View File

@ -22,7 +22,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}" "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
<#else> <#else>
"ActorID":"${carrier}${preparationOrder.load_data.carrier_code?trim?json_string}" "ActorID":"${prefixcarrier}${preparationOrder.load_data.carrier_code?trim?json_string}"
</#if> </#if>
} }

View File

@ -30,7 +30,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${preparation_order.physical_depot_code?trim?json_string}" "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
<#else> <#else>
"ActorID": "${depot}${preparation_order.physical_depot_code?trim?json_string}" "ActorID": "${prefixdepot}${preparation_order.physical_depot_code?trim?json_string}"
</#if> </#if>
}, },
"ShipFromAcked": true, "ShipFromAcked": true,

View File

@ -33,7 +33,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"ActorID": "${receipt.physical_depot_code?trim?json_string}" "ActorID": "${receipt.physical_depot_code?trim?json_string}"
<#else> <#else>
"ActorID": "${depot}${receipt.physical_depot_code?trim?json_string}" "ActorID": "${prefixdepot}${receipt.physical_depot_code?trim?json_string}"
</#if> </#if>
}, },
"ShipToAcked": true, "ShipToAcked": true,
@ -42,7 +42,7 @@
<#if uniqueness?? && uniqueness!="" > <#if uniqueness?? && uniqueness!="" >
"Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"}, "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code?trim?json_string}"},
<#else> <#else>
"Carrier" : {"ActorID": "${carrier}${receipt.carrier_informations.carrier_code?trim?json_string}"}, "Carrier" : {"ActorID": "${prefixcarrier}${receipt.carrier_informations.carrier_code?trim?json_string}"},
</#if> </#if>
</#if> </#if>