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/RFXtoRP_HfGrade.ftl b/RFXtoRP_HfGrade.ftl index 39f6d2f..5d33f00 100644 --- a/RFXtoRP_HfGrade.ftl +++ b/RFXtoRP_HfGrade.ftl @@ -9,7 +9,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..8a15c6f 100644 --- a/RFXtoRP_HfLvTypeList.ftl +++ b/RFXtoRP_HfLvTypeList.ftl @@ -9,9 +9,7 @@ <#case "C"> <#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..8a15c6f 100644 --- a/RFXtoRP_HfOwner.ftl +++ b/RFXtoRP_HfOwner.ftl @@ -9,7 +9,7 @@ <#case "C"> <#case "U"> <#case "D"> - <#stop "no generic FTL file available yet for Owners"> + <#stop> <#break> diff --git a/RFXtoRP_HsaDesPatch.ftl b/RFXtoRP_HsaDesPatch.ftl index 202981f..49be51c 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 da1d0c2..b2f6909 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_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_HsaLstCarSta.ftl b/RFXtoRP_HsaLstCarSta.ftl index c831d81..a8aa244 100644 --- a/RFXtoRP_HsaLstCarSta.ftl +++ b/RFXtoRP_HsaLstCarSta.ftl @@ -1,5 +1,5 @@ <#-- **** input parameters ***** --> -<#-- input : message HARDIS WMS --> +<#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> <#include "ActorPrefix.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_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_HsrLoadInfo.ftl b/RFXtoRP_HsrLoadInfo.ftl index 1e7ac8c..0187443 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..bef2979 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..a723ebb 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_PlatformLogCreate.ftl b/RFXtoRP_PlatformLogCreate.ftl index b9216e0..3df3935 100644 --- a/RFXtoRP_PlatformLogCreate.ftl +++ b/RFXtoRP_PlatformLogCreate.ftl @@ -23,16 +23,16 @@ }, "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}", diff --git a/VERSION b/VERSION index 68f6387..5ccaed1 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.60+4 +1.2.60+5