From 0485a637af427785aa95e97e2e279c4a042ecece Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 20 Nov 2023 17:20:54 +0100 Subject: [PATCH] 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}"} } ]