From 4f8f43d127f6a6e599ad929310dbc45a6754eae6 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 12 May 2026 11:25:32 +0200 Subject: [PATCH] Fix4 v13 --- ActorPrefix.ftl | 16 ++++++++++++++++ InternalSettings.ftl | 6 +++--- RFXtoRP_HfDtlStockLs.ftl | 2 +- RFXtoRP_HfExpGrpList.ftl | 1 + RFXtoRP_HfGrade.ftl | 3 ++- RFXtoRP_HfLvTypeList.ftl | 3 ++- RFXtoRP_HfOwner.ftl | 3 ++- RFXtoRP_HliPrepaL.ftl | 2 +- RFXtoRP_HsaCarrier.ftl | 2 +- RFXtoRP_HsaCons.ftl | 2 +- RFXtoRP_HsaDesPatch.ftl | 4 ++-- RFXtoRP_HsaDespNt.ftl | 4 ++-- RFXtoRP_HsaDispute.ftl | 2 +- RFXtoRP_HsaIpgMove.ftl | 5 +++++ RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsaItm.ftl | 2 +- RFXtoRP_HsaItmLv.ftl | 6 +++--- RFXtoRP_HsaLstCarSta.ftl | 7 ++++--- RFXtoRP_HsaLstCarSta_CarrierExpected.ftl | 3 ++- RFXtoRP_HsaProStatus.ftl | 2 +- RFXtoRP_HsaSup.ftl | 6 +++--- RFXtoRP_HsrCarrierApt.ftl | 6 +++--- RFXtoRP_HsrCarrierApt_CarrierExpected.ftl | 2 +- RFXtoRP_HsrDepot.ftl | 2 +- RFXtoRP_HsrLoadInfo.ftl | 12 ++---------- RFXtoRP_HsrPackBranch.ftl | 4 ++-- RFXtoRP_HsrPackOrder.ftl | 4 ++-- RFXtoRP_HsrPrepa.ftl | 2 +- RFXtoRP_HsrPro.ftl | 2 +- RFXtoRP_HsrReceiptList.ftl | 2 +- RFXtoRP_PlatformLogCreate.ftl | 7 ++++--- RFXtoRP_RestResponse.ftl | 10 +++++----- 32 files changed, 78 insertions(+), 58 deletions(-) diff --git a/ActorPrefix.ftl b/ActorPrefix.ftl index e12b76d..4756b31 100644 --- a/ActorPrefix.ftl +++ b/ActorPrefix.ftl @@ -37,7 +37,11 @@ <#if uniqueness> <#local depot = actor> <#else> + <#if actor?length gt 4> <#local depot = actor[4..]> + <#else> + <#local depot = actor> + <#return (depot)> @@ -78,7 +82,11 @@ <#if uniqueness> <#local supplier = actor> <#else> + <#if actor?length gt 4> <#local supplier = actor[4..]> + <#else> + <#local supplier = actor> + <#return (supplier)> @@ -117,7 +125,11 @@ <#if uniqueness> <#local carrier = actor> <#else> + <#if actor?length gt 4> <#local carrier = actor[4..]> + <#else> + <#local carrier = actor> + <#return (carrier)> @@ -156,7 +168,11 @@ <#if uniqueness> <#local consignee = actor> <#else> + <#if actor?length gt 4> <#local consignee = actor[4..]> + <#else> + <#local consignee = actor> + <#return (consignee)> \ No newline at end of file diff --git a/InternalSettings.ftl b/InternalSettings.ftl index 7cd70f6..7e2101a 100644 --- a/InternalSettings.ftl +++ b/InternalSettings.ftl @@ -2,10 +2,10 @@ <#-- --------------------------------------------------------------------------------------- --> <#-- DeleteEF est un paramètre qui permet de déterminer si l’exécution logistique doit être supprimée lors de la création d’une commande.--> <#-- Attention : si vous choisissez de la supprimer, toutes les métadonnées associées à cette exécution logistique seront également supprimées. --> -<#-- Si DeleteEF_False = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_False = false, nous supprimons l'exécution logistique.--> +<#-- Si DeleteEF_Creation = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_Creation = false, nous supprimons l'exécution logistique.--> <#-- --------------------------------------------------------------------------------------- --> <#-- DeleteEF is a parameter used to determine whether the logistics execution should be deleted when creating an order.--> <#-- Warning: if deletion is selected, all metadata related to the logistics execution will also be removed. --> -<#-- If DeleteEF_False = true, we do not delete the logistics execution. If DeleteEF_False = false, we delete the logistics execution. --> +<#-- If DeleteEF_Creation = true, we do not delete the logistics execution. If DeleteEF_Creation = false, we delete the logistics execution. --> <#-- --------------------------------------------------------------------------------------- --> -<#assign DeleteEF_False = true> \ No newline at end of file +<#assign DeleteEF_Creation = true> \ No newline at end of file diff --git a/RFXtoRP_HfDtlStockLs.ftl b/RFXtoRP_HfDtlStockLs.ftl index 4bac6a2..158d52f 100644 --- a/RFXtoRP_HfDtlStockLs.ftl +++ b/RFXtoRP_HfDtlStockLs.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for stock snapshotted --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> <#-- sum_elt : nb element in snapshot (optional parameter) --> diff --git a/RFXtoRP_HfExpGrpList.ftl b/RFXtoRP_HfExpGrpList.ftl index affae42..8cad1c9 100644 --- a/RFXtoRP_HfExpGrpList.ftl +++ b/RFXtoRP_HfExpGrpList.ftl @@ -1,3 +1,4 @@ +<#-- input : message HARDIS WMS for expiry group --> <#-- *********************************************** Parameter global ******************** --> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> diff --git a/RFXtoRP_HfGrade.ftl b/RFXtoRP_HfGrade.ftl index 39f6d2f..82bd26f 100644 --- a/RFXtoRP_HfGrade.ftl +++ b/RFXtoRP_HfGrade.ftl @@ -1,3 +1,4 @@ +<#-- input : message HARDIS WMS for grades --> <#-- *********************************************** Parameter global ******************** --> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -9,7 +10,7 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Grades"> + <#stop > <#break> diff --git a/RFXtoRP_HfLvTypeList.ftl b/RFXtoRP_HfLvTypeList.ftl index f9b3b04..2e7865a 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -1,3 +1,4 @@ +<#-- input : message HARDIS WMS for logistics variants types --> <#-- *********************************************** Parameter global ******************** --> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -10,7 +11,7 @@ <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for LV types"> + <#stop > <#break> diff --git a/RFXtoRP_HfOwner.ftl b/RFXtoRP_HfOwner.ftl index 6d23fd2..ee69be1 100644 --- a/RFXtoRP_HfOwner.ftl +++ b/RFXtoRP_HfOwner.ftl @@ -1,3 +1,4 @@ +<#-- input : message HARDIS WMS for owners --> <#-- *********************************************** Parameter global ******************** --> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -9,7 +10,7 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Owners"> + <#stop > <#break> diff --git a/RFXtoRP_HliPrepaL.ftl b/RFXtoRP_HliPrepaL.ftl index 9125d0c..57428b9 100644 --- a/RFXtoRP_HliPrepaL.ftl +++ b/RFXtoRP_HliPrepaL.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for lines of preparation order shipped--> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> <#include "ReflexUtils.ftl"> diff --git a/RFXtoRP_HsaCarrier.ftl b/RFXtoRP_HsaCarrier.ftl index 288be38..19fe197 100644 --- a/RFXtoRP_HsaCarrier.ftl +++ b/RFXtoRP_HsaCarrier.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for carrier actor --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> <#include "ReflexUtils.ftl"> diff --git a/RFXtoRP_HsaCons.ftl b/RFXtoRP_HsaCons.ftl index fb5bb1b..62403ac 100644 --- a/RFXtoRP_HsaCons.ftl +++ b/RFXtoRP_HsaCons.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for consignee actor --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> <#include "ReflexUtils.ftl"> diff --git a/RFXtoRP_HsaDesPatch.ftl b/RFXtoRP_HsaDesPatch.ftl index 1e362dc..16ffb9f 100644 --- a/RFXtoRP_HsaDesPatch.ftl +++ b/RFXtoRP_HsaDesPatch.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for desPatch"> + <#stop > <#break> <#case "D"> @@ -24,7 +24,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for desPatch"> + <#stop > <#break> <#default> <#stop > diff --git a/RFXtoRP_HsaDespNt.ftl b/RFXtoRP_HsaDespNt.ftl index 97c2538..4ceb9e1 100644 --- a/RFXtoRP_HsaDespNt.ftl +++ b/RFXtoRP_HsaDespNt.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign despNt = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for despNt"> + <#stop > <#break> <#case "D"> @@ -24,7 +24,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign despNt = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for despNt"> + <#stop > <#break> <#default> <#stop > diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 7421d0c..b7c35ac 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for dispute/claim--> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> diff --git a/RFXtoRP_HsaIpgMove.ftl b/RFXtoRP_HsaIpgMove.ftl index 4b0b7d5..c5e8918 100644 --- a/RFXtoRP_HsaIpgMove.ftl +++ b/RFXtoRP_HsaIpgMove.ftl @@ -1,3 +1,8 @@ +<#-- **** input parameters ***** --> +<#-- input : message HARDIS WMS for moves--> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> + <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> <#assign organisationRP = organisation> diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index 1be2932..cf652f0 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -60,7 +60,7 @@ "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}", <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> - "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}", + "OperationReference": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}-${reflexMvtStockInterface.ipg_move_operation_year_number}-${reflexMvtStockInterface.ipg_move_operation_number}", "Quantity": diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index 0fe883c..5c02d1a 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for items --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> diff --git a/RFXtoRP_HsaItmLv.ftl b/RFXtoRP_HsaItmLv.ftl index 4b914aa..fe7efc0 100644 --- a/RFXtoRP_HsaItmLv.ftl +++ b/RFXtoRP_HsaItmLv.ftl @@ -1,7 +1,7 @@ <#-- **** input parameters ***** --> -<#-- input : message RFX --> -<#-- project : projectId in ReflexPlatform --> -<#-- organisation : organisationtId in ReflexPlatform --> +<#-- input : message HARDIS WMS for logistic variants --> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> diff --git a/RFXtoRP_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl index ce11a5d..610fe1b 100644 --- a/RFXtoRP_HsaLstCarSta.ftl +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -1,7 +1,8 @@ <#-- **** input parameters ***** --> -<#-- input : message RFX --> -<#-- project : projectId in ReflexPlatform --> -<#-- organisation : organisationtId in ReflexPlatform --> +<#-- input : message HARDIS WMS for carrier appointment status --> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> + <#include "ActorPrefix.ftl"> <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> diff --git a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl index 4fe7837..424c2ef 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl @@ -1,5 +1,6 @@ [ <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> + <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 1)?iso_utc /> { "Header": { "ProjectID": "${projectRP}" @@ -19,7 +20,7 @@ "RefDate": { - "DateTime": "${ref_datetime}", + "DateTime": "${ref_datetime2}", "AuthorTimeZone": "${time_zone_rfx}" } }, diff --git a/RFXtoRP_HsaProStatus.ftl b/RFXtoRP_HsaProStatus.ftl index 2bc089f..9437a90 100644 --- a/RFXtoRP_HsaProStatus.ftl +++ b/RFXtoRP_HsaProStatus.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for preparation status --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> diff --git a/RFXtoRP_HsaSup.ftl b/RFXtoRP_HsaSup.ftl index 79b07bf..db3c516 100644 --- a/RFXtoRP_HsaSup.ftl +++ b/RFXtoRP_HsaSup.ftl @@ -1,7 +1,7 @@ <#-- **** input parameters ***** --> -<#-- input : message RFX --> -<#-- project : projectId in ReflexPlatform --> -<#-- organisation : organisationtId in ReflexPlatform --> +<#-- input : message HARDIS WMS for supplier actor --> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> <#include "ReflexUtils.ftl"> <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 3f273a5..2230d0a 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -1,7 +1,7 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS-WMS --> -<#-- project : projectId in ReflexPlatform --> -<#-- organisation : organisationtId in ReflexPlatform --> +<#-- input : message HARDIS WMS for carrier appointment --> +<#-- project : projectId in HARDIS SC NETWORK --> +<#-- organisation : organisationtId in HARDIS SC NETWORK --> <#include "ActorPrefix.ftl"> <#include "HfRpConfig.ftl"> <#include "ReflexUtils.ftl"> diff --git a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl index 4efcc3e..dbb8910 100644 --- a/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl +++ b/RFXtoRP_HsrCarrierApt_CarrierExpected.ftl @@ -1,6 +1,6 @@ [ <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) /> - <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 60)?iso_utc /> + <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 1)?iso_utc /> { "Header": { "ProjectID": "${projectRP}" diff --git a/RFXtoRP_HsrDepot.ftl b/RFXtoRP_HsrDepot.ftl index 96f75c3..09088de 100644 --- a/RFXtoRP_HsrDepot.ftl +++ b/RFXtoRP_HsrDepot.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for depot actor --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> diff --git a/RFXtoRP_HsrLoadInfo.ftl b/RFXtoRP_HsrLoadInfo.ftl index a74a148..2f21d47 100644 --- a/RFXtoRP_HsrLoadInfo.ftl +++ b/RFXtoRP_HsrLoadInfo.ftl @@ -17,22 +17,14 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign depot = JsonUtil.jsonToMap(dataRfx)> - [ - { - - } - ] + <#stop > <#break> <#case "D"> <#-- *********************************************** Action = DELETE *************************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign depot = JsonUtil.jsonToMap(dataRfx)> - [ - { - - } - ] + <#stop > <#break> <#default> diff --git a/RFXtoRP_HsrPackBranch.ftl b/RFXtoRP_HsrPackBranch.ftl index f0f360e..39f7067 100644 --- a/RFXtoRP_HsrPackBranch.ftl +++ b/RFXtoRP_HsrPackBranch.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Branch"> + <#stop > <#break> <#case "D"> @@ -24,7 +24,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Branch"> + <#stop > <#break> <#default> <#stop > diff --git a/RFXtoRP_HsrPackOrder.ftl b/RFXtoRP_HsrPackOrder.ftl index 63a612d..bed33fd 100644 --- a/RFXtoRP_HsrPackOrder.ftl +++ b/RFXtoRP_HsrPackOrder.ftl @@ -16,7 +16,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Order"> + <#stop > <#break> <#case "D"> @@ -24,7 +24,7 @@ <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)> - <#stop "no generic FTL file available yet for Pack Order"> + <#stop > <#break> <#default> <#stop > diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index 57fcfcc..20b6b8f 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for preparation order shipped--> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> <#include "ReflexUtils.ftl"> diff --git a/RFXtoRP_HsrPro.ftl b/RFXtoRP_HsrPro.ftl index 1eee43f..479f30c 100644 --- a/RFXtoRP_HsrPro.ftl +++ b/RFXtoRP_HsrPro.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for preparation order --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 7ad88a1..05c2863 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message HARDIS WMS for receipt --> <#-- project : projectId in HARDIS SC NETWORK --> <#-- organisation : organisationtId in HARDIS SC NETWORK --> diff --git a/RFXtoRP_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index b9216e0..d1ade42 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -23,20 +23,21 @@ }, "TechMessage": { "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody} + "Label": ${strJsonBody?truncate(32000,'...')} }, "UserMessage": { "Code": "${restResponsetMsg.status!"no Code"}", - "Label": ${strJsonBody}, + "Label": ${strJsonBody?truncate(32000,'...')}, "Params": [] }, "DetailElements": [], "CorrelationID": "${id.correlationid!"no Correlationid"}", - "ContextPayload": ${strJsonBody}, + "ContextPayload": ${strJsonBody?truncate(32000,'...')}, "Type": "${event}", "Task": "${id.apiRestReflexID!"no Task"}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "StackTrace": "" } } + ] \ No newline at end of file diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 5f01e87..5a4e3bd 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -62,22 +62,22 @@ <#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) /> <#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)> <#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") > - <#if DeleteEF_False> + <#if DeleteEF_Creation> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl"> + <#include "RFXtoRP_ExecutionflowDeleted.ftl"> } ] <#else> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : - <#include "RFXtoRP_ExecutionflowDeleted.ftl"> + <#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl"> } ]