Compare commits

..

9 Commits

Author SHA1 Message Date
5e3633aaa1 Release 1.2.60+6 2026-05-12 17:47:46 +02:00
abe628a3b0 Merge branch 'release1.2-fix4-v13' into 'release/1.2'
Fix4 v13

See merge request r-d-technique/tiers/reflex-wms-connector!282
2026-05-12 15:45:03 +00:00
779b4d0596 Fix4 v13 2026-05-12 17:38:32 +02:00
ff7a38fc1f Release 1.2.60+5 2026-05-12 14:52:30 +02:00
49365d0879 Merge branch 'release1.2-fix4-v13' into 'release/1.2'
release1.2-fix4-v13 into release/1.2

See merge request r-d-technique/tiers/reflex-wms-connector!278
2026-05-12 12:48:16 +00:00
77ef62f002 Fix4 v13 2026-05-12 14:27:55 +02:00
7942a0dfc0 Release 1.2.60+4 2026-04-28 10:17:47 +02:00
16a6ad77c1 Merge branch 'release-1.2-SCPN1-10682' into 'release/1.2'
release-1.2-SCPN1-10682

See merge request r-d-technique/tiers/reflex-wms-connector!275
2026-04-28 08:12:57 +00:00
8d87e02969 SCPN1-10682
(cherry picked from commit 51fdb6d38250095825f9d31d1cfc9d52e3e4bb1a)
2026-04-28 09:53:57 +02:00
15 changed files with 39 additions and 32 deletions

View File

@@ -37,7 +37,11 @@
<#if uniqueness> <#if uniqueness>
<#local depot = actor> <#local depot = actor>
<#else> <#else>
<#if actor?length gt 4>
<#local depot = actor[4..]> <#local depot = actor[4..]>
<#else>
<#local depot = actor>
</#if>
</#if> </#if>
<#return (depot)> <#return (depot)>
</#function> </#function>
@@ -78,7 +82,11 @@
<#if uniqueness> <#if uniqueness>
<#local supplier = actor> <#local supplier = actor>
<#else> <#else>
<#if actor?length gt 4>
<#local supplier = actor[4..]> <#local supplier = actor[4..]>
<#else>
<#local supplier = actor>
</#if>
</#if> </#if>
<#return (supplier)> <#return (supplier)>
</#function> </#function>
@@ -117,7 +125,11 @@
<#if uniqueness> <#if uniqueness>
<#local carrier = actor> <#local carrier = actor>
<#else> <#else>
<#if actor?length gt 4>
<#local carrier = actor[4..]> <#local carrier = actor[4..]>
<#else>
<#local carrier = actor>
</#if>
</#if> </#if>
<#return (carrier)> <#return (carrier)>
</#function> </#function>
@@ -156,7 +168,11 @@
<#if uniqueness> <#if uniqueness>
<#local consignee = actor> <#local consignee = actor>
<#else> <#else>
<#if actor?length gt 4>
<#local consignee = actor[4..]> <#local consignee = actor[4..]>
<#else>
<#local consignee = actor>
</#if>
</#if> </#if>
<#return (consignee)> <#return (consignee)>
</#function> </#function>

View File

@@ -9,7 +9,7 @@
<#case "C"> <#case "C">
<#case "U"> <#case "U">
<#case "D"> <#case "D">
<#stop "no generic FTL file available yet for Grades"> <#stop>
<#break> <#break>

View File

@@ -9,9 +9,7 @@
<#case "C"> <#case "C">
<#case "U"> <#case "U">
<#case "D"> <#case "D">
<#stop>
<#stop "no generic FTL file available yet for LV types">
<#break> <#break>

View File

@@ -9,7 +9,7 @@
<#case "C"> <#case "C">
<#case "U"> <#case "U">
<#case "D"> <#case "D">
<#stop "no generic FTL file available yet for Owners"> <#stop>
<#break> <#break>

View File

@@ -16,7 +16,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign desPatch = JsonUtil.jsonToMap(dataRfx)> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for desPatch"> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
@@ -24,7 +24,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign desPatch = JsonUtil.jsonToMap(dataRfx)> <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for desPatch"> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >

View File

@@ -16,7 +16,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign despNt = JsonUtil.jsonToMap(dataRfx)> <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for despNt"> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
@@ -24,7 +24,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign despNt = JsonUtil.jsonToMap(dataRfx)> <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for despNt"> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >

View File

@@ -60,7 +60,7 @@
</#if> </#if>
"ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}", "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
<#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0> <#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}",
</#if> </#if>
"Quantity": "Quantity":

View File

@@ -1,5 +1,5 @@
<#-- **** input parameters ***** --> <#-- **** input parameters ***** -->
<#-- input : message HARDIS WMS --> <#-- input : message RFX -->
<#-- project : projectId in ReflexPlatform --> <#-- project : projectId in ReflexPlatform -->
<#-- organisation : organisationtId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform -->
<#include "ActorPrefix.ftl"> <#include "ActorPrefix.ftl">

View File

@@ -1,5 +1,6 @@
[ [
<#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) /> <#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": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
@@ -19,7 +20,7 @@
</#if> </#if>
</#if> </#if>
"RefDate": { "RefDate": {
"DateTime": "${ref_datetime}", "DateTime": "${ref_datetime2}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
} }
}, },

View File

@@ -1,6 +1,6 @@
[ [
<#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) /> <#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": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"

View File

@@ -17,22 +17,14 @@
<#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign depot = JsonUtil.jsonToMap(dataRfx)> <#assign depot = JsonUtil.jsonToMap(dataRfx)>
[ <#stop>
{
}
]
<#break> <#break>
<#case "D"> <#case "D">
<#-- *********************************************** Action = DELETE *************************** --> <#-- *********************************************** Action = DELETE *************************** -->
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign depot = JsonUtil.jsonToMap(dataRfx)> <#assign depot = JsonUtil.jsonToMap(dataRfx)>
[ <#stop>
{
}
]
<#break> <#break>
<#default> <#default>

View File

@@ -16,7 +16,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign packBranch = JsonUtil.jsonToMap(dataRfx)> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for Pack Branch"> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
@@ -24,7 +24,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign packBranch = JsonUtil.jsonToMap(dataRfx)> <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for Pack Branch"> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >

View File

@@ -16,7 +16,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign packOrder = JsonUtil.jsonToMap(dataRfx)> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for Pack Order"> <#stop>
<#break> <#break>
<#case "D"> <#case "D">
@@ -24,7 +24,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign packOrder = JsonUtil.jsonToMap(dataRfx)> <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
<#stop "no generic FTL file available yet for Pack Order"> <#stop>
<#break> <#break>
<#default> <#default>
<#stop > <#stop >

View File

@@ -23,16 +23,16 @@
}, },
"TechMessage": { "TechMessage": {
"Code": "${restResponsetMsg.status!"no Code"}", "Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody} "Label": ${strJsonBody?truncate(32000,'...')}
}, },
"UserMessage": { "UserMessage": {
"Code": "${restResponsetMsg.status!"no Code"}", "Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody}, "Label": ${strJsonBody?truncate(32000,'...')},
"Params": [] "Params": []
}, },
"DetailElements": [], "DetailElements": [],
"CorrelationID": "${id.correlationid!"no Correlationid"}", "CorrelationID": "${id.correlationid!"no Correlationid"}",
"ContextPayload": ${strJsonBody}, "ContextPayload": ${strJsonBody?truncate(32000,'...')},
"Type": "${event}", "Type": "${event}",
"Task": "${id.apiRestReflexID!"no Task"}", "Task": "${id.apiRestReflexID!"no Task"}",
"OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",

View File

@@ -1 +1 @@
1.2.60+3 1.2.60+6