From de828ed606f9196163a005a14cb82774bde27472 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Oct 2024 14:46:45 +0200 Subject: [PATCH 1/3] modifs (cherry picked from commit 25011e68e69e6f0c1758d8e516e418e959deeb05) --- RPtoRFX_PrepOrder.ftl | 2 +- RPtoRFX_Receipt.ftl | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index a33d6d5..0f18d90 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -89,7 +89,7 @@ "owner_code_to_prepare" :"${owner_code_to_prepare}", "grade_code_to_prepare" :"${grade_code_to_prepare}", "input_order_data": "false", - "batch_1": "${batch_1}", + "batch_1": "${batch_1?json_string}", "base_lv_quantity": "true", "any_lv": "false" <#-- diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 80eafaa..838293a 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -9,16 +9,16 @@ "physical_depot_code": "${executionflow.ShipTo.ActorID!""}", "originator_code": "${originator_code}" }, - "payload" : + "payload" : { "receipt_reference": "${executionflow.OrderID?json_string}", "receipt_type": "${receipt_type}", - "receipt_reason_code": "${receipt_reason_code}", + "receipt_reason_code": "${receipt_reason_code}", "work_mode_code" : "${work_mode_code}", "original_code" : "${executionflow.ShipFrom.ActorID}", "carrier_code" : "${executionflow.Carrier.ActorID!""}", - <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> + <#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> "receipt_datetime": "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}", <#else> "receipt_datetime": "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}", @@ -26,8 +26,8 @@ "carrier_appointment_made": "false", "receipt_in_cross_docking": "false", "dock_occupation_duration": 1 - - <#if executionflow.Lines??> + + <#if executionflow.Lines??> , "line_list": [ <#list executionflow.Lines as line> @@ -47,7 +47,7 @@ "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", - "batch_1": "${batch_1!""}", + "batch_1": "${batch_1?json_string!""}", "optional_attributes": { <#--"held_for_check": "false", "held _for_repacking": "false", @@ -60,8 +60,8 @@ } --> }<#sep>, - + ] - + } } From 54511c55f12ae4a72d15cdb25301f55ed51c7260 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 26 Sep 2024 15:58:37 +0200 Subject: [PATCH 2/3] modifs (cherry picked from commit e2c0735dc790ccbdbc53f034ce4fe902574155d8) --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index 107c511..e3ff52b 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -1,13 +1,16 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> [ - +<#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) /> { "Header": { "ProjectID": "${projectRP}" }, "ID": { "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}" + "RefDate": { + "DateTime": "${dispatched_datetime4}", + "AuthorTimeZone": "${time_zone_rfx}" }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000"> From 96aec6555ce23af2597f382226a51774ed1f56dc Mon Sep 17 00:00:00 2001 From: frea Date: Thu, 3 Oct 2024 15:08:49 +0200 Subject: [PATCH 3/3] SCPN1-7302 --- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index e3ff52b..cec5f7a 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -11,6 +11,7 @@ "RefDate": { "DateTime": "${dispatched_datetime4}", "AuthorTimeZone": "${time_zone_rfx}" + } }, "Payload": { <#if despatched_ipg.carton_number != "000000000000000000">