diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 07688c2..9e3732f 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -12,8 +12,13 @@ <#switch cloudEventMsg.action> <#case "C"> <#-- *********************************************** Action = CREATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> + + <#if receipt.receipt_type = "030"> + <#stop "ignored message because receipt type = transfert"> + <#else> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> @@ -22,7 +27,8 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> } - ] + ] + <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 0c320ca..7038628 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -38,44 +38,9 @@ "Carrier" : {"ActorID": "${receipt.carrier_informations.carrier_code}"}, - <#-- If receipt got lines --> - <#if receipt.line_list??> + "Lines" : [ <#list receipt.line_list as line> - - <#-- if receipt type = 030 (transfert) --> - <#if receipt.receipt_type = "030"> - - <#list line.line_detail as detail> - { - "LineID": "${line.receipt_line_number}${detail.receipt_detail_number}", - <#-- Line Metadata inclusion --> - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, - "RequestedContent": - { - "Goods": - { - "ItemID": "${line.item_code!"0"}", - "LVBranchID": "${line.item_lv_code!"0"}", - <#if (detail.priority_date?length != 0) && (detail.priority_date?starts_with("00") == false)> - <#assign line_detail_priority_date = detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${line_detail_priority_date}", - - - <#-- Line Segmentation Keys inclusion --> - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineSegmentationKeys.ftl"> - - }, - "Quantity" : - { - "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${detail.confirmation_lv_quantity!0}" - } - } - }<#sep>, - - <#-- receipt type different from transfert non transfert --> - <#else> { "LineID": "${line.receipt_line_number}", <#-- Line Metadata inclusion --> @@ -90,13 +55,13 @@ <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)> <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${line_without_detail_priority_date}", - + <#-- Line Segmentation Keys inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineSegmentationKeys.ftl"> <#else> - <#stop "Reception non transfert avec detail"> + <#stop "line with detail"> }, "Quantity" : @@ -107,11 +72,9 @@ } } - <#sep>, ], - "RequestedMilestones" : {