From 6bb1d457832e280d46dbd439c579da9d07281f0b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 16 Oct 2025 10:23:56 +0200 Subject: [PATCH 1/6] SCPN1-9437 (cherry picked from commit f05096636edcb4ba73d91a745a0d05f5a1e16f9b) --- RFXtoRP_HsaItm.ftl | 4 ---- RFXtoRP_HsaItm_ItemCreated.ftl | 8 +++++--- RFXtoRP_HsrReceiptList.ftl | 7 +------ RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 4 ++++ RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 12 ++++++++++-- ..._HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 4 ++++ RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 4 ++++ 7 files changed, 28 insertions(+), 15 deletions(-) diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index 533a2b7..63ca3a2 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.ftl @@ -18,14 +18,10 @@ <#assign item = JsonUtil.jsonToMap(dataRfx)> [ { - <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)> <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaItm_ItemCreated.ftl"> - <#else> - <#stop "no LV for the item"> - } ] <#break> diff --git a/RFXtoRP_HsaItm_ItemCreated.ftl b/RFXtoRP_HsaItm_ItemCreated.ftl index 1f22d6b..4433f6e 100644 --- a/RFXtoRP_HsaItm_ItemCreated.ftl +++ b/RFXtoRP_HsaItm_ItemCreated.ftl @@ -21,15 +21,17 @@ }, <#-- Item metadata inclusion --> - <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">, + <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl"> <#-- Item Photo URI could be added here --> <#if item.url?? && item.url!=""> - "PhotoURI": "${item.url?json_string}", + , + "PhotoURI": "${item.url?json_string}" <#-- Loop for the Logistical Variants - LV --> - <#if item.logistical_variant_list??> + <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)> + , "LogisticVariants": [ <#list item.logistical_variant_list as logistical_variant> diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index be3d0c9..9bf1a2d 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> <#if receipt.receipt_type == "030"> <#stop "ignored message because receipt type = transfert"> <#else> @@ -40,11 +39,7 @@ <#-- No line--> <#stop> - - <#else> - <#-- "Receipt reference is empty"--> - <#stop> - + <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 1c838f8..0751f1a 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -29,7 +29,11 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 6d21132..0d3b976 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -44,7 +48,11 @@ "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" }, - "OrderID": "${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "OrderID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "OrderID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 1c838f8..0751f1a 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -29,7 +29,11 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 1c838f8..0751f1a 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -29,7 +29,11 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 6bf2ea2329ce9d7b35be5da6664afce5784af9ca Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 16 Oct 2025 10:27:57 +0200 Subject: [PATCH 2/6] SCPN1-9437 (cherry picked from commit 7786a93b25c235d7ed2202f63493451d857f38d6) --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 0b78db9..5b586db 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -37,6 +37,9 @@ <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", + <#else> + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", <#else> @@ -44,8 +47,8 @@ "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", - "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0> From 97dbd248f85f89b7e376509083a57ee064be0ad7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 16 Oct 2025 10:50:49 +0200 Subject: [PATCH 3/6] SCPN1-9437 (cherry picked from commit d787148aae3dad6c263a632412642ee0f2ba1dd0) --- RFXtoRP_HsaIpgMove.ftl | 5 ----- RFXtoRP_HsrReceiptList.ftl | 5 ----- 2 files changed, 10 deletions(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index c2bf457..4b0b7d5 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -47,7 +47,6 @@ <#if (reflexMvtStockInterface.ipg_move_type == "100" || reflexMvtStockInterface.ipg_move_type == "110" || reflexMvtStockInterface.ipg_move_type == "120") > - <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> @@ -56,10 +55,6 @@ <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> } ] - <#else> - <#-- Case of IPG move type volontarilly ignored, Reference receipt is empty--> - <#stop > - <#else> <#stop> diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 9bf1a2d..d83b7fd 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -46,7 +46,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> @@ -86,10 +85,6 @@ - <#else> - <#-- Receipt reference is empty--> - <#stop > - ] <#break> From 8ca2f6259191e5c593ccdc7852b53462fa45d2dd Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 16 Oct 2025 11:00:26 +0200 Subject: [PATCH 4/6] SCPN1-9437 (cherry picked from commit 8cafa21aa749f3b2ce43f7a675ad8ff09ff45938) --- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 -- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 -- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 -- 3 files changed, 6 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 0751f1a..c94a309 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -25,7 +25,6 @@ } <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> { "Header": {"ProjectID": "${projectRP}"}, "ID": { @@ -43,7 +42,6 @@ } } <#break> - diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 0751f1a..c94a309 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -25,7 +25,6 @@ } <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> { "Header": {"ProjectID": "${projectRP}"}, "ID": { @@ -43,7 +42,6 @@ } } <#break> - diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 0751f1a..c94a309 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -25,7 +25,6 @@ } <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> { "Header": {"ProjectID": "${projectRP}"}, "ID": { @@ -43,7 +42,6 @@ } } <#break> - From c8806baf5cf39349c52501e1f8308b4c432f4723 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 16 Oct 2025 11:09:22 +0200 Subject: [PATCH 5/6] SCPN1-9437 (cherry picked from commit 374ab5499448d8e8b78f2401d1c9fbb7c42cb8a3) --- RFXtoRP_HsrReceiptList.ftl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index d83b7fd..f05fcba 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -93,7 +93,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> <#if receipt.line_list ??> { @@ -106,10 +105,6 @@ <#-- No line--> <#stop> - <#else> - <#-- Receipt reference is empty--> - <#stop > - ] <#break> From f23a11933df3c7684c7ef071e07c070b8c1463e2 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Thu, 16 Oct 2025 15:47:44 +0200 Subject: [PATCH 6/6] Release 1.2.45+4 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index b0b5047..ea6f0b4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.45+3 +1.2.45+4