From b72199c8b2fa6ff324ada5f0a55438ffb75bd69d Mon Sep 17 00:00:00 2001 From: Vincent Le Maitre Date: Tue, 8 Apr 2025 10:00:02 +0200 Subject: [PATCH 001/104] Snapshot reflex-wms-connector 2.1.0-SNAPSHOT --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 6753471..61bc4c6 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.0-SNAPSHOT +2.1.0-SNAPSHOT From a1c4b8a4ac83c4d3e2d4a7d36578593622fddc16 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 15 Apr 2025 14:29:22 +0200 Subject: [PATCH 002/104] Modif typologie --- RFXtoRP_HsaCons_ActorCreated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 6d65568..832adc5 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -48,7 +48,7 @@ "${actor.address.other_number?json_string}" ], - "Typology": "TYPOLOGY_WAREHOUSE" + "Typology": "TYPOLOGY_UNKNOWN" } } ] From 1ced677ec6698578886b18aab9fb12df332dae02 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 24 Apr 2025 15:48:02 +0200 Subject: [PATCH 003/104] SCPN1-8583 --- RFXtoRP_HsaItm.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index 66effc7..94f5c18 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.ftl @@ -18,7 +18,7 @@ <#assign item = JsonUtil.jsonToMap(dataRfx)> [ { - <#if item.logistical_variant_list?? > + <#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" : From c7bce6018bc43d5e52c9d1fdc0eaf56852a828ef Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 08:56:02 +0000 Subject: [PATCH 004/104] clean README --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 6606269..53cf1e5 100644 --- a/README.md +++ b/README.md @@ -7,5 +7,3 @@ These FTL core files aim to translate data flow from Reflex WMS into Reflex plat You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/ - - From ffad8953094be7da9b7d424a2fa805ceff9ae50a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 28 Apr 2025 13:31:39 +0200 Subject: [PATCH 005/104] SCPN1-8696 --- RFXtoRP_HsrReceiptList.ftl | 60 ++++++++++++------- ...ptList_TransfertExecutionflowCancelled.ftl | 2 +- 2 files changed, 40 insertions(+), 22 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 872af00..649c426 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -33,7 +33,7 @@ } ] - <#else> + <#else> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> @@ -61,36 +61,54 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true" > + <#if receipt.receipt_type = "030" && 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.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> - } - <#else> - <#if receipt.receipt_confirmed == "true"> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl"> } <#else> + <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true"> { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> + } + <#else> + <#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.ExecutionflowReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } + <#else> + <#if receipt.receipt_confirmed == "true" > + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> + } + <#else> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + } + + + - <#else> <#stop "Receipt reference is empty"> diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index e262117..3be4a3f 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From b7743f00fb44b60032c14136a18ed7edc6ecebf4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 28 Apr 2025 13:44:29 +0200 Subject: [PATCH 006/104] SCPN1-8695 --- RFXtoRP_HsrReceiptList.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 649c426..2cd609d 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -63,7 +63,7 @@ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> <#if receipt.receipt_type = "030" && 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.ExecutionflowReceiptCompleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl"> @@ -79,7 +79,7 @@ <#else> <#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.ExecutionflowReceiptCompleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> From 003a4e1e59869ed4972b360a75a387c327b5d893 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 12 May 2025 09:51:54 +0200 Subject: [PATCH 007/104] SCPN1-8728 --- RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index e908b8e..ddc2969 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 871648ca6d025ad508af80294fa3a33f887081c4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 12 May 2025 10:00:32 +0200 Subject: [PATCH 008/104] SCPN1-8728 --- RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl | 4 ++++ ...srReceiptList_TransfertExecutionflowReceiptCompleted.ftl | 4 ++++ RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl | 6 +++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 3be4a3f..c84822d 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 2335174..0831b95 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index ad59e3c..514a574 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 6b1d598a75cbff058e76ea0cc3cf7cbcc3601f9c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 12 May 2025 13:41:38 +0200 Subject: [PATCH 009/104] SCPN1-8729 --- RPtoRFX_PrepOrder.ftl | 3 +++ RPtoRFX_PrepOrder_HeaderMetadata.ftl | 17 +++++++++++++++++ RPtoRFX_PrepOrder_LineMetadata.ftl | 17 +++++++++++++++++ RPtoRFX_Receipt.ftl | 2 ++ RPtoRFX_Receipt_HeaderMetadata.ftl | 17 +++++++++++++++++ RPtoRFX_Receipt_LineMetadata.ftl | 17 +++++++++++++++++ 6 files changed, 73 insertions(+) create mode 100644 RPtoRFX_PrepOrder_HeaderMetadata.ftl create mode 100644 RPtoRFX_PrepOrder_LineMetadata.ftl create mode 100644 RPtoRFX_Receipt_HeaderMetadata.ftl create mode 100644 RPtoRFX_Receipt_LineMetadata.ftl diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index c80da8c..6c4223e 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -27,6 +27,7 @@ }, "payload" : { + <#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl"> "originator_reference": "${executionflow.OrderID?json_string}", "preparation_type_code": "${preparation_type_code}", "end_consignee_code": "${actorID}", @@ -88,6 +89,7 @@ <#include "RPtoRFX_PrepOrder_DefaultLineData.ftl"> { + <#include "RPtoRFX_PrepOrder_LineMetadata.ftl"> "originator_reference_line_number": ${line.LineID?number}, "item_code": "${line.RequestedContent.Goods.ItemID!""}", "item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}", @@ -105,6 +107,7 @@ "substitution_possible": "false" --> + } <#sep>, diff --git a/RPtoRFX_PrepOrder_HeaderMetadata.ftl b/RPtoRFX_PrepOrder_HeaderMetadata.ftl new file mode 100644 index 0000000..b9b3ee2 --- /dev/null +++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- You can map metadata with additional information,comments... --> + +<#-- +<#if Header_MetaData_Map["Color"]??> + <#assign COLOR = Header_MetaData_Map["Color"].String/> + <#if COLOR??> + , + "additional_data_value_list": + [ + { + "code": "Color", + "value": "${COLOR}" + } + ] + , +--> \ No newline at end of file diff --git a/RPtoRFX_PrepOrder_LineMetadata.ftl b/RPtoRFX_PrepOrder_LineMetadata.ftl new file mode 100644 index 0000000..b9b3ee2 --- /dev/null +++ b/RPtoRFX_PrepOrder_LineMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- You can map metadata with additional information,comments... --> + +<#-- +<#if Header_MetaData_Map["Color"]??> + <#assign COLOR = Header_MetaData_Map["Color"].String/> + <#if COLOR??> + , + "additional_data_value_list": + [ + { + "code": "Color", + "value": "${COLOR}" + } + ] + , +--> \ No newline at end of file diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index cd271c9..e53dc3b 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -13,6 +13,7 @@ }, "payload" : { + <#include "RPtoRFX_Receipt_HeaderMetadata.ftl"> "receipt_reference": "${executionflow.OrderID?json_string}", "receipt_type": "${receipt_type}", "receipt_reason_code": "${receipt_reason_code}", @@ -43,6 +44,7 @@ <#include "RPtoRFX_Receipt_DefaultLineData.ftl"> { + <#include "RPtoRFX_Receipt_LineMetadata.ftl"> "receipt_reference_line_no": ${line.LineID?number}, "item_code": "${line.RequestedContent.Goods.ItemID!""}", "item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}", diff --git a/RPtoRFX_Receipt_HeaderMetadata.ftl b/RPtoRFX_Receipt_HeaderMetadata.ftl new file mode 100644 index 0000000..b9b3ee2 --- /dev/null +++ b/RPtoRFX_Receipt_HeaderMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- You can map metadata with additional information,comments... --> + +<#-- +<#if Header_MetaData_Map["Color"]??> + <#assign COLOR = Header_MetaData_Map["Color"].String/> + <#if COLOR??> + , + "additional_data_value_list": + [ + { + "code": "Color", + "value": "${COLOR}" + } + ] + , +--> \ No newline at end of file diff --git a/RPtoRFX_Receipt_LineMetadata.ftl b/RPtoRFX_Receipt_LineMetadata.ftl new file mode 100644 index 0000000..b9b3ee2 --- /dev/null +++ b/RPtoRFX_Receipt_LineMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Vous pouvez mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- You can map metadata with additional information,comments... --> + +<#-- +<#if Header_MetaData_Map["Color"]??> + <#assign COLOR = Header_MetaData_Map["Color"].String/> + <#if COLOR??> + , + "additional_data_value_list": + [ + { + "code": "Color", + "value": "${COLOR}" + } + ] + , +--> \ No newline at end of file From b0e7dc18d72cccfdd14a125bb50ca554ef265a6c Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 13 May 2025 10:59:34 +0200 Subject: [PATCH 010/104] SCPN1-8696 --- RFXtoRP_HsrReceiptList.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 2cd609d..403aca8 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -61,7 +61,7 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1=0 && receipt.confirmation_total_level_2=0 && receipt.confirmation_total_level_3=0> + <#if receipt.receipt_type == "030" && 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> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -69,7 +69,7 @@ <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl"> } <#else> - <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true"> + <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true"> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -77,7 +77,7 @@ <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> } <#else> - <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1=0 && receipt.confirmation_total_level_2=0 && receipt.confirmation_total_level_3=0> + <#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> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 9a7f669192f1b9ed1fec6814568c4cacda7c0bc1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 26 May 2025 10:08:22 +0200 Subject: [PATCH 011/104] SCPN1-8800 --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 8374b42..33ec3bd 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -26,7 +26,11 @@ "ShipFrom": { + <#if receipt.receipt_type == '020'> + "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}" + <#else> "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" + }, "ShipTo" : { From ca36d6688e784e2e657e171f1cc5f696907a2a89 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 16:25:00 +0200 Subject: [PATCH 012/104] SCPN1-8863 --- RFXtoRP_HsaProStatus.ftl | 4 ---- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 6 +++++- RFXtoRP_HsaProStatus_TransportStarted.ftl | 6 +++++- RFXtoRP_HsrPrepa.ftl | 2 +- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++++- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 10 ++++++++-- RFXtoRP_HsrPro.ftl | 7 +------ RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 6 +++++- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 8 ++++++-- 12 files changed, 51 insertions(+), 22 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 87d072c..d638425 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -17,7 +17,6 @@ <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ <#--**Pick batch runned (200) **--> - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> @@ -64,9 +63,6 @@ - <#else> - <#stop "PRO reference is empty"> - ] <#break> diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index aad3d9f..b1aa3ad 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index b9d23cb..960fcc5 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index b9d23cb..960fcc5 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index b9d23cb..f93ee75 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index b9d23cb..f93ee75 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#else> + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 09c9015..4ed821c 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -46,7 +46,7 @@ <#assign refIDHmap ={}> <#assign hd_numberHmap ={}> <#assign hd_numberHmapHUadded ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))> diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index cc3b1dc..4c88bb2 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -15,7 +15,11 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" + <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" + <#else> + "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" + }, "Payload":{ "Carrier": { diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 99511e5..0f215c6 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -112,8 +112,14 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", - "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}", + <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", + "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}", + <#else> + "OrderID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}", + "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}", + + <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", <#else> diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 1ef9917..8084c1b 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -16,8 +16,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ - - <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> <#-- check preparation type code (internal order and reservation are ignored) --> <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030"> <#-- Only if preparation order not confirmed --> @@ -35,11 +33,8 @@ <#else> <#-- preparation order type not supported --> - <#stop> + <#stop> - <#else> - <#stop "PRO reference is empty"> - ] <#break> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 6bf75d8..53fc384 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", + <#else> + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 8144675..ae2058b 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", + <#else> + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -67,7 +71,7 @@ }, - "OrderID":"${preparation_order.originator_reference?trim?json_string}", + "OrderID":"${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", <#if preparation_order.line_list??> "Lines" : [ <#list preparation_order.line_list as preparation_order_line > From fcc7d3033681662770a51e6227bf7ae52e847a96 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 16:44:41 +0200 Subject: [PATCH 013/104] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 8 ++++++-- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 4c88bb2..75bc1bd 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -3,8 +3,12 @@ <#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#list preparationOrder.preparation_line_lst as preparation_line> + <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#else> + <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" + <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > , diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 0f215c6..db2e33d 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,7 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> [ - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 ) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { From 6823a0aeb1f470df65f2248e34c7942df80771fb Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 16:55:24 +0200 Subject: [PATCH 014/104] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 75bc1bd..8de9331 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -7,7 +7,7 @@ <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> <#else> - <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" + <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > From 8ea0c3a1c2088b6b52379e1e2bafe25c960e10ec Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 17:05:51 +0200 Subject: [PATCH 015/104] SCPN1-8863 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index ae2058b..7a70d5d 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -71,7 +71,11 @@ }, - "OrderID":"${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", + <#else> + "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + <#if preparation_order.line_list??> "Lines" : [ <#list preparation_order.line_list as preparation_order_line > From 2e68e1e839b34de1ea79f61c774edc22a3e3c381 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 17:11:50 +0200 Subject: [PATCH 016/104] SCPN1-8863 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 7a70d5d..3d7be5f 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -72,7 +72,7 @@ }, <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> - "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", + "OrderID": "${preparation_order.originator_reference?trim?json_string}", <#else> "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", From 6e855c31ddaaaef3fb20be54ee1abdc3af2fc9ee Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 6 Jun 2025 17:23:27 +0200 Subject: [PATCH 017/104] SCPN1-8863 --- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 5fe5ad8..4ac37a0 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > From 8d453bd599a3999b809e2686458ad3b5d126576b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 15:28:26 +0200 Subject: [PATCH 018/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove.ftl | 5 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 9 ++++-- RFXtoRP_HsrReceiptList.ftl | 32 ++++++++----------- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 6 +++- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 6 +++- ...eiptList_ExecutionflowReceiptCompleted.ftl | 6 +++- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 6 +++- ...ptList_TransfertExecutionflowCancelled.ftl | 18 +++++++++-- ...iptList_TransfertExecutionflowDetected.ftl | 18 +++++++++-- ...TransfertExecutionflowReceiptCompleted.ftl | 18 +++++++++-- ...srReceiptList_TransfertReceiptExpected.ftl | 18 +++++++++-- 11 files changed, 101 insertions(+), 41 deletions(-) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 9884ec8..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--> - <#stop " Reference receipt is empty"> - <#else> <#stop> diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 66509ac..25690d4 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -35,8 +35,13 @@ "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${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}", + <#if reflexMvtStockInterface.receipt_reference==""> + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.originator_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.originator_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}", + "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 403aca8..cdf1f04 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"> [ { @@ -34,26 +33,23 @@ } ] <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } - ] + } + ] - <#else> - <#stop "Receipt reference is empty"> - <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 3483c30..bcfd023 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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 33ec3bd..9831e47 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 33e2a0f..d93c393 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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 8490938..341944f 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index c84822d..15f6440 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -9,9 +9,21 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#else> + <#if receipt.receipt_reference?? && receipt_reference==""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index ddc2969..4c0bf76 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -10,9 +10,21 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#else> + <#if receipt.receipt_reference?? && receipt_reference==""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 0831b95..27c516a 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -8,9 +8,21 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#else> + <#if receipt.receipt_reference?? && receipt_reference==""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index 514a574..88b3522 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -9,9 +9,21 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#else> + <#if receipt.receipt_reference?? && receipt_reference==""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", From 40f4396dfa981f31c0be648a196d3775f3f1ff69 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 15:37:47 +0200 Subject: [PATCH 019/104] SCPN1-8871 --- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl | 6 +++--- RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl | 6 +++--- ...srReceiptList_TransfertExecutionflowReceiptCompleted.ftl | 6 +++--- RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl | 6 +++--- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index bcfd023..14c3676 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 9831e47..e8e352f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index d93c393..374f669 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 341944f..28eb86d 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 15f6440..26e8795 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -9,14 +9,14 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt_reference==""> + <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", <#else> <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 4c0bf76..f07d206 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -10,14 +10,14 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt_reference==""> + <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", <#else> <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 27c516a..b093ff6 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -8,14 +8,14 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt_reference==""> + <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", <#else> <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index 88b3522..71e358c 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -9,14 +9,14 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt_reference==""> + <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", <#else> <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", From 1d6222e6cc3bb10fea7c7b18bb2e8415ca3fe195 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 15:56:49 +0200 Subject: [PATCH 020/104] SCPN1-8871 --- ...ceiptList_TransfertExecutionflowCancelled.ftl | 16 +++++++--------- ...eceiptList_TransfertExecutionflowDetected.ftl | 15 +++++++-------- ...st_TransfertExecutionflowReceiptCompleted.ftl | 16 +++++++--------- ...P_HsrReceiptList_TransfertReceiptExpected.ftl | 16 +++++++--------- 4 files changed, 28 insertions(+), 35 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 26e8795..0c97524 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -8,20 +8,18 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index f07d206..db598be 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -13,19 +13,18 @@ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}" diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index b093ff6..3bf617a 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -7,20 +7,18 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index 71e358c..a151d2b 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -8,20 +8,18 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference==""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", + + <#else> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}", From 34beb5fddf4806496cca98b587e772a2a90dc7dd Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 16:18:40 +0200 Subject: [PATCH 021/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 25690d4..9b2ea4a 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -35,7 +35,7 @@ "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - <#if reflexMvtStockInterface.receipt_reference==""> + <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.originator_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.originator_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.originator_reference?trim?json_string}", <#else> From c3163e39d34dc851fc319271085a0ef713128362 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 16:25:27 +0200 Subject: [PATCH 022/104] SCPN1-8871 --- RFXtoRP_HsrReceiptList.ftl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index cdf1f04..76d59d0 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -56,7 +56,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> <#if receipt.receipt_type == "030" && 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> @@ -105,9 +104,6 @@ - <#else> - <#stop "Receipt reference is empty"> - ] <#break> From 5b74e7f1d396f43691adbb3ab85afd0e51be2e46 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 16:56:53 +0200 Subject: [PATCH 023/104] SCPN1-8871 --- RFXtoRP_HsrReceiptList.ftl | 2 +- ...ReceiptList_TransfertExecutionflowCancelled.ftl | 14 ++------------ ...rReceiptList_TransfertExecutionflowDetected.ftl | 12 +----------- ...List_TransfertExecutionflowReceiptCompleted.ftl | 14 ++------------ ...oRP_HsrReceiptList_TransfertReceiptExpected.ftl | 14 ++------------ 5 files changed, 8 insertions(+), 48 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 76d59d0..b5588b6 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type = "030"> + <#if receipt.receipt_type = "030" && receipt.receipt_reference?? && receipt.receipt_reference!=""> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 0c97524..75e0851 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -8,20 +8,10 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", - <#else> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", - <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index db598be..10fa71e 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -10,19 +10,9 @@ }, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", - <#else> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", - <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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": { diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 3bf617a..1aaa0c4 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -7,20 +7,10 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", - <#else> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", - <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index a151d2b..aac895c 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -8,20 +8,10 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", - <#else> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.origin_order_line_reference?trim?json_string}", - <#else> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot=""> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - - + "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}", From 3f916b564dde40cebe3c55b12ba5e19117ff7167 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 17:06:34 +0200 Subject: [PATCH 024/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 9b2ea4a..a2514b3 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -36,7 +36,7 @@ "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.originator_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.originator_reference?trim?json_string}", + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.originator_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.originator_reference?trim?json_string}", <#else> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", From 236dc49de2f25c7aae3caa3de6740aa429018fe9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 17:23:29 +0200 Subject: [PATCH 025/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index a2514b3..8fa3d5b 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -43,7 +43,11 @@ "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", - "LineID": "${reflexMvtStockInterface.receipt_line_number}", + <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=""> + "LineID": "${reflexMvtStockInterface.origin_order_line_number}", + <#else> + "LineID": "${reflexMvtStockInterface.receipt_line_number}", + "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", From 44e8afd18c54efb2211b1d97775c3cb15d955547 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 9 Jun 2025 17:36:12 +0200 Subject: [PATCH 026/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 8fa3d5b..c45fe36 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -43,7 +43,7 @@ "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", - <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=""> + <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> "LineID": "${reflexMvtStockInterface.origin_order_line_number}", <#else> "LineID": "${reflexMvtStockInterface.receipt_line_number}", From 1be3af7cf1006d4ae0bc3205c7fe000ae75e2fb2 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 11:50:03 +0200 Subject: [PATCH 027/104] SCPN1-8871 --- RFXtoRP_HsrReceiptList.ftl | 87 ++++++++++++++++++++++++-------------- 1 file changed, 55 insertions(+), 32 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index b5588b6..d5f1db3 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,40 +15,44 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type = "030" && receipt.receipt_reference?? && receipt.receipt_reference!=""> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> - - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> - - } - ] - <#else> - [ + <#if receipt.receipt_type = "030"> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> }, { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> } - ] + ] + <#else> + <#stop> <#-- Receipt reference is empty--> + + <#else> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + + } + ] <#break> <#case "U"> @@ -88,18 +92,37 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } <#else> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true"> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> + + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> + + } + ] + <#else> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + } + From a6a42f79a6ff8fc5f0cf492ea3fea40f67ba5efe Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 13:29:55 +0200 Subject: [PATCH 028/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index c45fe36..774354c 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -35,9 +35,9 @@ "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.originator_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.originator_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.originator_reference?trim?json_string}", + <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.originator_reference!="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.origin_order_line_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}", From 44830bcd10d34f4f31ab68e5c1cf41d7293c8def Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 14:34:34 +0200 Subject: [PATCH 029/104] SCPN1-8871 --- ...t_TransfertExecutionflowReceiptCompleted.ftl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 1aaa0c4..a78b5bf 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -7,10 +7,23 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_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}", + <#if receipt.line_list??> + <#list receipt.line_list as receipt_line> + <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!=""> + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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}", From bbe97fba7f45bd42927e4e4def3ec8de9006edde Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 14:47:59 +0200 Subject: [PATCH 030/104] SCPN1-8871 --- ..._HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index a78b5bf..79b0909 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -3,6 +3,7 @@ <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> [ { + <#list receipt.line_list as receipt_line? > "Header": { "ProjectID": "${projectRP}" }, @@ -15,7 +16,6 @@ <#else> <#if receipt.line_list??> - <#list receipt.line_list as receipt_line> <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!=""> <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", @@ -23,6 +23,7 @@ "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": { @@ -32,5 +33,6 @@ }, "Payload": { } + } ] From a17bfd876c9c0e3c6f63b17799bc06fca76fa0f4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 14:48:31 +0200 Subject: [PATCH 031/104] SCPN1-8871 --- ...RP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 79b0909..bff29e0 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -3,7 +3,7 @@ <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> [ { - <#list receipt.line_list as receipt_line? > + <#list receipt.line_list? as receipt_line > "Header": { "ProjectID": "${projectRP}" }, From 72ec763cc5abfacaa7ba89bd28a0a1bb2d1dcf44 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 14:51:50 +0200 Subject: [PATCH 032/104] SCPN1-8871 --- ...RP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index bff29e0..c9db955 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -3,7 +3,7 @@ <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> [ { - <#list receipt.line_list? as receipt_line > + <#list receipt.line_list as receipt_line > "Header": { "ProjectID": "${projectRP}" }, From 5e4bcbccbe83951839c485ccc7f5c6d555e52736 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 15:49:55 +0200 Subject: [PATCH 033/104] SCPN1-8871 --- ...TransfertExecutionflowReceiptCompleted.ftl | 83 +++++++++++++------ 1 file changed, 56 insertions(+), 27 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index c9db955..a82e09f 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -1,38 +1,67 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign refIDHmap_local ={}> [ - { - <#list receipt.line_list as receipt_line > - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", - <#else> - <#if receipt.line_list??> - <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!=""> - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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}" + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } - }, - "Payload": { - } - } -] + <#else> + <#if receipt.line_list??> + <#list receipt.line_list as receipt_line > + <#if receipt_line.origin_order_line_reference!=""> + <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + <#break> + + + + +] \ No newline at end of file From 4c3d6fbea6141c312084ba09026990c95ea54c49 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 10 Jun 2025 17:07:09 +0200 Subject: [PATCH 034/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 774354c..adfe5e6 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -35,7 +35,7 @@ "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.originator_reference!="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> + <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", <#else> From 372f5d2239f1ad4afe845dbcd4143e49ae833960 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 09:25:28 +0200 Subject: [PATCH 035/104] SCPN1-8864 --- RFXtoRP_HsrPro.ftl | 15 +++------------ RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 1 + 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 8084c1b..89520bd 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -17,20 +17,13 @@ <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ <#-- check preparation type code (internal order and reservation are ignored) --> - <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030"> - <#-- Only if preparation order not confirmed --> - <#if preparation_order.preparation_order_confirmed == "false" > + <#if preparation_order.preparation_type_code == "010" || (preparation_order.preparation_type_code == "030" && preparation_order.originator_reference?? && preparation_order.originator_reference!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> } - <#else> - <#-- preparation order already confirmed --> - <#stop> - - <#else> <#-- preparation order type not supported --> <#stop> @@ -43,7 +36,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ - <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + <#if preparation_order.preparation_type_code == "010" || (preparation_order.preparation_type_code == "030" && preparation_order.originator_reference?? && preparation_order.originator_reference!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -51,12 +44,10 @@ <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> } <#else> - <#stop "PRO reference is empty"> + <#stop> ] <#break> - - <#default> <#stop > diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 3d7be5f..f14f198 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -12,6 +12,7 @@ <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", <#else> + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", "RefDate": { From 14b8a9a5343c41d3701fcbb04a66cec0d3b0e234 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 12:00:09 +0200 Subject: [PATCH 036/104] SCPN1-8864 --- RFXtoRP_HsaProStatus.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index d638425..70e9771 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -17,6 +17,7 @@ <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ <#--**Pick batch runned (200) **--> + <#if preparationStatusInterface.preparation_type_code=="010" || (preparationStatusInterface.preparation_type_code=="030" && preparationStatusInterface.preparation_order_originator_reference!="")> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> @@ -63,6 +64,9 @@ + <#else> + <#stop> <#-- Preparation type not supported--> + ] <#break> From 122122db8c5a7ca165aa0f0f1921e022bde7e537 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 12:09:43 +0200 Subject: [PATCH 037/104] SCPN1-8864 --- RFXtoRP_HsrPrepa.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 4ed821c..27e4d38 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -18,6 +18,7 @@ <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> <#if preparationOrder.total_lv_validated !=0> + <#if preparationOrder.preparation_type_code=="010" || (preparationOrder.preparation_type_code=="030" && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference!="")> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> @@ -89,6 +90,9 @@ <#assign refIDHmap ={}> ] + <#else> + <#stop> <#-- Preparation Type not supported--> + <#else> <#stop "no confirmed quantity for the preparation - preparation closed"> From ab6aef00262d51ab80dc767f764ddfdc8371663d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 14:15:45 +0200 Subject: [PATCH 038/104] SCPN1-8871 --- RFXtoRP_HsrReceiptList.ftl | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index d5f1db3..a48d523 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -34,7 +34,7 @@ } ] <#else> - <#stop> <#-- Receipt reference is empty--> + <#stop> <#-- Receipt reference for transfert is empty--> <#else> [ @@ -92,23 +92,27 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } <#else> - <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true"> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> + <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "false"> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> - } - ] + } + ] + <#else> + <#stop> <#-- Receipt reference for transfer is empty--> + <#else> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> From f1ef756198d6d71ccba8fdbe81a081323a69c21c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 14:32:31 +0200 Subject: [PATCH 039/104] SCPN1-8871 --- ...List_TransfertExecutionflowReceiptCompleted.ftl | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index a82e09f..d9cd833 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -47,19 +47,7 @@ } <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - <#break> + <#break> From 2abe538825afcbc88dc862e4292e16b60644c2a6 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 15:07:19 +0200 Subject: [PATCH 040/104] SCPN1-8871 --- ...srReceiptList_TransfertReceiptExpected.ftl | 65 ++++++++++++++----- 1 file changed, 48 insertions(+), 17 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index aac895c..9232b0e 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -2,24 +2,55 @@ <#include "ReflexUtils.ftl"> <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> +<#assign refIDHmap_local ={}> [ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}" + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } - }, - - "Payload": {} - } -] + <#else> + <#if receipt.line_list??> + <#list receipt.line_list as receipt_line > + <#if receipt_line.origin_order_line_reference!=""> + <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + + <#else> + <#break> + + + + +] \ No newline at end of file From b01ba5205b363eed967514adde4c4a468cf1dfb0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 11 Jun 2025 15:09:44 +0200 Subject: [PATCH 041/104] SCPN1-8871 --- ...ptList_TransfertExecutionflowCancelled.ftl | 63 ++++++++++++++----- 1 file changed, 47 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 75e0851..d003c01 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -1,24 +1,55 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> - +<#assign refIDHmap_local ={}> [ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}" + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } - }, - "Payload": { - } } + <#else> + <#if receipt.line_list??> + <#list receipt.line_list as receipt_line > + <#if receipt_line.origin_order_line_reference!=""> + <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + + <#else> + <#break> + + + + ] From fa17314de3c20207d4b0d2387bfd6e5299a424c9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 12 Jun 2025 11:52:26 +0200 Subject: [PATCH 042/104] SCPN1-8863 --- RFXtoRP_HsaProStatus.ftl | 4 - ...RP_HsaProStatus_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 2 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 2 +- RFXtoRP_HsrPro.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 1 - RFXtoRP_HsrReceiptList.ftl | 6 +- ...ptList_TransfertExecutionflowCancelled.ftl | 12 + ...iptList_TransfertExecutionflowDetected.ftl | 349 +++++++++++++----- ...TransfertExecutionflowReceiptCompleted.ftl | 12 + ...srReceiptList_TransfertReceiptExpected.ftl | 7 +- 13 files changed, 293 insertions(+), 110 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 70e9771..d638425 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -17,7 +17,6 @@ <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) /> [ <#--**Pick batch runned (200) **--> - <#if preparationStatusInterface.preparation_type_code=="010" || (preparationStatusInterface.preparation_type_code=="030" && preparationStatusInterface.preparation_order_originator_reference!="")> <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> @@ -64,9 +63,6 @@ - <#else> - <#stop> <#-- Preparation type not supported--> - ] <#break> diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index b1aa3ad..a261d62 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 960fcc5..173ca65 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 960fcc5..173ca65 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index f93ee75..173ca65 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index f93ee75..173ca65 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 89520bd..168484f 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -17,7 +17,7 @@ <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ <#-- check preparation type code (internal order and reservation are ignored) --> - <#if preparation_order.preparation_type_code == "010" || (preparation_order.preparation_type_code == "030" && preparation_order.originator_reference?? && preparation_order.originator_reference!="")> + <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030"> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index f14f198..3d7be5f 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -12,7 +12,6 @@ <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", <#else> - "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", "RefDate": { diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index a48d523..cd6b325 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,8 +15,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type = "030"> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.receipt_type = "030"> <#-- if reception is a transfer reception --> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> @@ -33,9 +32,6 @@ } ] - <#else> - <#stop> <#-- Receipt reference for transfert is empty--> - <#else> [ { diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index d003c01..835c159 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -47,6 +47,18 @@ } <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } <#break> diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 10fa71e..881e2c1 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -1,99 +1,272 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> <#include "ActorPrefix.ftl"> +<#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> +<#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> +<#assign refIDHmap_local ={}> [ - { - <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> - <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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": { + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + "CreationDateTime": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - "CreationDateTime": { - "DateTime": "${receipt_creation_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - }, - "OrderID":"${receipt.receipt_reference?trim?json_string}", - <#-- Header Metadata inclusion --> - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, - - "ShipFrom": - { - "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" - }, - "ShipTo" : - { - "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" - }, - "ShipToAcked": true, - - <#if receipt.carrier_informations.carrier_code != ""> - "Carrier": - { - "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" - }, - - - <#if receipt.line_list??> - "Lines" : [ - <#list receipt.line_list as line> - { - "LineID": "${line.receipt_line_number}", - <#-- Line Metadata inclusion --> - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, - "RequestedContent": - { - "Goods": - { - "ItemID": "${line.item_code?trim?json_string!"0"}", - "LVBranchID": "${line.item_lv_code?json_string!"0"}", - <#if (line.line_without_detail?? && 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}", - <#else> - <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> - <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${line_detail_priority_date}", - <#else> - "PriorityDate": "1970-01-01T00:00:00Z", - - - <#-- Segmentation Keys inclusion --> - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> }, - "Quantity" : + "OrderID":"${receipt.receipt_reference?trim?json_string}", + <#-- Header Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, + "ShipFrom": + { + "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" + }, + "ShipTo" : + { + "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" + }, + "ShipToAcked": true, + <#if receipt.carrier_informations.carrier_code != ""> + "Carrier": + { + "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" + }, + + <#if receipt.line_list??> + "Lines" : [ + <#list receipt.line_list as line> + { + "LineID": "${line.receipt_line_number}", + <#-- Line Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, + "RequestedContent": { - "LVID": "${quantity_in_base_lv_RP_Cst}", - "Value": "${line.order_quantity_in_lv!0}" + "Goods": + { + "ItemID": "${line.item_code?trim?json_string!"0"}", + "LVBranchID": "${line.item_lv_code?json_string!"0"}", + <#if (line.line_without_detail?? && 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}", + <#else> + <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_detail_priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + + + <#-- Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> + }, + "Quantity" : + { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": "${line.order_quantity_in_lv!0}" + } } } - - } - <#sep>, - - ], - - - "RequestedMilestones" : - { - "RequestedDeliveryDateTime" : - { - "DateTime": "${receipt_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - } + <#sep>, + + ], + + "RequestedMilestones" : + { + "RequestedDeliveryDateTime" : + { + "DateTime": "${receipt_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + } + } } - } -] + <#else> + <#if receipt.line_list??> + <#list receipt.line_list as receipt_line > + <#if receipt_line.origin_order_line_reference!=""> + <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? > + <#if refIDHmap_local?size != 0 > + , + + <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}", + + "RefDate": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + "CreationDateTime": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "OrderID":"${receipt.receipt_reference?trim?json_string}", + <#-- Header Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, + "ShipFrom": + { + "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" + }, + "ShipTo" : + { + "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" + }, + "ShipToAcked": true, + <#if receipt.carrier_informations.carrier_code != ""> + "Carrier": + { + "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" + }, + + <#if receipt.line_list??> + "Lines" : [ + <#list receipt.line_list as line> + { + "LineID": "${line.receipt_line_number}", + <#-- Line Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, + "RequestedContent": + { + "Goods": + { + "ItemID": "${line.item_code?trim?json_string!"0"}", + "LVBranchID": "${line.item_lv_code?json_string!"0"}", + <#if (line.line_without_detail?? && 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}", + <#else> + <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_detail_priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + + + <#-- Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> + }, + "Quantity" : + { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": "${line.order_quantity_in_lv!0}" + } + } + } + <#sep>, + + ], + + "RequestedMilestones" : + { + "RequestedDeliveryDateTime" : + { + "DateTime": "${receipt_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + } + } + } + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + "CreationDateTime": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "OrderID":"${receipt.receipt_reference?trim?json_string}", + <#-- Header Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, + "ShipFrom": + { + "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" + }, + "ShipTo" : + { + "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" + }, + "ShipToAcked": true, + <#if receipt.carrier_informations.carrier_code != ""> + "Carrier": + { + "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" + }, + + <#if receipt.line_list??> + "Lines" : [ + <#list receipt.line_list as line> + { + "LineID": "${line.receipt_line_number}", + <#-- Line Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, + "RequestedContent": + { + "Goods": + { + "ItemID": "${line.item_code?trim?json_string!"0"}", + "LVBranchID": "${line.item_lv_code?json_string!"0"}", + <#if (line.line_without_detail?? && 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}", + <#else> + <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_detail_priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + + + <#-- Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> + }, + "Quantity" : + { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": "${line.order_quantity_in_lv!0}" + } + } + } + <#sep>, + + ], + + "RequestedMilestones" : + { + "RequestedDeliveryDateTime" : + { + "DateTime": "${receipt_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + } + } + } + <#break> + + + + + ] diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index d9cd833..8bb3029 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -47,6 +47,18 @@ } <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } <#break> diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index 9232b0e..c94d0c0 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -1,7 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> - <#assign refIDHmap_local ={}> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> @@ -33,11 +32,7 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}", - + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 8d9072da4a4bf0b9f002c16ee4fb869e6a4d1b5f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 12 Jun 2025 13:06:35 +0200 Subject: [PATCH 043/104] SCPN1-8863 --- RFXtoRP_HsrPrepa.ftl | 2 +- RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 27e4d38..c515154 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -18,7 +18,7 @@ <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> <#if preparationOrder.total_lv_validated !=0> - <#if preparationOrder.preparation_type_code=="010" || (preparationOrder.preparation_type_code=="030" && preparationOrder.preparation_line_lst[0].preparation_order_originator_reference!="")> + <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030"> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 881e2c1..3083c80 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -183,7 +183,8 @@ } } } - <#else> + + <#else> { "Header": {"ProjectID": "${projectRP}"}, "ID": { From 53640ab313b9c6052cbad758aabeb17a16262138 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 12 Jun 2025 13:40:35 +0200 Subject: [PATCH 044/104] SCPN1-8863 --- ...HsrReceiptList_TransfertReceiptExpected.ftl | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index c94d0c0..b65d4b7 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -32,7 +32,11 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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_line.origin_order_line_reference?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -43,6 +47,18 @@ } <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } <#break> From 8d74d8f085d0c56b2db75def79e7f78c2e5bde09 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 13 Jun 2025 11:49:45 +0200 Subject: [PATCH 045/104] SCPN1-8871 --- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 6 +---- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 13 +++++------ ...eiptList_ExecutionflowReceiptCompleted.ftl | 6 +---- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 6 +---- ...ptList_TransfertExecutionflowCancelled.ftl | 16 +++++++------- ...iptList_TransfertExecutionflowDetected.ftl | 22 +++++++++---------- ...TransfertExecutionflowReceiptCompleted.ftl | 12 +++++----- ...srReceiptList_TransfertReceiptExpected.ftl | 12 +++++----- 8 files changed, 40 insertions(+), 53 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 14c3676..d0009e8 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,11 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - + "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 e8e352f..fb5d6ed 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,11 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - + "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}" @@ -41,8 +37,11 @@ "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" }, "ShipToAcked": true, - "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.carrier_informations.carrier_code != ""> "Carrier": { diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 374f669..821bb30 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,11 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", - + "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 28eb86d..ddd1145 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,12 +8,8 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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": { + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" } diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 835c159..1dbc587 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -7,11 +7,11 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", - + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + <#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}" @@ -32,10 +32,10 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + "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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 3083c80..7c51e68 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -10,9 +10,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "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}", @@ -20,11 +20,11 @@ } }, "Payload": { - "CreationDateTime": { - "DateTime": "${receipt_creation_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - }, - "OrderID":"${receipt.receipt_reference?trim?json_string}", + "CreationDateTime": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "OrderID":"${receipt.receipt_reference?trim?json_string}", <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, "ShipFrom": @@ -103,9 +103,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + "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}", @@ -117,7 +117,7 @@ "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" }, - "OrderID":"${receipt.receipt_reference?trim?json_string}", + "OrderID":"${receipt_line.origin_order_line_reference?trim?json_string}", <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, "ShipFrom": @@ -199,7 +199,7 @@ "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" }, - "OrderID":"${receipt.receipt_reference?trim?json_string}", + "OrderID":"${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, "ShipFrom": diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 8bb3029..18cb13f 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -7,10 +7,10 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "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}", @@ -32,10 +32,10 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + "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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index b65d4b7..a88d3e3 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -7,10 +7,10 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "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}", @@ -32,10 +32,10 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" > - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", + "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}", From 54d0fc45754d77418e384936dfbe6c6c325de997 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 13 Jun 2025 11:58:42 +0200 Subject: [PATCH 046/104] SCPN1-8871 --- ...ReceiptList_TransfertExecutionflowCancelled.ftl | 14 +++++++------- ...rReceiptList_TransfertExecutionflowDetected.ftl | 8 ++++---- ...List_TransfertExecutionflowReceiptCompleted.ftl | 8 ++++---- ...oRP_HsrReceiptList_TransfertReceiptExpected.ftl | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index 1dbc587..a472393 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -8,10 +8,10 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", - <#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}", - + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -32,10 +32,10 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 7c51e68..cb09fc5 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -10,9 +10,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", @@ -103,9 +103,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 18cb13f..49216ba 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -8,9 +8,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", @@ -33,9 +33,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index a88d3e3..faa26a9 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -8,9 +8,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", @@ -33,9 +33,9 @@ "Header": {"ProjectID": "${projectRP}"}, "ID": { <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> - "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}", + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_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}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", From 6ebda9ab096ae7635de4c231f92b0a2443b3da35 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 13 Jun 2025 15:04:29 +0200 Subject: [PATCH 047/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 30 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index adfe5e6..723f35f 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -26,21 +26,29 @@ <#else> "PriorityDate": "1970-01-01T00:00:00Z", - <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, - - <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", - <#else> - <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", + <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement --> + <#if reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${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}", + <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.origin_order_line_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> + <#if reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "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}", + <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> From 877e31529a1231f243d224ea20f5d641939654e4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 13 Jun 2025 15:19:49 +0200 Subject: [PATCH 048/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 723f35f..dbd95bf 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -41,14 +41,14 @@ "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> + <#if reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", - "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}", - + "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?? && reflexMvtStockInterface.origin_order_line_number!=0> From 9c27dbf76871c15a15c7af4dbe67688aafa66e0b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 10:54:19 +0200 Subject: [PATCH 049/104] Ajout controle --- RFXtoRP_HsrPrepa.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index c515154..44805db 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -17,7 +17,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)> - <#if preparationOrder.total_lv_validated !=0> + <#if preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0> <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030"> [ { From 0e9d31ea17f4225bdd9ebb35be730bdab3851d77 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 11:03:02 +0200 Subject: [PATCH 050/104] Ajout controle --- RFXtoRP_HsrReceiptList.ftl | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index cd6b325..de2b5c7 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type = "030"> <#-- if reception is a transfer reception --> + <#if receipt.receipt_type?? &&receipt.receipt_type = "030"> <#-- if reception is a transfer reception --> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> @@ -56,7 +56,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> + <#if receipt.receipt_type?? && receipt.receipt_type == "030" && 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> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -135,7 +135,6 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> @@ -143,9 +142,6 @@ "datas" : <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> } - <#else> - <#stop "Receipt reference is empty"> - ] <#break> From 93db70c433ca3fcfacee1b55ba2499f3ebf714b8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 11:06:43 +0200 Subject: [PATCH 051/104] Correction syntaxe --- RFXtoRP_HsrReceiptList.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index de2b5c7..245229e 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type?? &&receipt.receipt_type = "030"> <#-- if reception is a transfer reception --> + <#if receipt.receipt_type?? && receipt.receipt_type = "030"> <#-- if reception is a transfer reception --> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> From 18cecd64aa886a258879e9cbd0e35021eb8b1dfd Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 11:12:20 +0200 Subject: [PATCH 052/104] Ajout controle --- RFXtoRP_HsrReceiptList.ftl | 86 +++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 43 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 245229e..e61a78c 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -63,70 +63,70 @@ "datas" : <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl"> } + <#else> + <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "true"> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> + } <#else> - <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "true"> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + <#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> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> - } + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } <#else> - <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> + <#if receipt.receipt_confirmed == "true" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } <#else> - <#if receipt.receipt_confirmed == "true" > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> - } - <#else> - <#if receipt.receipt_type == "030" && receipt.receipt_confirmed == "false"> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> - - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> - - } - ] - <#else> - <#stop> <#-- Receipt reference for transfer is empty--> - - <#else> + <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false"> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> + }, { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> + + } + ] + <#else> + <#stop> <#-- Receipt reference for transfer is empty--> + + <#else> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } - + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + } + ] <#break> From 645a1cda8687fbfbbd3e96b5547ee2aaac65599d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 11:21:49 +0200 Subject: [PATCH 053/104] ajout controle --- RFXtoRP_HsrReceiptList.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index e61a78c..576c4ab 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -72,7 +72,7 @@ <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> } <#else> - <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> + <#if receipt.receipt_confirmed?? && 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> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -80,7 +80,7 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> } <#else> - <#if receipt.receipt_confirmed == "true" > + <#if receipt.receipt_confirmed ?? && receipt.receipt_confirmed == "true" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", From af99f0d11fdb7bed358f5c2b22a2b9fb5fe1ae73 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 11:38:53 +0200 Subject: [PATCH 054/104] Ajout controle --- RFXtoRP_HsrReceiptList.ftl | 56 ++++++++++++++++++++++---------------- 1 file changed, 32 insertions(+), 24 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 576c4ab..fbab28b 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -33,22 +33,26 @@ } ] <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + <#if receipt.line_list ??> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } - ] + } + ] + <#else> + <#stop> + <#break> <#case "U"> @@ -110,18 +114,22 @@ <#stop> <#-- Receipt reference for transfer is empty--> <#else> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + <#if receipt.line_list ??> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } + <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> + } + <#else> + <#stop> + From bdc59a2c20951844ee4e9e53d464122cf00b633c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 10:59:07 +0200 Subject: [PATCH 055/104] modifs transfert --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 66 +++++++++++++----------- 1 file changed, 35 insertions(+), 31 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 3d7be5f..91440ab 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -38,39 +38,43 @@ <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" <#else> - <#if preparation_order.address.address_type_code == "" && - preparation_order.address.name_or_company_name == "" && - preparation_order.address.additional_address_data_1 == "" && - preparation_order.address.additional_address_data_2 == "" && - preparation_order.address.post_code_area_name == "" && - preparation_order.address.territorial_division_code == "" && - preparation_order.address.postal_code == "" && - preparation_order.address.iso_country_code == ""> - "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.preparation_type_code == "030"> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" <#else> - "Actor": - { - "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", - "Address" : - { - "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - "CountryCode" : "${preparation_order.address.iso_country_code!""}", - "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", - "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", - "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" - } - }, - "Contact" : - { - "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", - "LastName" : "${(preparation_order.address.last_name!"")?json_string}", - "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, - "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] - } + <#if preparation_order.address.address_type_code == "" && + preparation_order.address.name_or_company_name == "" && + preparation_order.address.additional_address_data_1 == "" && + preparation_order.address.additional_address_data_2 == "" && + preparation_order.address.post_code_area_name == "" && + preparation_order.address.territorial_division_code == "" && + preparation_order.address.postal_code == "" && + preparation_order.address.iso_country_code == ""> + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#else> + "Actor": + { + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", + "Address" : + { + "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", + "CountryCode" : "${preparation_order.address.iso_country_code!""}", + "PostalCode" : "${preparation_order.address.postal_code!""}", + "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", + "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", + "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" + } + }, + "Contact" : + { + "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", + "LastName" : "${(preparation_order.address.last_name!"")?json_string}", + "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, + "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] + } + + - - }, + }, <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "OrderID": "${preparation_order.originator_reference?trim?json_string}", <#else> From cfc2c35e4f8cb00aa54e3f41b299d37855587003 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 17:22:11 +0200 Subject: [PATCH 056/104] SCPN1-8863 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 ++-- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 2 +- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 2 +- RFXtoRP_HsaProStatus_TransportStarted.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 4 ++-- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl | 2 +- ..._HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index dbd95bf..0365c32 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -38,8 +38,8 @@ "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.origin_order_line_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}", + "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", <#else> diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index a261d62..7688dcc 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -11,7 +11,7 @@ <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 173ca65..665b2b7 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -10,7 +10,7 @@ <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 173ca65..665b2b7 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -10,7 +10,7 @@ <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 173ca65..665b2b7 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -10,7 +10,7 @@ <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 173ca65..665b2b7 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -10,7 +10,7 @@ <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> - "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", + "RefID": "O${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year}${preparationStatusInterface.preparation_order_number}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index db2e33d..000984c 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -116,8 +116,8 @@ "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}", <#else> - "OrderID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}", - "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}", + "OrderID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}", + "ExecutionflowID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}", <#if (preparation_line.pro_originator_reference_line_number!0) != 0> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 53fc384..d223ec6 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -10,7 +10,7 @@ <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", <#else> - "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 91440ab..e113a8e 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -78,7 +78,7 @@ <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "OrderID": "${preparation_order.originator_reference?trim?json_string}", <#else> - "OrderID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "OrderID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", <#if preparation_order.line_list??> "Lines" : [ diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl index a472393..7f4269d 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -50,7 +50,7 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index cb09fc5..3083bb8 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -188,7 +188,7 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl index 49216ba..6f0e002 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -50,7 +50,7 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl index faa26a9..f8df01b 100644 --- a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -50,7 +50,7 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From b40bde6d198308c33df638fd910c96def0a44f28 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 17:44:55 +0200 Subject: [PATCH 057/104] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 8de9331..ebae4d8 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -7,7 +7,7 @@ <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> <#else> - <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> + <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > From 6fb9fd6685c1b4217c8a32c7691c8525d5dc0776 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 18:04:55 +0200 Subject: [PATCH 058/104] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index ebae4d8..ebd88cf 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -4,11 +4,6 @@ [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> - <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#else> - <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> - <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > , @@ -22,7 +17,7 @@ <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" <#else> - "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" + "RefID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" }, "Payload":{ From a610e0b0772dee6a4dfbc256216c965bc3e0539f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 18:10:49 +0200 Subject: [PATCH 059/104] modif --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index ebd88cf..ebae4d8 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -4,6 +4,11 @@ [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> + <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#else> + <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> + <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > , @@ -17,7 +22,7 @@ <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" <#else> - "RefID": "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" + "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" }, "Payload":{ From 4256228eb1db77d40eaaee64b4ccc975190bd37d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 25 Jun 2025 11:00:55 +0200 Subject: [PATCH 060/104] Modif --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index ebae4d8..eff0bbe 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -19,11 +19,7 @@ "ProjectID": "${projectRP}" }, "ID":{ - <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> - "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" - <#else> - "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}" - + "RefID": "${OrderOriginReference}" }, "Payload":{ "Carrier": { From f5971a6b06a141c4f3634ec76adf0e3f567e028c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 30 Jun 2025 16:03:38 +0200 Subject: [PATCH 061/104] SCPN1-8980 --- RPtoRFX_PrepOrder.ftl | 1 + RPtoRFX_PrepOrder_OptionalAttributes.ftl | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 RPtoRFX_PrepOrder_OptionalAttributes.ftl diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 6c4223e..e92a9b4 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -44,6 +44,7 @@ "automatic_generation": "${automatic_generation_flag}", "deactivate": "false", "optional_attributes": { + <#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl"> "apt_with_end_consignee": "${apt_with_end_consignee_flag}", "apt_with_intermediate": "false", "load_grouping": "${load_grouping}" diff --git a/RPtoRFX_PrepOrder_OptionalAttributes.ftl b/RPtoRFX_PrepOrder_OptionalAttributes.ftl new file mode 100644 index 0000000..de764b7 --- /dev/null +++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl @@ -0,0 +1,8 @@ +<#-- Here are the fields that can be added +"end_consignee_apt_start_datetime": "0000-00-00T00:00:00", +"end_consignee_apt_end_datetime": "0000-00-00T00:00:00", +"reason_code": "str", +"planned_preparation_date": "0000-00-00", +"despatch_grouping": "string", +"reservation_end_datetime": "0000-00-00T00:00:00", +--> From a85eb86c992ae89aab88cc6ce0739caa215477f4 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Tue, 1 Jul 2025 15:42:26 +0200 Subject: [PATCH 062/104] SCPN1-8991 (cherry picked from commit 9d7293d92eb9f4b07886ab11f7ed59a2a6f7aaa1) (cherry picked from commit fb329894ccf8e618135eea2c9ca9f13c87316ec0) --- RPtoRFX_PrepOrder.ftl | 4 ++++ RPtoRFX_Receipt.ftl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index e92a9b4..cf7b544 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -84,9 +84,13 @@ <#-- ******* line MetaData and Segmentationkeys to maps ******** --> <#if line.MetaData??> <#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") /> + <#else> + <#assign Line_MetaData_Map = {} /> <#if line.RequestedContent.Goods.SegmentationKeys??> <#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") /> + <#else> + <#assign SegmentationKeys_Map = {} /> <#include "RPtoRFX_PrepOrder_DefaultLineData.ftl"> { diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index e53dc3b..b53060d 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -38,9 +38,13 @@ <#-- ******* line MetaData and Segmentationkeys to maps ******** --> <#if line.MetaData??> <#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") /> + <#else> + <#assign Line_MetaData_Map = {} /> <#if line.RequestedContent.Goods.SegmentationKeys??> <#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") /> + <#else> + <#assign SegmentationKeys_Map = {} /> <#include "RPtoRFX_Receipt_DefaultLineData.ftl"> { From bcd2d995c295ebd2a0d72b3b426936bcf42010c0 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Wed, 2 Jul 2025 15:51:11 +0200 Subject: [PATCH 063/104] SCPN1-8987 --- RFXtoRP_HliPrepaL.ftl | 31 +++++++++++++++++++++++++++++++ RFXtoRP_HliReceiptLr.ftl | 34 ++++++++++++++++++++++++++++++++++ RFXtoRP_HlrProL.ftl | 32 ++++++++++++++++++++++++++++++++ 3 files changed, 97 insertions(+) create mode 100644 RFXtoRP_HliPrepaL.ftl create mode 100644 RFXtoRP_HliReceiptLr.ftl create mode 100644 RFXtoRP_HlrProL.ftl diff --git a/RFXtoRP_HliPrepaL.ftl b/RFXtoRP_HliPrepaL.ftl new file mode 100644 index 0000000..e643caa --- /dev/null +++ b/RFXtoRP_HliPrepaL.ftl @@ -0,0 +1,31 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> +<#include "ReflexUtils.ftl"> +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> +<#include "RFX_PartnerAPP_Settings.ftl"> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> +<#case "C"> +<#--<#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)> + <#stop "no generic FTL file available yet for preparationOrderLines"> + <#break> +<#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)> + <#stop "no generic FTL file available yet for preparationOrderLines"> + <#break> +<#break> + +<#default> +<#stop> + \ No newline at end of file diff --git a/RFXtoRP_HliReceiptLr.ftl b/RFXtoRP_HliReceiptLr.ftl new file mode 100644 index 0000000..61cdef6 --- /dev/null +++ b/RFXtoRP_HliReceiptLr.ftl @@ -0,0 +1,34 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE ******************** --> + + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for receiptLines"> + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for receiptLines"> + <#break> + + <#default> + <#stop > + + diff --git a/RFXtoRP_HlrProL.ftl b/RFXtoRP_HlrProL.ftl new file mode 100644 index 0000000..7b4504b --- /dev/null +++ b/RFXtoRP_HlrProL.ftl @@ -0,0 +1,32 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for preparationOrderLines"> + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for preparationOrderLines"> + <#break> + <#default> + <#stop > + + From 4ffaf0ec73b8eefa0e14650d0c83fa63dc2a5a50 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Jul 2025 15:09:53 +0200 Subject: [PATCH 064/104] SCPN1-8871 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 0365c32..06f990a 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -47,8 +47,8 @@ "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", "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}", + "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> From 03ca7d0ef7a912cb0a9df4e54e1836eacbeb3b29 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 8 Jul 2025 16:53:43 +0200 Subject: [PATCH 065/104] modif Hsrprepa Carrier Updated --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index eff0bbe..356ce71 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -5,7 +5,7 @@ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#assign OrderOriginReference = ${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}> <#else> <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> From c33c54ed925bc4a0efabe94a2a6c27d93670f092 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 8 Jul 2025 16:55:20 +0200 Subject: [PATCH 066/104] Modif HsrPrepa Carrier Updated --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 356ce71..251187a 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -5,7 +5,7 @@ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> - <#assign OrderOriginReference = ${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}> + <#assign OrderOriginReference = "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}"> <#else> <#assign OrderOriginReference = "O${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year}${preparation_line.pro_number}"> From a5e4cad965dd67c7a4c2dfd161324a2d01c22644 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 8 Jul 2025 17:06:42 +0200 Subject: [PATCH 067/104] Modif HsrPro Detected --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index e113a8e..76779ac 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -12,7 +12,7 @@ <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", <#else> - "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefID": "O${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", "RefDate": { "DateTime": "${pro_creation_datetime}", From 94e988ac564c40db4107874033937944fb6c2a40 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 8 Jul 2025 17:22:01 +0200 Subject: [PATCH 068/104] Modif hsaIpgMove --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 06f990a..2c2f3af 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -30,20 +30,20 @@ <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement --> - <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", + <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", <#else> - <#if reflexMvtStockInterface.receipt_reference=="" && reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", - "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", <#else> - <#if reflexMvtStockInterface.receipt_reference!=""> + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> From 5d7427b0a02338cb0e9e1a9de9af20990c076430 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 15:00:03 +0200 Subject: [PATCH 069/104] SCPN1-9059 --- RFXtoRP_HsaDispute_ClaimMetada.ftl | 4 ++++ RFXtoRP_HsaDispute_Created.ftl | 2 ++ 2 files changed, 6 insertions(+) create mode 100644 RFXtoRP_HsaDispute_ClaimMetada.ftl diff --git a/RFXtoRP_HsaDispute_ClaimMetada.ftl b/RFXtoRP_HsaDispute_ClaimMetada.ftl new file mode 100644 index 0000000..e5b9b99 --- /dev/null +++ b/RFXtoRP_HsaDispute_ClaimMetada.ftl @@ -0,0 +1,4 @@ +<#-- use protobuf of class HsaDispute to find Reflex Wms fields names --> + + +"MetaData": [ ] \ No newline at end of file diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index bee9ae3..aeba11f 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,6 +39,8 @@ "Value": "${dispute.dispute_amount}" }, + <#-- Claim metadata inclusion --> + <#include "RFXtoRP_HsaDispute_ClaimMetada.ftl"> <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From da697884783446a205a7c50b01b5293726aae2e4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 15:10:20 +0200 Subject: [PATCH 070/104] SCPN1-9059 --- ...pute_ClaimMetada.ftl => RFXtoRP_HsaDispute_ClaimMetadata.ftl | 0 RFXtoRP_HsaDispute_Created.ftl | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename RFXtoRP_HsaDispute_ClaimMetada.ftl => RFXtoRP_HsaDispute_ClaimMetadata.ftl (100%) diff --git a/RFXtoRP_HsaDispute_ClaimMetada.ftl b/RFXtoRP_HsaDispute_ClaimMetadata.ftl similarity index 100% rename from RFXtoRP_HsaDispute_ClaimMetada.ftl rename to RFXtoRP_HsaDispute_ClaimMetadata.ftl diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index aeba11f..c51ac6d 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -40,7 +40,7 @@ "Value": "${dispute.dispute_amount}" }, <#-- Claim metadata inclusion --> - <#include "RFXtoRP_HsaDispute_ClaimMetada.ftl"> + <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From a60c20d70742f3b1e0a0f6e3525e4a471201f5f8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 16:42:20 +0200 Subject: [PATCH 071/104] SCPN1-8871 --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index fb5d6ed..510e2d8 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "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}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "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}", + <#else> + "RefID": "R${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}" @@ -40,7 +44,7 @@ <#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}", + "OrderID":"R${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.carrier_informations.carrier_code != ""> "Carrier": From 17184ed3142c6b4da9d9f2000b40e88ad28983cf Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Thu, 10 Jul 2025 09:52:33 +0200 Subject: [PATCH 072/104] SCPN1-9059 --- RFXtoRP_HsaDispute_Created.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index c51ac6d..16a1b90 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -39,8 +39,8 @@ "Value": "${dispute.dispute_amount}" }, - <#-- Claim metadata inclusion --> - <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> + <#-- Claim metadata inclusion --> + <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">, <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From 804ceb25f3816bde828212e7f189651e1e998579 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 10 Jul 2025 10:33:34 +0200 Subject: [PATCH 073/104] =?UTF-8?q?Modif=20R=C3=A9ception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RFXtoRP_HsaDispute_Created.ftl | 4 ++-- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 3 --- RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl | 7 ++++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 16a1b90..eb9a5cd 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -49,11 +49,11 @@ <#else> <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#stop "WMS type code not supported"> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 510e2d8..e7d5e99 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,10 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "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}", - <#else> - "RefID": "R${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}", diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index 3083bb8..53593cd 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -12,7 +12,7 @@ <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${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_reference?trim?json_string}", + "RefID": "R${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}", @@ -24,6 +24,11 @@ "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" }, + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "OrderID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "OrderID": "R${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}", + "OrderID":"${receipt.receipt_reference?trim?json_string}", <#-- Header Metadata inclusion --> <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, From a605e98ccd1ce527e99a0a58f9b5b3716cded36e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 10 Jul 2025 11:04:16 +0200 Subject: [PATCH 074/104] modif hsadispute created --- RFXtoRP_HsaDispute_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index eb9a5cd..bf6b823 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -49,7 +49,7 @@ <#else> <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > From d9445d9ad5a698ec59cf28d1b5bf7fedd12e3eb0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 10 Jul 2025 11:39:46 +0200 Subject: [PATCH 075/104] modif --- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index e7d5e99..3f43f23 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -10,7 +10,6 @@ }, "ID": { "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}" From f829fa631041e4840483b8939c48f8b0ca8d8f0d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 10 Jul 2025 11:57:52 +0200 Subject: [PATCH 076/104] =?UTF-8?q?modif=20r=C3=A9ception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RFXtoRP_HsaDispute_Created.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index bf6b823..e54d6e9 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -53,7 +53,7 @@ "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#stop "WMS type code not supported"> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index d0009e8..bfbbee7 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "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}", + "RefID": "R${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 3f43f23..d93f41f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "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}", + "RefID": "R${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}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 821bb30..2314dcd 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "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}", + "RefID": "R${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 ddd1145..c746c60 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "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}", + "RefID": "R${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 bc7b677adac6aed4fab9b413eb1cc4f380afdc62 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 10 Jul 2025 12:00:51 +0200 Subject: [PATCH 077/104] modif hsaipgmove --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 2c2f3af..7efa271 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -44,7 +44,7 @@ <#else> <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> "ExecutionflowID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", From 42fd531289157d99de533237bb8d19d653ed8890 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 11 Jul 2025 14:49:09 +0200 Subject: [PATCH 078/104] Hsadispute --- RFXtoRP_HsaDispute_Created.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index e54d6e9..6690021 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -43,13 +43,13 @@ <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">, <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> - <#if dispute.dispute_type_code=="050" > + <#if dispute.dispute_type_code=="050" > <#-- Preparation --> "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#else> <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > - <#if dispute.dispute_reception.reception_type_code=="030"> - "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type --> + "EntityID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > From 577d5272e928219b29acd543ad31dc4d90096bae Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 11 Jul 2025 15:19:18 +0200 Subject: [PATCH 079/104] hsadispute --- RFXtoRP_HsaDispute_Created.ftl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 6690021..cf89cf9 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -49,8 +49,18 @@ <#else> <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type --> - "EntityID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", - "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" > + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> + "EntityID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#else> + "EntityID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "DisplayID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + + <#else> <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", From 9d6fabef0b28a85540e72f57b48d2d7774d44e30 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 11 Jul 2025 15:26:33 +0200 Subject: [PATCH 080/104] hsadispute --- RFXtoRP_HsaDispute_Created.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index cf89cf9..6079674 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -50,15 +50,15 @@ <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type --> <#if dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?? && dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot!="" > - "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> <#if dispute.dispute_reception.reception_reference?? && dispute.dispute_reception.reception_reference!=""> - "EntityID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", <#else> - "EntityID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", - "DisplayID":"R${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "EntityID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", + "DisplayID":"R${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_year_number?json_string}${dispute.dispute_reception.reception_number?json_string}", <#else> From 7f6442450b9264049b536f2ca05c409b3cd82ec7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 11 Jul 2025 15:58:42 +0200 Subject: [PATCH 081/104] hsadispute --- RFXtoRP_HsaDispute.ftl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 2f01db4..d551da9 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -17,7 +17,6 @@ <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ <#if dispute.dispute_closed == true > - <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -35,9 +34,6 @@ <#else> <#stop> - <#else> - <#stop "Reference is empty"> - ] <#break> From 25044dca56fa39c710bcb4f052ef53a3e47b0ef6 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 11 Jul 2025 16:52:38 +0200 Subject: [PATCH 082/104] hsadispute --- RFXtoRP_HsaDispute_Created.ftl | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 6079674..5c9337c 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -44,8 +44,13 @@ <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > <#-- Preparation --> - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + <#if dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference!=""> + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + <#else> + "EntityID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}", + "DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}", + <#else> <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type --> From 43855289edaa7de43788d81789fec3dfefa7da6f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 11 Jul 2025 16:56:56 +0200 Subject: [PATCH 083/104] hsadispute --- RFXtoRP_HsaDispute_Created.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 5c9337c..bcb8dfd 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -50,7 +50,7 @@ <#else> "EntityID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}", "DisplayID":"O${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_year_number?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_number?trim?json_string}", - + <#else> <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > <#if dispute.dispute_reception.reception_type_code=="030"> <#-- Receipt transfer type --> From 3d2670b9a23d1106773d0881e62c0f5ae1409241 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Tue, 15 Jul 2025 14:57:59 +0200 Subject: [PATCH 084/104] SCPN1-9084 --- RFXtoRP_HsrPackBranch.ftl | 32 ++++++++++++++++++++++++++++++++ RFXtoRP_HsrPackOrder.ftl | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 RFXtoRP_HsrPackBranch.ftl create mode 100644 RFXtoRP_HsrPackOrder.ftl diff --git a/RFXtoRP_HsrPackBranch.ftl b/RFXtoRP_HsrPackBranch.ftl new file mode 100644 index 0000000..f1b7b7d --- /dev/null +++ b/RFXtoRP_HsrPackBranch.ftl @@ -0,0 +1,32 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign packBranch = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for Pack Branch"> + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign packBranch = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for Pack Branch"> + <#break> + <#default> + <#stop > + + diff --git a/RFXtoRP_HsrPackOrder.ftl b/RFXtoRP_HsrPackOrder.ftl new file mode 100644 index 0000000..1b78ac1 --- /dev/null +++ b/RFXtoRP_HsrPackOrder.ftl @@ -0,0 +1,32 @@ +<#-- **** input parameters ***** --> +<#-- input : message RFX --> +<#-- project : projectId in ReflexPlatform --> +<#-- organisation : organisationtId in ReflexPlatform --> + +<#assign cloudEventMsg = JsonUtil.jsonToMap(input)> +<#assign projectRP = project> +<#assign organisationRP = organisation> + +<#assign aDateTime = .now> + +<#switch cloudEventMsg.action> + <#case "C"> + <#case "U"> + <#-- *********************************************** Action = CREATE or UPDATE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign packOrder = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for Pack Order"> + <#break> + + <#case "D"> + <#-- *********************************************** Action = DELETE ******************** --> + <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> + <#assign packOrder = JsonUtil.jsonToMap(dataRfx)> + + <#stop "no generic FTL file available yet for Pack Order"> + <#break> + <#default> + <#stop > + + From 974cb0a3d478dd6c151efa594ba45a27e3c2d852 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 18 Jul 2025 17:02:50 +0200 Subject: [PATCH 085/104] supression commentaire --- RFXtoRP_HsaItm.ftl | 3 ++- RFXtoRP_HsrPrepa.ftl | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index 94f5c18..231b196 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.ftl @@ -24,7 +24,8 @@ "datas" : <#include "RFXtoRP_HsaItm_ItemCreated.ftl"> <#else> - <#stop "no LV for the item"> + <#-- "no LV for the item"--> + <#stop> } ] diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 44805db..53fe532 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -91,10 +91,12 @@ <#assign refIDHmap ={}> ] <#else> - <#stop> <#-- Preparation Type not supported--> + <#-- Preparation Type not supported--> + <#stop> <#else> - <#stop "no confirmed quantity for the preparation - preparation closed"> + <#-- no confirmed quantity for the preparation - preparation closed--> + <#stop> From 842bdac85789cd2873a3707db337e6dc902b5a87 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 10:23:40 +0200 Subject: [PATCH 086/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 72 +++++++++++++----------- 1 file changed, 38 insertions(+), 34 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 76779ac..6ded792 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,45 +35,49 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" + <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee==true && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> - <#if preparation_order.preparation_type_code == "030"> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot="" && preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" <#else> - <#if preparation_order.address.address_type_code == "" && - preparation_order.address.name_or_company_name == "" && - preparation_order.address.additional_address_data_1 == "" && - preparation_order.address.additional_address_data_2 == "" && - preparation_order.address.post_code_area_name == "" && - preparation_order.address.territorial_division_code == "" && - preparation_order.address.postal_code == "" && - preparation_order.address.iso_country_code == ""> - "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.preparation_type_code == "030"> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" <#else> - "Actor": - { - "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", - "Address" : - { - "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - "CountryCode" : "${preparation_order.address.iso_country_code!""}", - "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", - "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", - "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" - } - }, - "Contact" : - { - "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", - "LastName" : "${(preparation_order.address.last_name!"")?json_string}", - "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, - "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] - } - + <#if preparation_order.address.address_type_code == "" && + preparation_order.address.name_or_company_name == "" && + preparation_order.address.additional_address_data_1 == "" && + preparation_order.address.additional_address_data_2 == "" && + preparation_order.address.post_code_area_name == "" && + preparation_order.address.territorial_division_code == "" && + preparation_order.address.postal_code == "" && + preparation_order.address.iso_country_code == ""> + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#else> + "Actor": + { + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", + "Address" : + { + "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", + "CountryCode" : "${preparation_order.address.iso_country_code!""}", + "PostalCode" : "${preparation_order.address.postal_code!""}", + "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", + "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", + "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" + } + }, + "Contact" : + { + "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", + "LastName" : "${(preparation_order.address.last_name!"")?json_string}", + "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, + "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] + } + + }, <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> "OrderID": "${preparation_order.originator_reference?trim?json_string}", From 0f5052308bb784d86ff86c5412d915a670258af1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 10:38:18 +0200 Subject: [PATCH 087/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 6ded792..20b99c4 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,7 +35,7 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee==true && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> + <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee=="true" && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot="" && preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> From f7ff9071af86dc365410a6ac5a1e472472a8cb4f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:03:32 +0200 Subject: [PATCH 088/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 20b99c4..a13e15e 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,7 +35,7 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee=="true" && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> + <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee == true && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot="" && preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> From bef91763b154495b63f2567e8207b504178b904e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:11:07 +0200 Subject: [PATCH 089/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index a13e15e..cbdc3be 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,10 +35,10 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.transfer_intermediate_consignee?? && preparation_order.transfer_intermediate_consignee == true && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> + <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> - <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot="" && preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> + <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> From 3e978f8d75a28d54cd0bad22f92030e8894380f5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:20:18 +0200 Subject: [PATCH 090/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 68 +++++++++++------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index cbdc3be..d459bbc 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,46 +35,42 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> + <#if preparation_order.preparation_type_code == "030" && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> - <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" + <#if preparation_order.preparation_type_code == "030"> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" <#else> - <#if preparation_order.preparation_type_code == "030"> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.address.address_type_code == "" && + preparation_order.address.name_or_company_name == "" && + preparation_order.address.additional_address_data_1 == "" && + preparation_order.address.additional_address_data_2 == "" && + preparation_order.address.post_code_area_name == "" && + preparation_order.address.territorial_division_code == "" && + preparation_order.address.postal_code == "" && + preparation_order.address.iso_country_code == ""> + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" <#else> - <#if preparation_order.address.address_type_code == "" && - preparation_order.address.name_or_company_name == "" && - preparation_order.address.additional_address_data_1 == "" && - preparation_order.address.additional_address_data_2 == "" && - preparation_order.address.post_code_area_name == "" && - preparation_order.address.territorial_division_code == "" && - preparation_order.address.postal_code == "" && - preparation_order.address.iso_country_code == ""> - "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" - <#else> - "Actor": - { - "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", - "Address" : - { - "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - "CountryCode" : "${preparation_order.address.iso_country_code!""}", - "PostalCode" : "${preparation_order.address.postal_code!""}", - "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", - "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", - "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" - } - }, - "Contact" : - { - "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", - "LastName" : "${(preparation_order.address.last_name!"")?json_string}", - "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, - "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] - } - + "Actor": + { + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", + "Address" : + { + "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", + "CountryCode" : "${preparation_order.address.iso_country_code!""}", + "PostalCode" : "${preparation_order.address.postal_code!""}", + "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", + "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", + "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" + } + }, + "Contact" : + { + "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", + "LastName" : "${(preparation_order.address.last_name!"")?json_string}", + "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, + "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] + } From 2544ee39837f99a5da6f71cfec678f21ac75c1af Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:26:53 +0200 Subject: [PATCH 091/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index d459bbc..b0f9351 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,7 +35,7 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.preparation_type_code == "030" && preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.intermediate_consignee_transfer_physical_depot!=""> + <#if preparation_order.preparation_type_code == "030" && optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot?? && optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot!="" && optional_attributes.preparation_order.transfer_intermediate_consignee==true> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> From 4419794595e1ca6f534829a304420a7e872a7968 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:30:28 +0200 Subject: [PATCH 092/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index b0f9351..ddf34a8 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,7 +35,7 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.preparation_type_code == "030" && optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot?? && optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot!="" && optional_attributes.preparation_order.transfer_intermediate_consignee==true> + <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.preparation_order.transfer_intermediate_consignee==true> "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> From 6adc190531403bccc89013ba83899dc93ac0d359 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:33:16 +0200 Subject: [PATCH 093/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index ddf34a8..57d8a53 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -36,7 +36,7 @@ "ShipFromAcked": true, "ShipTo": { <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.preparation_order.transfer_intermediate_consignee==true> - "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_transfer_physical_depot?json_string)}" + "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> "ActorID": "${RFXtoRPprefixDepot(preparation_order.end_consignee_code?json_string)}" From c4d328235fafcb9f1051d9df607f49ba2ea5d39d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:36:46 +0200 Subject: [PATCH 094/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 57d8a53..22c8058 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,7 +35,7 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.preparation_order.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.preparation_order.transfer_intermediate_consignee==true> + <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee==true> "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> From 06bd2c2520172bc83e1da624cc02ffbc1dfb9569 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 22 Jul 2025 11:39:19 +0200 Subject: [PATCH 095/104] SCPN1-9104 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 22c8058..2cb6932 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -35,7 +35,7 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee==true> + <#if preparation_order.preparation_type_code == "030" && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?? && preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot!="" && preparation_order.optional_attributes.transfer_intermediate_consignee=="true"> "ActorID": "${RFXtoRPprefixDepot(preparation_order.optional_attributes.intermediate_consignee_transfer_physical_depot?json_string)}" <#else> <#if preparation_order.preparation_type_code == "030"> From 544cecb4f2c83902825b2e3ade0117ac2d60cfa1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Aug 2025 13:54:38 +0200 Subject: [PATCH 096/104] Modif RPtoRFX --- RPtoRFX_PrepOrder.ftl | 8 -------- RPtoRFX_Receipt.ftl | 12 +----------- RPtoRFX_Receipt_LineMetadata.ftl | 6 +++++- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index cf7b544..21a21fc 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -105,14 +105,6 @@ "batch_1": "${batch_1?json_string}", "base_lv_quantity": "true", "any_lv": "false" - <#-- - "stock_reservation": "false", - "forced_priority_date_min_lead_time": "false", - "temp_substitution_possible": "false", - "substitution_possible": "false" - --> - - } <#sep>, diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index b53060d..1a453a5 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -55,17 +55,7 @@ "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", - "batch_1": "${batch_1?json_string!""}", - "optional_attributes": { - <#--"held_for_check": "false", - "hold_code": "false", --> - "hold_for_specific_code": "false" - } - <#--"quality_control_attributes": { - "qcf_to_create_for_receipt_line": "false", - "exclude_item_from_inspection": "false" - } --> - + "batch_1": "${batch_1?json_string!""}" }<#sep>, ] diff --git a/RPtoRFX_Receipt_LineMetadata.ftl b/RPtoRFX_Receipt_LineMetadata.ftl index b9b3ee2..426746f 100644 --- a/RPtoRFX_Receipt_LineMetadata.ftl +++ b/RPtoRFX_Receipt_LineMetadata.ftl @@ -14,4 +14,8 @@ } ] , ---> \ No newline at end of file +--> + +"optional_attributes": { + "hold_for_specific_code": "false" +}, \ No newline at end of file From 5063703e56bccd88e87e2220b158af9aa48a6497 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Aug 2025 16:43:20 +0200 Subject: [PATCH 097/104] Enlever un controle sur le D transfert --- RFXtoRP_HsrPro.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 168484f..7ddcb37 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -36,7 +36,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ - <#if preparation_order.preparation_type_code == "010" || (preparation_order.preparation_type_code == "030" && preparation_order.originator_reference?? && preparation_order.originator_reference!="")> + <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" > { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", From 92b4f8017036bafa6701bb4884e06c1b56801e52 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Aug 2025 17:10:28 +0200 Subject: [PATCH 098/104] Modif --- RFXtoRP_HsrPro.ftl | 5 +++++ RFXtoRP_HsrReceiptList.ftl | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 7ddcb37..2a0232a 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -18,12 +18,17 @@ [ <#-- check preparation type code (internal order and reservation are ignored) --> <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030"> + <#if preparation_order.line_list??> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> } + <#else> + <#-- no line list --> + <#stop> + <#else> <#-- preparation order type not supported --> <#stop> diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index fbab28b..c932637 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type?? && receipt.receipt_type = "030"> <#-- if reception is a transfer reception --> + <#if receipt.receipt_type?? && receipt.receipt_type = "030"> <#-- if reception is a transfer type --> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> From db7d673b0765adbf71fe62d6a0dbfebed2bf4d2d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Aug 2025 17:19:51 +0200 Subject: [PATCH 099/104] ajout controle --- RFXtoRP_HsrReceiptList.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index c932637..16f8e99 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,7 +15,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type?? && receipt.receipt_type = "030"> <#-- if reception is a transfer type --> + <#if receipt.receipt_type?? && receipt.receipt_type = "030" && receipt.line_list??> <#-- if reception is a transfer type --> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> @@ -92,7 +92,7 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } <#else> - <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false"> + <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list??> <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> [ { From fa59170f4dd7bf3c088e08ea3a67c2a21abb6810 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 6 Aug 2025 10:12:28 +0200 Subject: [PATCH 100/104] Controle line_list --- RFXtoRP_HsrPrepa.ftl | 125 ++++++++++++++++++++++--------------------- RFXtoRP_HsrPro.ftl | 22 +++++--- 2 files changed, 79 insertions(+), 68 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 53fe532..f592fc9 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -19,77 +19,82 @@ <#if preparationOrder.total_lv_validated?? && preparationOrder.total_lv_validated !=0> <#if preparationOrder.preparation_type_code=="010" || preparationOrder.preparation_type_code=="030"> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl"> - }, - { - - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> - } - - <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!=""> - , + <#if preparationOrder.preparation_line_lst??> + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> - } - - - <#assign refIDHmap ={}> - <#assign hd_numberHmap ={}> - <#assign hd_numberHmapHUadded ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line> - <#list preparation_line.despatched_ipg_list as despatched_ipg> - <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> - <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))> - <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> - } - - <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> + <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl"> }, { + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> + <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl"> } - <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )> - <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> - , - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> - } - - + <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!=""> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> + } + + + <#assign refIDHmap ={}> + <#assign hd_numberHmap ={}> + <#assign hd_numberHmapHUadded ={}> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line> + <#list preparation_line.despatched_ipg_list as despatched_ipg> + <#assign HUadded_packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> + <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))> + <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl"> + } + + <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number > + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> + } + <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )> + <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> + , + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPrepa_HUsAdded_TrackingHuLabelled.ftl"> + } + + + + - - <#assign refIDHmap ={}> - ] + <#assign refIDHmap ={}> + ] + <#else> + <#-- No line--> + <#stop> + <#else> <#-- Preparation Type not supported--> <#stop> diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 2a0232a..828b047 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -26,11 +26,11 @@ <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> } <#else> - <#-- no line list --> + <#-- No line --> <#stop> <#else> - <#-- preparation order type not supported --> + <#-- Preparation order type not supported --> <#stop> ] @@ -42,13 +42,19 @@ <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030" > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> - } + <#if preparation_order.line_list??> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> + } + <#else> + <#-- No line --> + <#stop> + <#else> + <#-- Preparation order type not supported --> <#stop> ] From 828fe74f5bf6fd5de92c692307237e147c0e1f72 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 6 Aug 2025 11:03:31 +0200 Subject: [PATCH 101/104] controle line-list --- RFXtoRP_HsrReceiptList.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 16f8e99..fa5c49a 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -142,6 +142,7 @@ <#-- *********************************************** Action = DELETE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> + <#if receipt.line_list ??> [ { @@ -151,6 +152,9 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> } ] + <#else> + <#stop> <#-- No line--> + <#break> From f6fb052e8c333dbc74607d87089fef7779a6fe41 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 7 Aug 2025 11:03:45 +0200 Subject: [PATCH 102/104] Modif OptionalAttributes --- RPtoRFX_Receipt.ftl | 6 +++++- RPtoRFX_Receipt_LineMetadata.ftl | 4 ---- RPtoRFX_Receipt_OptionalAttributes.ftl | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 RPtoRFX_Receipt_OptionalAttributes.ftl diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 1a453a5..90ef77a 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -55,7 +55,11 @@ "level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0}, "owner_code": "${owner_code}", "grade_code": "${grade_code}", - "batch_1": "${batch_1?json_string!""}" + "batch_1": "${batch_1?json_string!""}", + "optional_attributes": { + <#include "RPtoRFX_Receipt_OptionalAttributes.ftl"> + "hold_for_specific_code": "false" + } }<#sep>, ] diff --git a/RPtoRFX_Receipt_LineMetadata.ftl b/RPtoRFX_Receipt_LineMetadata.ftl index 426746f..d54423b 100644 --- a/RPtoRFX_Receipt_LineMetadata.ftl +++ b/RPtoRFX_Receipt_LineMetadata.ftl @@ -15,7 +15,3 @@ ] , --> - -"optional_attributes": { - "hold_for_specific_code": "false" -}, \ No newline at end of file diff --git a/RPtoRFX_Receipt_OptionalAttributes.ftl b/RPtoRFX_Receipt_OptionalAttributes.ftl new file mode 100644 index 0000000..cb2ac5c --- /dev/null +++ b/RPtoRFX_Receipt_OptionalAttributes.ftl @@ -0,0 +1,16 @@ +<#-- Here are the fields that can be added + "batch_2": "string", +"batch_3": "string", +"anticipated_receipt_line_activity_code": "str", +"anticipated_receipt_line_physical_depot_code": "str", +"anticipated_receipt_line_originator_code": "string", +"anticipated_receipt_reference": "string", +"anticipated_receipt_planned_date": "0000-00-00", +"anticipated_receipt_reference_line_no": 999999, +"reservation_consignee_code": "string", +"reservation_consignee_group_code": "string", +"pro_reservation_reference": "string", +"held_for_check": "false", +"held_for_repacking": "false", +"hold_code": "str" +--> From cb8f9d84b2e5686fdfdc9140df678198ee6cacf8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 7 Aug 2025 16:38:25 +0200 Subject: [PATCH 103/104] readme --- README.md | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 53cf1e5..0f1ecdd 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,20 @@ # Reflex Platform Core FTLs +## Overview +The **Reflex WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from Reflex WMS** into **flows compatible with Reflex Platform**. -These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API. +This connector does not contain any standalone executable code: it is intended to be used by **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files. +## Role of the FTL Files +- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, etc.). +- These templates use the **FreeMarker** syntax to: + - Extract the required fields from the WMS source flow. + - Apply transformation rules (mapping, conversions, enrichments). + - Generate a **final structured JSON** for Reflex Platform. -You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/ +## Useful Resources + +- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html) +- [Reflex Platform](https://auth.reflex-platform.com/) From 9a456ac41259dc17e2658ba5f931e90865800596 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 25 Aug 2025 16:47:37 +0200 Subject: [PATCH 104/104] modif hsaipgmove receipt number line --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 7efa271..ac9ea2c 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -51,8 +51,8 @@ "OrderID": "R${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", - <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> - "LineID": "${reflexMvtStockInterface.origin_order_line_number}", + <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0> + "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}", <#else> "LineID": "${reflexMvtStockInterface.receipt_line_number}",