From 9a55811bfc2ec94b67989f26b3859701db4c1768 Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 15 Apr 2025 17:52:33 +0200 Subject: [PATCH 01/62] delete ftl not use --- RFXtoRP_HsaCarrier_ActorUpdated.ftl | 75 ----------------------------- RFXtoRP_HsaCons_ActorUpdated.ftl | 75 ----------------------------- RFXtoRP_HsaSup_ActorUpdated.ftl | 75 ----------------------------- 3 files changed, 225 deletions(-) delete mode 100644 RFXtoRP_HsaCarrier_ActorUpdated.ftl delete mode 100644 RFXtoRP_HsaCons_ActorUpdated.ftl delete mode 100644 RFXtoRP_HsaSup_ActorUpdated.ftl diff --git a/RFXtoRP_HsaCarrier_ActorUpdated.ftl b/RFXtoRP_HsaCarrier_ActorUpdated.ftl deleted file mode 100644 index f6ad18c..0000000 --- a/RFXtoRP_HsaCarrier_ActorUpdated.ftl +++ /dev/null @@ -1,75 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${RFXtoRPprefixCarrier(carrier.carrier_code?trim?json_string)}" - }, - "Payload": { - "Name": "${carrier.carrier_designation?json_string}", - "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}", - "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c}, - "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c}, - "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c}, - <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected> - "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}", - - "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c}, - <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected> - "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}", - - "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", - <#if actorRP.Objects[0].Payload.CarrierServices??> - "CarrierServices" : [ - <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> - { - "ID" : "${carrierService.ID!""}", - "Label" : "${carrierService.Label!""}" - }<#sep>, - - ], - - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - - "Address": - { - - <#-- if Reflex WMS is structured --> - <#if carrier.carrier_structured_address??> - - "Name": "${carrier.carrier_structured_address.name_or_company?json_string}", - "StreetAddressOne" : "${carrier.carrier_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${carrier.carrier_structured_address.additionnal_data?json_string}", - "PostalCode" : "${carrier.carrier_structured_address.postal_code?json_string}", - "City" : "${carrier.carrier_structured_address.post_code_area_name?json_string}", - <#assign isCountryCode = JsonUtil.isCountryCode(carrier.carrier_structured_address.country_code?upper_case) /> - <#if isCountryCode> - "CountryCode" : "${carrier.carrier_structured_address.country_code?upper_case?json_string}", - <#else> - "CountryCode" : "", - - "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}", - "State": "${carrier.carrier_structured_address.country_designation?json_string}" - - <#-- if Reflex WMS is not structured --> - <#else> - <#if carrier.address?? > - - "Name": "${carrier.address.company_name?json_string}", - "StreetAddressOne" : "${carrier.address.address_1?json_string}", - "StreetAddressTwo" : "${carrier.address.address_2?json_string}", - "StreetAddressThree" : "${carrier.address.address_3?json_string}", - "CountryCode" : "" - - - }, - <#if carrier.address?? > - "Phones": ["${carrier.address.telephone?json_string}", - "${carrier.address.other_number?json_string}" - ], - - "Typology": "TYPOLOGY_UNKNOWN" - } - } -] diff --git a/RFXtoRP_HsaCons_ActorUpdated.ftl b/RFXtoRP_HsaCons_ActorUpdated.ftl deleted file mode 100644 index c5c4d94..0000000 --- a/RFXtoRP_HsaCons_ActorUpdated.ftl +++ /dev/null @@ -1,75 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${RFXtoRPprefixConsignee(actor.code?trim?json_string)}" - }, - "Payload": { - "Name": "${actor.designation?json_string}", - "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}", - "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c}, - "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c}, - "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c}, - <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected> - "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}", - - "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c}, - <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected> - "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}", - - "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", - <#if actorRP.Objects[0].Payload.CarrierServices??> - "CarrierServices" : [ - <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> - { - "ID" : "${carrierService.ID!""}", - "Label" : "${carrierService.Label!""}" - }<#sep>, - - ], - - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - - "Address": - { - - <#-- if Reflex WMS is structured --> - <#if actor.consignee_structured_address??> - - "Name": "${actor.consignee_structured_address.name_or_company?json_string}", - "StreetAddressOne" : "${actor.consignee_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${actor.consignee_structured_address.additionnal_data?json_string}", - "PostalCode" : "${actor.consignee_structured_address.postal_code?json_string}", - "City" : "${actor.consignee_structured_address.post_code_area_name?json_string}", - <#assign isCountryCode = JsonUtil.isCountryCode(actor.consignee_structured_address.country_code?upper_case) /> - <#if isCountryCode> - "CountryCode" : "${actor.consignee_structured_address.country_code?upper_case?json_string}", - <#else> - "CountryCode" : "", - - "ProvinceCode": "${actor.consignee_structured_address.territorial_div_code?json_string}", - "State": "${actor.consignee_structured_address.country_designation?json_string}" - - <#-- if Reflex WMS is not structured --> - <#else> - <#if actor.address?? > - - "Name": "${actor.address.company_name?json_string}", - "StreetAddressOne" : "${actor.address.address_1?json_string}", - "StreetAddressTwo" : "${actor.address.address_2?json_string}", - "StreetAddressThree" : "${actor.address.address_3?json_string}", - "CountryCode" : "" - - - }, - <#if actor.address?? > - "Phones": ["${actor.address.telephone?json_string}", - "${actor.address.other_number?json_string}" - ], - - "Typology": "TYPOLOGY_UNKNOWN" - } - } -] diff --git a/RFXtoRP_HsaSup_ActorUpdated.ftl b/RFXtoRP_HsaSup_ActorUpdated.ftl deleted file mode 100644 index 62c2e43..0000000 --- a/RFXtoRP_HsaSup_ActorUpdated.ftl +++ /dev/null @@ -1,75 +0,0 @@ -[ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - "RefID": "${RFXtoRPprefixSupplier(actor.code?trim?json_string)}" - }, - "Payload": { - "Name": "${actor.designation?json_string}", - "PartnerID" : "${actorRP.Objects[0].Payload.PartnerID!""?json_string}", - "IsCarrier" : ${(actorRP.Objects[0].Payload.IsCarrier!false)?c}, - "ManagedStock": ${(actorRP.Objects[0].Payload.ManagedStock!false)?c}, - "IsShipFromConnected": ${(actorRP.Objects[0].Payload.IsShipFromConnected!false)?c}, - <#if actorRP.Objects[0].Payload.IsShipFromConnected?? && actorRP.Objects[0].Payload.IsShipFromConnected> - "ShipFromPartnerAppID" : "${actorRP.Objects[0].Payload.ShipFromPartnerAppID!""?json_string}", - - "IsShipToConnected": ${(actorRP.Objects[0].Payload.IsShipToConnected!false)?c}, - <#if actorRP.Objects[0].Payload.IsShipToConnected?? && actorRP.Objects[0].Payload.IsShipToConnected> - "ShipToPartnerAppID" : "${actorRP.Objects[0].Payload.ShipToPartnerAppID!""?json_string}", - - "PhotoURI": "${actorRP.Objects[0].Payload.PhotoURI!""}", - <#if actorRP.Objects[0].Payload.CarrierServices??> - "CarrierServices" : [ - <#list actorRP.Objects[0].Payload.CarrierServices as carrierService> - { - "ID" : "${carrierService.ID!""}", - "Label" : "${carrierService.Label!""}" - }<#sep>, - - ], - - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - - "Address": - { - - <#-- if Reflex WMS is structured --> - <#if actor.supplier_structured_address??> - - "Name": "${actor.supplier_structured_address.name_or_company?json_string}", - "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}", - "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}", - "PostalCode" : "${actor.supplier_structured_address.postal_code?json_string}", - "City" : "${actor.supplier_structured_address.post_code_area_name?json_string}", - <#assign isCountryCode = JsonUtil.isCountryCode(actor.supplier_structured_address.country_code?upper_case) /> - <#if isCountryCode> - "CountryCode" : "${actor.supplier_structured_address.country_code?upper_case?json_string}", - <#else> - "CountryCode" : "", - - "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", - "State": "${actor.supplier_structured_address.country_designation?json_string}" - - <#-- if Reflex WMS is not structured --> - <#else> - <#if actor.optional_attributes?? > - - "Name": "${actor.optional_attributes.company_name?json_string}", - "StreetAddressOne" : "${actor.optional_attributes.address_1?json_string}", - "StreetAddressTwo" : "${actor.optional_attributes.address_2?json_string}", - "StreetAddressThree" : "${actor.optional_attributes.address_3?json_string}", - "CountryCode" : "" - - - }, - <#if actor.optional_attributes?? > - "Phones": ["${actor.optional_attributes.telephone?json_string}", - "${actor.optional_attributes.other_number?json_string}" - ], - - "Typology": "TYPOLOGY_UNKNOWN" - } - } -] From 65795a607746d271781b7313c233f31ccf8a7cf0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 24 Apr 2025 15:47:22 +0200 Subject: [PATCH 02/62] 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..533a2b7 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 df4377f77d135d0482624cecc6c8728e3afc038a Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 08:56:34 +0000 Subject: [PATCH 03/62] 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 fbaddfe8911d84d788ada99a1e263761ee17e9de Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 09:00:02 +0000 Subject: [PATCH 04/62] clean README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 53cf1e5..c90e0d1 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,4 @@ 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 c58772f755978a5ed7c562cc86351683fa7d7b22 Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 09:39:58 +0000 Subject: [PATCH 05/62] clean README --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index c90e0d1..53cf1e5 100644 --- a/README.md +++ b/README.md @@ -7,4 +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 b7eab6ccfd67e9751d7cac471c5a66240f02c5d3 Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 09:53:11 +0000 Subject: [PATCH 06/62] clean README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 53cf1e5..bb4cc17 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ 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/ +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/ \ No newline at end of file From a23e6654f159a6048615a625c42d22f8d347f06c Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 09:54:47 +0000 Subject: [PATCH 07/62] clean README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bb4cc17..53cf1e5 100644 --- a/README.md +++ b/README.md @@ -6,4 +6,4 @@ 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/ \ No newline at end of file +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 777197b26bcf82373882d7eede391b4e209aebed Mon Sep 17 00:00:00 2001 From: Cedric Rodier Date: Fri, 25 Apr 2025 13:10:06 +0000 Subject: [PATCH 08/62] clean README --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 53cf1e5..c90e0d1 100644 --- a/README.md +++ b/README.md @@ -7,3 +7,4 @@ 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 0ea5a04d6b6ccc567ce0b9ecd9e450e72bb3b19b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 28 Apr 2025 14:03:08 +0200 Subject: [PATCH 09/62] SCPN1-8696 --- RFXtoRP_HsrReceiptList.ftl | 47 +++++++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 19 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 18279c7..284700f 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -46,29 +46,38 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_confirmed == "true" > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> - } + <#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_ExecutionflowCancelled.ftl"> + } <#else> - <#if receipt.receipt_type = "030"> - <#stop "ignored message because receipt type = transfert"> - <#else> + <#if 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_ExecutionflowReceiptCompleted.ftl"> + } + <#else> + <#if receipt.receipt_type = "030"> + <#stop "ignored message because receipt type = transfert"> + <#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> From 09df74f0e01782263f0ffde8ace4a439d9673e41 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 12 May 2025 14:22:34 +0200 Subject: [PATCH 10/62] SCPN1-8729 --- RPtoRFX_PrepOrder.ftl | 2 ++ 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, 72 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 0debca9..59b6690 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!""}", diff --git a/RPtoRFX_PrepOrder_HeaderMetadata.ftl b/RPtoRFX_PrepOrder_HeaderMetadata.ftl new file mode 100644 index 0000000..62c7f33 --- /dev/null +++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- It is possible to 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..62c7f33 --- /dev/null +++ b/RPtoRFX_PrepOrder_LineMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- It is possible to 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 905c3bb..a0c50cf 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..62c7f33 --- /dev/null +++ b/RPtoRFX_Receipt_HeaderMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- It is possible to 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..62c7f33 --- /dev/null +++ b/RPtoRFX_Receipt_LineMetadata.ftl @@ -0,0 +1,17 @@ +<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... --> +<#-- It is possible to 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 cf5ef67c2308a87c2541e49961214a563f2773af Mon Sep 17 00:00:00 2001 From: frea Date: Tue, 13 May 2025 11:36:23 +0200 Subject: [PATCH 11/62] SCPN1-8728-8696 --- RFXtoRP_HsrReceiptList.ftl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 284700f..394713c 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> - <#if receipt.receipt_type = "030"> + <#if receipt.receipt_type == "030"> <#stop "ignored message because receipt type = transfert"> <#else> [ @@ -46,7 +46,7 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1=0 && receipt.confirmation_total_level_2=0 && receipt.confirmation_total_level_3=0> + <#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}", @@ -62,7 +62,7 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } <#else> - <#if receipt.receipt_type = "030"> + <#if receipt.receipt_type == "030"> <#stop "ignored message because receipt type = transfert"> <#else> { From 5581b8cd299a6c89612c9c26678e1cd72596e054 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 26 May 2025 10:03:49 +0200 Subject: [PATCH 12/62] 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 be2fc6a..ca695e2 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 8229616050eda8e6f69bcdf59ec635dbe4b51692 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 16 Jun 2025 10:52:41 +0200 Subject: [PATCH 13/62] SCPN1-8870 --- RFXtoRP_HsrPro.ftl | 8 -------- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 6 +++++- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 12 ++++++++++-- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 1ef9917..5bf0bcd 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -17,7 +17,6 @@ <#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 --> @@ -37,9 +36,6 @@ <#-- preparation order type not supported --> <#stop> - <#else> - <#stop "PRO reference is empty"> - ] <#break> @@ -48,16 +44,12 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ - <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> } - <#else> - <#stop "PRO reference is empty"> - ] <#break> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index b518fa7..c42aa61 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?trim?json_string}", + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "RefID": "${preparation_order.originator_reference?trim?json_string}", + <#else> + "RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${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 ee97306..08d8213 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?trim?json_string}", + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "RefID": "${preparation_order.originator_reference?trim?json_string}", + <#else> + "RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -78,7 +82,11 @@ } }, - + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> + "OrderID": "${preparation_order.originator_reference?trim?json_string}", + <#else> + "OrderID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${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 8abf2771babbfebb14736dc8f90b3b849f617be6 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 20 Jun 2025 16:39:19 +0200 Subject: [PATCH 14/62] SCPN1-8865 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 +- RFXtoRP_HsrReceiptList.ftl | 111 ++++++++---------- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 6 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 12 +- ...eiptList_ExecutionflowReceiptCompleted.ftl | 6 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 6 +- 6 files changed, 75 insertions(+), 70 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 0196de8..2fb18ef 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -33,8 +33,8 @@ "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", - "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", + "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_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 394713c..9785951 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,29 +15,25 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> - <#if receipt.receipt_type == "030"> - <#stop "ignored message because receipt type = transfert"> - <#else> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - - } - ] - + <#if receipt.receipt_type == "030"> + <#stop "ignored message because receipt type = transfert"> <#else> - <#stop "Receipt reference is empty"> + [ + { + <#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"> @@ -45,43 +41,39 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> - } + <#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_ExecutionflowCancelled.ftl"> + } + <#else> + <#if receipt.receipt_confirmed == "true" > + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> + } <#else> - <#if receipt.receipt_confirmed == "true" > + <#if receipt.receipt_type == "030"> + <#stop "ignored message because receipt type = transfert"> + <#else> { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> - } - <#else> - <#if receipt.receipt_type == "030"> - <#stop "ignored message because receipt type = transfert"> - <#else> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> + }, + { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - } - + } - <#else> - <#stop "Receipt reference is empty"> ] <#break> @@ -91,21 +83,14 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - { - - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> - } - <#else> - <#stop "Receipt reference is empty"> - + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } ] - <#break> - - + <#break> <#default> <#stop > diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index e262117..94a0b67 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index ca695e2..bad6fcd 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -44,7 +48,11 @@ "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?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?trim?json_string}${receipt.receipt_number?trim?json_string}", + <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 91390fb..b1f75ce 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 23cf130..68fcae2 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + "RefID": "${receipt.receipt_reference?trim?json_string}", + <#else> + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", + "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" From 9f0bedc583385a638bc0dc4cc5d2092a8b0ebdc3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 10:54:23 +0200 Subject: [PATCH 15/62] Modifs --- RFXtoRP_HsrPrepa.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 11 ++++++++--- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 2 +- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 5bbd320..301a390 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -52,7 +52,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_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 5fe5ad8..d04d8c6 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 > diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index bf280b6..c7c180a 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) /> { @@ -112,8 +112,13 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", - "ExecutionflowID": "${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.preparation_order_originator_reference?trim?json_string}", + <#else> + "OrderID": "${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", + "ExecutionflowID": "${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", + <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", <#else> diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 96a5905..5019203 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -3,7 +3,7 @@ <#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > From 3d816434af849b4a10dc4ec60bbbd66634551302 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 15:28:59 +0200 Subject: [PATCH 16/62] SCPN1-8870 --- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 6 +++++- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 12 ++++++++---- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 12 ++++++++---- RFXtoRP_HsaProStatus_TransportStarted.ftl | 10 +++++++--- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 5 ++--- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 3 +-- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index db1899a..039bb8e 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 04c48ae..640e90e 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,11 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 04c48ae..f5cb56d 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,10 +7,14 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + + "RefDate": { + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 04c48ae..f5cb56d 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,10 +7,14 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + + "RefDate": { + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 04c48ae..d054d85 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,10 +7,14 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> + "RefID": "${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "RefDate": { - "DateTime": "${preparation_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "DateTime": "${preparation_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 112037e..090c683 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -3,9 +3,9 @@ <#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > , @@ -28,7 +28,6 @@ --> } } - <#assign refIDHmap_local ={}> ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 5019203..35ae400 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -5,7 +5,7 @@ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > , @@ -23,7 +23,6 @@ } } } - <#assign refIDHmap_local ={}> ] \ No newline at end of file From 4c8ab232d01129e31ca0aeb955a571050099f425 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 15:39:30 +0200 Subject: [PATCH 17/62] SCPN1-8870 --- RFXtoRP_HsaProStatus.ftl | 68 +++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 87d072c..20c2768 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -17,55 +17,51 @@ <#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" > + <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" > + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl"> + } + <#else> + <#-- ** Collection started (300) and Preparation in progress (400)** --> + <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsaProStatus_PreparationExpected.ftl"> + <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl"> } <#else> - <#-- ** Collection started (300) and Preparation in progress (400)** --> - <#if preparationStatusInterface.preparation_status_type == "100" && (preparationStatusInterface.preparation_status_code == "300" || preparationStatusInterface.preparation_status_code == "400") > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationStarted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_PreparationStarted.ftl"> - } - <#else> - <#-- ****Preparation dispatched (600)** --> - <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> + <#-- ****Preparation dispatched (600)** --> + <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "600" > + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl"> + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsaProStatus_PreparationCompleted.ftl"> - }, + <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl"> + } + <#else> + <#-- ****Preparation cancelled (650)**** --> + <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowTransportStarted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_TransportStarted.ftl"> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl"> } <#else> - <#-- ****Preparation cancelled (650)**** --> - <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "650" > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl"> - } - <#else> - <#stop> - + <#stop> - <#else> - <#stop "PRO reference is empty"> ] <#break> From 8cd98b86380e36efe8f4e6f216c70fcd657804d9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 16:20:04 +0200 Subject: [PATCH 18/62] SCPN1-8865 --- RFXtoRP_HsaIpgMove.ftl | 5 ----- 1 file changed, 5 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> From 01b2706cb5772c5274ac7c9aff4b87add5b3757b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 16:35:38 +0200 Subject: [PATCH 19/62] SCPN1-8865 --- 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 2fb18ef..4d4ec2a 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -33,8 +33,8 @@ "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}", - "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_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}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", From 88fa6bd2af81cf6d34dd06c3f6c3325bf885e5ca Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 16:50:59 +0200 Subject: [PATCH 20/62] SCPN1-8863 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 4 ++-- RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl | 4 ++-- RFXtoRP_HsaProStatus_PreparationCompleted.ftl | 4 ++-- RFXtoRP_HsaProStatus_PreparationExpected.ftl | 4 ++-- RFXtoRP_HsaProStatus_PreparationStarted.ftl | 4 ++-- RFXtoRP_HsaProStatus_TransportStarted.ftl | 4 ++-- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 4 ++-- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 13 files changed, 20 insertions(+), 20 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 4d4ec2a..ca5c456 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -33,8 +33,8 @@ "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> - "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.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}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index 039bb8e..a424860 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -9,9 +9,9 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "O${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 640e90e..3728c21 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -8,9 +8,9 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "O${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index f5cb56d..51d298f 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -8,9 +8,9 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "O${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index f5cb56d..51d298f 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -8,9 +8,9 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "O${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index d054d85..0bdb7ac 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -8,9 +8,9 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "O${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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", + "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index c7c180a..af4010f 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.preparation_order_originator_reference?trim?json_string}", <#else> - "OrderID": "${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", - "ExecutionflowID": "${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", + "OrderID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", + "ExecutionflowID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index c42aa61..36c24dc 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.originator_reference?trim?json_string}", <#else> - "RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${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 08d8213..04ed23e 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.originator_reference?trim?json_string}", <#else> - "RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", "RefDate": { "DateTime": "${pro_creation_datetime}", diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 94a0b67..287a509 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -11,7 +11,7 @@ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?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}", diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index bad6fcd..78f7727 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -12,7 +12,7 @@ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?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}", diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index b1f75ce..6cf5be9 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -10,7 +10,7 @@ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?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}", diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 68fcae2..c0a5741 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -11,7 +11,7 @@ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "RefID": "${receipt.receipt_reference?trim?json_string}", <#else> - "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?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}", From a1b063a9d402f7d27ea52839e74127670e77b6eb Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 17:05:41 +0200 Subject: [PATCH 21/62] SCPN1-8863 --- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 2 +- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index 04ed23e..d57a789 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -85,7 +85,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}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", + "OrderID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", <#if preparation_order.line_list??> "Lines" : [ diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 78f7727..56f2c78 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -51,7 +51,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?trim?json_string}${receipt.receipt_number?trim?json_string}", + "OrderID": "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}", <#if receipt.line_list??> "Lines" : [ From 24f7b8b36a7e126de7170aec4459f04f7ff611f4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 17:24:32 +0200 Subject: [PATCH 22/62] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 6 +++++- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 090c683..40a50a4 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -4,7 +4,11 @@ [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#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?size != 0 > , diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 35ae400..a8405f4 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -4,7 +4,11 @@ [ <#assign refIDHmap_local ={}> <#list preparationOrder.preparation_line_lst as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> + <#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?size != 0 > , From 30337cc0038b0e4165d39aadfc8d9fd6c4f3ff5c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 24 Jun 2025 17:35:46 +0200 Subject: [PATCH 23/62] SCPN1-8863 --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 2 +- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 40a50a4..df66203 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?size != 0 > diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index a8405f4..35bfc9c 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.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?size != 0 > From d1f251ba329a476a6fe73fe73ea65eed0930e057 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 25 Jun 2025 17:08:44 +0200 Subject: [PATCH 24/62] modif statut --- 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 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index a424860..2c04263 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -9,7 +9,7 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 3728c21..38cc6b9 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -8,7 +8,7 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 51d298f..b0775d4 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -8,7 +8,7 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 51d298f..b0775d4 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -8,7 +8,7 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 0bdb7ac..4848d48 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -8,7 +8,7 @@ }, "ID": { <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "O${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", <#else> "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", From 899cdd25086573ce2944685c6f5347dba3761f1d Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 30 Jun 2025 13:47:50 +0200 Subject: [PATCH 25/62] 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 59b6690..99cd246 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 d875085657127b67b80622505fb56a28c93393e8 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Tue, 1 Jul 2025 15:42:26 +0200 Subject: [PATCH 26/62] SCPN1-8991 (cherry picked from commit 9d7293d92eb9f4b07886ab11f7ed59a2a6f7aaa1) --- RPtoRFX_PrepOrder.ftl | 4 ++++ RPtoRFX_Receipt.ftl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 99cd246..39a9ed0 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 a0c50cf..6b524ec 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 dfdfbdeb15b5455bf3bfe93a99bb123cf5459644 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 2 Jul 2025 10:28:24 +0200 Subject: [PATCH 27/62] SCPN1-8865 --- 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 ca5c456..001ae02 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -36,7 +36,11 @@ "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}", - "LineID": "${reflexMvtStockInterface.receipt_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}", + "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", "Quantity": { "LVID": "${quantity_in_base_lv_RP_Cst}", From a248dc16ed778d530ee9fa1dd4750520fdd71e71 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 2 Jul 2025 15:05:35 +0200 Subject: [PATCH 28/62] ajout controle --- RFXtoRP_HsrPro.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 5bf0bcd..c1ec47e 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -18,7 +18,7 @@ [ <#-- 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.preparation_type_code?? && (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" > { From c1704af84dd249eb831d077facd95790dc93b2dd Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Wed, 2 Jul 2025 15:51:11 +0200 Subject: [PATCH 29/62] SCPN1-8987 (cherry picked from commit bcd2d995c295ebd2a0d72b3b426936bcf42010c0) --- 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 dd4d31b4439684afca3b169219c625c5dc84385e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Jul 2025 15:01:26 +0200 Subject: [PATCH 30/62] SCPN1-8865 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 001ae02..3c01e2c 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -29,13 +29,27 @@ <#-- Goods received Segmentation Keys inclusion --> <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl"> }, - <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.receipt_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.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.origin_order_line_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.origin_order_line_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}", + + <#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}", - + <#if reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${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}", + <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> "LineID": "${reflexMvtStockInterface.origin_order_line_number}", <#else> From 9999313dfc561660bfe57888da915a037ec2b986 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Jul 2025 15:02:19 +0200 Subject: [PATCH 31/62] SCPN1-8865 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 1 + 1 file changed, 1 insertion(+) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 3c01e2c..9780607 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -50,6 +50,7 @@ "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> "LineID": "${reflexMvtStockInterface.origin_order_line_number}", <#else> From 0a5ec7329cc2e5a9a51c2c309f8bda71f5a4b8cb Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Jul 2025 16:09:48 +0200 Subject: [PATCH 32/62] SCPN1-8863 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 9780607..f500905 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -30,17 +30,12 @@ <#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.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.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.origin_order_line_reference?trim?json_string}", - "OrderID": "${reflexMvtStockInterface.origin_order_line_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!=""> From 890768f89a0f8f5f1695cab5599884cfd53a97c9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Jul 2025 16:33:56 +0200 Subject: [PATCH 33/62] SCPN1-8865 --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index f500905..c933280 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -34,8 +34,13 @@ "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", <#else> + <#if <#if reflexMvtStockInterface.receipt_reference!=""> + "ExecutionflowID": "${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}", + <#else> <#if reflexMvtStockInterface.receipt_reference!=""> From 83a1f59edf51fa7368d3ed81f2d70f0c58c969c8 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 3 Jul 2025 16:40:53 +0200 Subject: [PATCH 34/62] SCPN1-8865 --- 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 c933280..f7827f3 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -34,7 +34,7 @@ "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", <#else> - <#if <#if reflexMvtStockInterface.receipt_reference!=""> + <#if reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> From 58118c394b64ad92084c0704200c9f1c0dd66883 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 4 Jul 2025 15:05:14 +0200 Subject: [PATCH 35/62] Correction HsrPrepa_Carrier --- RFXtoRP_HsrPrepa_CarrierUpdated.ftl | 31 +++++++++++----------- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 33 ++++++++++++------------ 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index df66203..1ab5972 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -9,29 +9,30 @@ <#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?size != 0 > - , - + <#if !refIDHmap_local[OrderOriginReference]?? > + <#if refIDHmap_local?size != 0 > + , + <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> - { + { "Header": { "ProjectID": "${projectRP}" }, "ID":{ "RefID": "${OrderOriginReference}" }, - "Payload":{ - "Carrier": { - "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" + "Payload":{ + "Carrier": { + "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" + } + <#-- Add transport grade code + <#if preparationOrder.transport_grade_code!=""> + , + "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}" + --> } - <#-- Add transport grade code - <#if preparationOrder.transport_grade_code!=""> - , - "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}" - --> - } - } + } + <#assign refIDHmap_local ={}> ] \ No newline at end of file diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index 35bfc9c..d089f7c 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -9,24 +9,25 @@ <#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 > - , - - <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID":{ - "RefID": "${OrderOriginReference}" - }, - "Payload":{ - "Carrier": { - "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" + , + + <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID":{ + "RefID": "${OrderOriginReference}" + }, + "Payload":{ + "Carrier": { + "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" + } } - } - } + } + <#assign refIDHmap_local ={}> ] \ No newline at end of file From 297e3ea4c80cc711f568459dcaafa7a59205dc4c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 4 Jul 2025 16:10:01 +0200 Subject: [PATCH 36/62] =?UTF-8?q?modif=20r=C3=A9ception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eiptList_ExecutionflowReceiptCompleted.ftl | 68 ++++++++++++++----- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 6cf5be9..0476e57 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -1,23 +1,59 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign refIDHmap_local ={}> [ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.receipt_reference?trim?json_string}", - <#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?trim?json_string}${receipt.receipt_number?trim?json_string}", + <#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": { + "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + + <#break> - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } - }, - "Payload": { } - } -] + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + + +] \ No newline at end of file From 676fab0fea67351b453021e87accf90c81f74d0b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 4 Jul 2025 16:44:58 +0200 Subject: [PATCH 37/62] Modif receipt completed --- RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl | 1 - 1 file changed, 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 0476e57..f1397f7 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -24,7 +24,6 @@ } } - <#break> <#else> From 9b8a5ad5c6a1016e1e09790ae5e53a3a5baa8e92 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 4 Jul 2025 16:51:30 +0200 Subject: [PATCH 38/62] modifs recipt canceled --- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 68 ++++++++++++++----- 1 file changed, 51 insertions(+), 17 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 287a509..4106515 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -1,24 +1,58 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> - +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign refIDHmap_local ={}> [ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.receipt_reference?trim?json_string}", - <#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?trim?json_string}${receipt.receipt_number?trim?json_string}", + <#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": { + "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } - }, - "Payload": { } - } + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + + ] From 16f4e35c02843c87377964b9627fb446de86e3f5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 4 Jul 2025 17:02:52 +0200 Subject: [PATCH 39/62] modif receipt expected --- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 73 ++++++++++++++++------ 1 file changed, 53 insertions(+), 20 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index c0a5741..f1397f7 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -1,25 +1,58 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> - +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign refIDHmap_local ={}> [ - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID": { - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "RefID": "${receipt.receipt_reference?trim?json_string}", - <#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?trim?json_string}${receipt.receipt_number?trim?json_string}", + <#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": { + "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { } - }, - - "Payload": {} - - } -] + } + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + + +] \ No newline at end of file From 9f34588a6aa52ded485a65b1bad6cba70f8ecef3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 7 Jul 2025 15:41:19 +0200 Subject: [PATCH 40/62] Receipt --- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 56 +++++++++++----------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index f1397f7..774c43a 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -24,35 +24,35 @@ } } + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + - <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - } - } - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - ] \ No newline at end of file From 5c4dc74bb8f497d915dca5b7d8888c4c884e85a5 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 7 Jul 2025 15:42:42 +0200 Subject: [PATCH 41/62] modif receipt --- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 774c43a..5c835a6 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -38,6 +38,7 @@ "Payload": { } } + <#break> <#else> { "Header": {"ProjectID": "${projectRP}"}, @@ -51,6 +52,7 @@ "Payload": { } } + <#break> From cded3aa0e37ed1f465cbcac1b3742434945bf4a1 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 7 Jul 2025 15:52:22 +0200 Subject: [PATCH 42/62] =?UTF-8?q?Modifs=20r=C3=A9ception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...eiptList_ExecutionflowReceiptCompleted.ftl | 58 ++++++++++--------- 1 file changed, 30 insertions(+), 28 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index f1397f7..5c835a6 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -24,35 +24,37 @@ } } + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + <#break> + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + <#break> + - <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - } - } - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - ] \ No newline at end of file From 8c228dd0eb106e066157e459c29c6829a797c3b9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 7 Jul 2025 15:58:10 +0200 Subject: [PATCH 43/62] =?UTF-8?q?modif=20r=C3=A9ception?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 4106515..5c835a6 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -24,35 +24,37 @@ } } + <#else> + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } + <#break> + <#else> + { + "Header": {"ProjectID": "${projectRP}"}, + "ID": { + "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}" + } + }, + "Payload": { + } + } + <#break> + - <#else> - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", - "RefDate": { - "DateTime": "${receipt_status_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" - } - }, - "Payload": { - } - } - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - -] +] \ No newline at end of file From 42237b20299767abf8b7973b133ac55519d6f0a0 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 7 Jul 2025 16:11:37 +0200 Subject: [PATCH 44/62] =?UTF-8?q?modif=20r=C3=A9ception=20date?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index 5c835a6..dd7e9ff 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt.modification_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> [ <#if receipt.line_list??> diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 5c835a6..b5b9b99 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> [ <#if receipt.line_list??> From ddab0673d433da6c9d8f0d86ec0a55b47788fa5b Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Mon, 7 Jul 2025 16:15:49 +0200 Subject: [PATCH 45/62] modif date cancelled --- RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index dd7e9ff..b5b9b99 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt.modification_datetime,time_zone_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> [ <#if receipt.line_list??> From 592ccb8905b8cfda4f50412880ee94316586edd4 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 15:01:36 +0200 Subject: [PATCH 46/62] 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 de64de8..cd3334a 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 e50893e8c9628c3f42d88083a97dccde82d1b983 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 9 Jul 2025 15:09:39 +0200 Subject: [PATCH 47/62] 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 cd3334a..e6fa11b 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 835b8062ee7a4dc1d6e4db390ebbad5a7639c424 Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Thu, 10 Jul 2025 09:52:33 +0200 Subject: [PATCH 48/62] SCPN1-9059 --- RFXtoRP_HsaDispute_Created.ftl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index e6fa11b..761d612 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -40,7 +40,11 @@ "Value": "${dispute.dispute_amount}" }, <#-- Claim metadata inclusion --> +<<<<<<< HEAD <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> +======= + <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">, +>>>>>>> 17184ed (SCPN1-9059) <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From 27f2d525dcd4737448455238405957a405ee48fa Mon Sep 17 00:00:00 2001 From: "GROUP\\frea" Date: Tue, 15 Jul 2025 14:57:59 +0200 Subject: [PATCH 49/62] SCPN1-9084 (cherry picked from commit 3d2670b9a23d1106773d0881e62c0f5ae1409241) --- 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 632cc2b6475aa0f8c619d622fa3a7df10b3816e7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 17 Jul 2025 10:24:02 +0200 Subject: [PATCH 50/62] dispute --- RFXtoRP_HsaDispute_Created.ftl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 761d612..820fd8b 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -40,11 +40,7 @@ "Value": "${dispute.dispute_amount}" }, <#-- Claim metadata inclusion --> -<<<<<<< HEAD - <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl"> -======= <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">, ->>>>>>> 17184ed (SCPN1-9059) <#-- To configure --> <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if dispute.dispute_type_code=="050" > From 7bf9d3c674f933400002cc8d7d28e8ac00fc28b9 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 17 Jul 2025 13:59:57 +0200 Subject: [PATCH 51/62] Revert "SCPN1-8865" This reverts commit 8cd98b86380e36efe8f4e6f216c70fcd657804d9. --- RFXtoRP_HsaIpgMove.ftl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 4b0b7d5..9884ec8 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -47,6 +47,7 @@ <#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> @@ -55,6 +56,10 @@ <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl"> } ] + <#else> + <#-- Case of IPG move type volontarilly ignored--> + <#stop " Reference receipt is empty"> + <#else> <#stop> From 7d998634d384197552a5f7ecb30b23a62e82899e Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 17 Jul 2025 14:08:14 +0200 Subject: [PATCH 52/62] revert --- RFXtoRP_HsrReceiptList.ftl | 111 ++++++++++-------- ..._HsrReceiptList_ExecutionflowCancelled.ftl | 2 +- ...P_HsrReceiptList_ExecutionflowDetected.ftl | 4 + ...eiptList_ExecutionflowReceiptCompleted.ftl | 2 +- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 2 +- 5 files changed, 70 insertions(+), 51 deletions(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 9785951..394713c 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -15,25 +15,29 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> - <#if receipt.receipt_type == "030"> - <#stop "ignored message because receipt type = transfert"> + <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> + <#if receipt.receipt_type == "030"> + <#stop "ignored message because receipt type = transfert"> + <#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> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> - - } - ] + <#stop "Receipt reference is empty"> <#break> <#case "U"> @@ -41,39 +45,43 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - <#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_ExecutionflowCancelled.ftl"> - } - <#else> - <#if receipt.receipt_confirmed == "true" > - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> - } + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } <#else> - <#if receipt.receipt_type == "030"> - <#stop "ignored message because receipt type = transfert"> - <#else> + <#if receipt.receipt_confirmed == "true" > { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl"> - }, - { + <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> + } + <#else> + <#if receipt.receipt_type == "030"> + <#stop "ignored message because receipt type = transfert"> + <#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"> ] <#break> @@ -83,14 +91,21 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> - } + <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> + { + + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } + <#else> + <#stop "Receipt reference is empty"> + ] - <#break> + <#break> + + <#default> <#stop > diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index b5b9b99..ea0e361 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -57,4 +57,4 @@ -] \ No newline at end of file +] diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index 56f2c78..a0e1865 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -48,11 +48,15 @@ "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" }, +<<<<<<< HEAD <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> "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?trim?json_string}${receipt.receipt_number?trim?json_string}", +======= + +>>>>>>> parent of 8abf277 (SCPN1-8865) <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 5c835a6..dd5d917 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -57,4 +57,4 @@ -] \ No newline at end of file +] diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index b5b9b99..ea0e361 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -57,4 +57,4 @@ -] \ No newline at end of file +] From 9642b8b8ad75c6d50cd1fb72c09ec64d7d12010f Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 17 Jul 2025 16:30:16 +0200 Subject: [PATCH 53/62] revert --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 10 ++-------- 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_HandlingUnitDispatched.ftl | 2 +- RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl | 13 ++++--------- RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl | 8 ++------ RFXtoRP_HsrPro.ftl | 13 +++++++++++-- RFXtoRP_HsrPro_ExecutionflowCancelled.ftl | 6 +----- RFXtoRP_HsrPro_ExecutionflowDetected.ftl | 12 ++---------- ...oRP_HsrReceiptList_ExecutionflowCancelled.ftl | 14 -------------- RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl | 16 ++-------------- ...ReceiptList_ExecutionflowReceiptCompleted.ftl | 16 +--------------- RFXtoRP_HsrReceiptList_ReceiptExpected.ftl | 14 -------------- 19 files changed, 37 insertions(+), 129 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index f7827f3..786fa41 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -34,21 +34,15 @@ "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}", <#else> - <#if reflexMvtStockInterface.receipt_reference!=""> + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${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}", <#else> - <#if reflexMvtStockInterface.receipt_reference!=""> + <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${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}", <#if reflexMvtStockInterface.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 20c2768..ae9ca29 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_order_originator_reference?? && 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 "PRO reference is empty"> + ] <#break> diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index 2c04263..a54077e 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,11 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - <#else> - "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", - + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 38cc6b9..621c029 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,11 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - <#else> - "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", - + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index b0775d4..775ca0b 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,11 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - <#else> - "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", - + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index b0775d4..775ca0b 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,11 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - <#else> - "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", - + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 4848d48..97d9d7e 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,11 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!=""> - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", - <#else> - "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?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}", - + "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 301a390..5bbd320 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -52,7 +52,7 @@ <#assign refIDHmap ={}> <#assign hd_numberHmap ={}> <#assign hd_numberHmapHUadded ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") 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 1ab5972..8c9ebc6 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -3,12 +3,8 @@ <#include "ActorPrefix.ftl"> [ <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst as preparation_line> - <#if preparation_line.preparation_order_originator_reference?? && preparation_line.preparation_order_originator_reference!=""> + <#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> - <#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 > , diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index d04d8c6..5fe5ad8 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 ) as preparation_line> + <#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 preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index af4010f..fe55ffc 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 ) as preparation_line> + <#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 preparation_line.despatched_ipg_list as despatched_ipg> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { @@ -111,14 +111,9 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> - }, - <#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.preparation_order_originator_reference?trim?json_string}", - <#else> - "OrderID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", - "ExecutionflowID": "O${preparationOrder.physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.pro_year?trim?json_string}${preparation_line.pro_number?trim?json_string}", - + }, + "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", + "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", <#else> diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl index d089f7c..a8df9a9 100644 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl @@ -3,12 +3,8 @@ <#include "ActorPrefix.ftl"> [ <#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}"> - + <#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> <#if !refIDHmap_local[OrderOriginReference]?? > <#if refIDHmap_local?size != 0 > , diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index c1ec47e..37badb5 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -16,7 +16,7 @@ <#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?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")> <#-- Only if preparation order not confirmed --> @@ -34,8 +34,12 @@ <#else> <#-- preparation order type not supported --> - <#stop> + <#stop> + <#else> + <#-- PRO reference is empty --> + <#stop> + ] <#break> @@ -44,12 +48,17 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ + <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> } + <#else> + <#-- PRO reference is empty --> + <#stop> + ] <#break> diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index 36c24dc..b518fa7 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,11 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> - "RefID": "${preparation_order.originator_reference?trim?json_string}", - <#else> - "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", - + "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index d57a789..8aff3af 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -9,11 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> - "RefID": "${preparation_order.originator_reference?trim?json_string}", - <#else> - "RefID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", - + "RefID": "${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -82,11 +78,7 @@ } }, - <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> - "OrderID": "${preparation_order.originator_reference?trim?json_string}", - <#else> - "OrderID": "O${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}", - + "OrderID": "${preparation_order.originator_reference?trim?json_string}", <#if preparation_order.line_list??> "Lines" : [ <#list preparation_order.line_list as preparation_order_line > diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index ea0e361..ee94331 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -39,20 +39,6 @@ } } <#break> - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - <#break> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index a0e1865..6d21132 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.receipt_reference?trim?json_string}", - <#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?trim?json_string}${receipt.receipt_number?trim?json_string}", - + "RefID": "${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -48,15 +44,7 @@ "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" }, -<<<<<<< HEAD - <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - "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?trim?json_string}${receipt.receipt_number?trim?json_string}", - -======= - ->>>>>>> parent of 8abf277 (SCPN1-8865) + "OrderID": "${receipt.receipt_reference?trim?json_string}", <#if receipt.line_list??> "Lines" : [ <#list receipt.line_list as line> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index dd5d917..ee94331 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -1,6 +1,6 @@ <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> -<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> [ <#if receipt.line_list??> @@ -39,20 +39,6 @@ } } <#break> - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - <#break> diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index ea0e361..ee94331 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -39,20 +39,6 @@ } } <#break> - <#else> - { - "Header": {"ProjectID": "${projectRP}"}, - "ID": { - "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}" - } - }, - "Payload": { - } - } - <#break> From 06376dd2d73ea73fe0e3f1e3a2cdadfdb5e08589 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 18 Jul 2025 11:08:12 +0200 Subject: [PATCH 54/62] suppression commentaires --- RFXtoRP_HsaDispute.ftl | 3 ++- RFXtoRP_HsaIpgMove.ftl | 4 ++-- RFXtoRP_HsaProStatus.ftl | 3 ++- RFXtoRP_HsrPrepa.ftl | 3 ++- RFXtoRP_HsrReceiptList.ftl | 6 ++++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 8b37074..8bc9f6e 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -36,7 +36,8 @@ <#stop> <#else> - <#stop "Reference is empty"> + <#-- "Reference is empty"--> + <#stop> ] diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 9884ec8..c2bf457 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -57,8 +57,8 @@ } ] <#else> - <#-- Case of IPG move type volontarilly ignored--> - <#stop " Reference receipt is empty"> + <#-- Case of IPG move type volontarilly ignored, Reference receipt is empty--> + <#stop > <#else> <#stop> diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index ae9ca29..6c9401d 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -65,7 +65,8 @@ <#else> - <#stop "PRO reference is empty"> + <#--PRO reference is empty--> + <#stop > ] <#break> diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 5bbd320..a6ef2b0 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -96,7 +96,8 @@ <#assign refIDHmap ={}> ] <#else> - <#stop "no confirmed quantity for the preparation - preparation closed"> + <#-- no confirmed quantity for the preparation - preparation closed--> + <#stop > diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 394713c..bb09270 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -81,7 +81,8 @@ <#else> - <#stop "Receipt reference is empty"> + <#-- Receipt reference is empty--> + <#stop > ] <#break> @@ -100,7 +101,8 @@ <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> } <#else> - <#stop "Receipt reference is empty"> + <#-- Receipt reference is empty--> + <#stop > ] <#break> From 2d1fefd96f911c6919a836c9ed8ee42cdb9791b3 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 18 Jul 2025 11:31:24 +0200 Subject: [PATCH 55/62] suppression commentaires --- RFXtoRP_HsrReceiptList.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index bb09270..3843791 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -37,7 +37,8 @@ ] <#else> - <#stop "Receipt reference is empty"> + <#-- "Receipt reference is empty"--> + <#stop> <#break> <#case "U"> From 649452207d24ed30ce7ec578c6ea139f0da0803a Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 23 Jul 2025 15:45:50 +0200 Subject: [PATCH 56/62] modifs goods received --- RFXtoRP_HsaIpgMove_GoodsReceived.ftl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 786fa41..d57ad3c 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -43,6 +43,9 @@ <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!=""> "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", + <#else> + "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.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.origin_order_line_number?? && reflexMvtStockInterface.origin_order_line_number!=0> From 27a762caa8f70e46e34959a9bc0f80dcf6bfeb88 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 5 Aug 2025 17:06:20 +0200 Subject: [PATCH 57/62] ODP confirmed --- RFXtoRP_HsrPro.ftl | 7 ------- 1 file changed, 7 deletions(-) diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 37badb5..50491f8 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -19,19 +19,12 @@ <#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?? && (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" > { <#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> From 8863cd66a74c37fc2141ac184b30a4feab76cb62 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Wed, 6 Aug 2025 11:13:02 +0200 Subject: [PATCH 58/62] Controle line_list --- RFXtoRP_HsrPrepa.ftl | 5 ++++ RFXtoRP_HsrPro.ftl | 34 +++++++++++++++-------- RFXtoRP_HsrReceiptList.ftl | 57 ++++++++++++++++++++++++-------------- 3 files changed, 63 insertions(+), 33 deletions(-) diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index a6ef2b0..b90dc7b 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_line_lst??> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared> @@ -95,6 +96,10 @@ <#assign refIDHmap ={}> ] + <#else> + <#-- No line--> + <#stop > + <#else> <#-- no confirmed quantity for the preparation - preparation closed--> <#stop > diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 50491f8..783e7a0 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -19,12 +19,17 @@ <#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?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")> - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> - } + <#if preparation_order.line_list??> + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl"> + } + <#else> + <#-- No line --> + <#stop> + <#else> <#-- preparation order type not supported --> <#stop> @@ -42,12 +47,17 @@ <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> [ <#if preparation_order.originator_reference?? && preparation_order.originator_reference!=""> - { - <#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> <#-- PRO reference is empty --> <#stop> diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 3843791..be3d0c9 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -17,8 +17,9 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> <#if receipt.receipt_type == "030"> - <#stop "ignored message because receipt type = transfert"> + <#stop "ignored message because receipt type = transfert"> <#else> + <#if receipt.line_list ??> [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> @@ -35,11 +36,15 @@ } ] - - <#else> - <#-- "Receipt reference is empty"--> - <#stop> + <#else> + <#-- No line--> + <#stop> + + <#else> + <#-- "Receipt reference is empty"--> + <#stop> + <#break> <#case "U"> <#-- *********************************************** Action = UPDATE ******************** --> @@ -66,18 +71,23 @@ <#if receipt.receipt_type == "030"> <#stop "ignored message because receipt type = transfert"> <#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> + <#-- No line--> + <#stop> + @@ -94,13 +104,18 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - { + <#if receipt.line_list ??> + { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> - } + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl"> + } + <#else> + <#-- No line--> + <#stop> + <#else> <#-- Receipt reference is empty--> <#stop > From 499a16796ace20db625ebbce3e775e9603cb8822 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 7 Aug 2025 09:46:44 +0200 Subject: [PATCH 59/62] Modif RPtoRFX_Receipt --- RPtoRFX_Receipt.ftl | 12 +----------- RPtoRFX_Receipt_LineMetadata.ftl | 6 +++++- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 6b524ec..e1326d1 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 62c7f33..707156b 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 18ac89f6640341cb79905a32e1753126886e2bdf Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 7 Aug 2025 10:58:08 +0200 Subject: [PATCH 60/62] Modifs Optional_attributes --- RPtoRFX_PrepOrder.ftl | 7 ------- RPtoRFX_Receipt.ftl | 6 +++++- RPtoRFX_Receipt_LineMetadata.ftl | 6 +----- RPtoRFX_Receipt_OptionalAttributes.ftl | 16 ++++++++++++++++ 4 files changed, 22 insertions(+), 13 deletions(-) create mode 100644 RPtoRFX_Receipt_OptionalAttributes.ftl diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 39a9ed0..cc83fb2 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -105,13 +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 e1326d1..6ae54c8 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 707156b..62c7f33 100644 --- a/RPtoRFX_Receipt_LineMetadata.ftl +++ b/RPtoRFX_Receipt_LineMetadata.ftl @@ -14,8 +14,4 @@ } ] , ---> - - "optional_attributes": { - "hold_for_specific_code": "false" - }, \ No newline at end of file +--> \ No newline at end of file diff --git a/RPtoRFX_Receipt_OptionalAttributes.ftl b/RPtoRFX_Receipt_OptionalAttributes.ftl new file mode 100644 index 0000000..c78f28f --- /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 ff01a944e40e66c4650998c4150826f0d973478c Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Thu, 7 Aug 2025 16:39:01 +0200 Subject: [PATCH 61/62] Readme --- README.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index c90e0d1..0f1ecdd 100644 --- a/README.md +++ b/README.md @@ -1,10 +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 127e69db7b45ffe9620725f2a62a92aad393c053 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Tue, 26 Aug 2025 10:27:57 +0200 Subject: [PATCH 62/62] Modifs line ref trf hsaipgmove receipt --- 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 d57ad3c..0b78db9 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -48,8 +48,8 @@ "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_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}",