diff --git a/RFXtoRP_HsrAntRec.ftl b/RFXtoRP_HsrAntRec.ftl index 1c578e2..d949a01 100644 --- a/RFXtoRP_HsrAntRec.ftl +++ b/RFXtoRP_HsrAntRec.ftl @@ -16,13 +16,16 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign AncReceipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if AncReceipt.line_list?? && AncReceipt.line_list[0]??> + <#assign now = .now?string("yyyy-MM-dd'T'HH:mm:ss'Z'") /> + <#if AncReceipt.line_list?? && AncReceipt.line_list[0]??> { <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrAntRec_Created.ftl"> }, + <#assign nowPlus1s = (.now?long + 1000)?number_to_datetime /> + <#assign now = nowPlus1s?string("yyyy-MM-dd'T'HH:mm:ss'Z'") /> { <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderReceiptExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", diff --git a/RFXtoRP_HsrAntRec_Created.ftl b/RFXtoRP_HsrAntRec_Created.ftl index b7f0b78..dfb72e7 100644 --- a/RFXtoRP_HsrAntRec_Created.ftl +++ b/RFXtoRP_HsrAntRec_Created.ftl @@ -5,7 +5,6 @@ [ { <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(AncReceipt.planned_receipt_datetime,time_zone_rfx) /> - <#assign now = .now?string("yyyy-MM-dd'T'HH:mm:ss'Z'") /> "Header": { "ProjectID": "${projectRP}" }, @@ -45,10 +44,14 @@ } ], <#if AncReceipt.anticipated_receipt_reference?? && AncReceipt.anticipated_receipt_reference!=""> - "RefID": "${AncReceipt.anticipated_receipt_reference?json_string}" + "RefID": "${AncReceipt.anticipated_receipt_reference?json_string}", <#else> - "RefID": "AR-${AncReceipt.physical_depot_code?trim?json_string}${AncReceipt.activity_code?trim?json_string}${AncReceipt.originator_code?trim?json_string}${AncReceipt.anticipated_receipt_year?json_string}${AncReceipt.anticipated_receipt_number?json_string}" + "RefID": "AR-${AncReceipt.physical_depot_code?trim?json_string}${AncReceipt.activity_code?trim?json_string}${AncReceipt.originator_code?trim?json_string}${AncReceipt.anticipated_receipt_year?json_string}${AncReceipt.anticipated_receipt_number?json_string}", + "RefDate": { + "DateTime": "${now}", + "AuthorTimeZone": "${time_zone_rfx}" + } }, "Payload": { "ShipFrom": {