Merge branch 'SCPN1-8340' into 'release/2.0'

Resolve SCPN1-8340

See merge request r-d-technique/tiers/tdi-connector!10
This commit is contained in:
Francis REAT 2025-02-18 08:59:07 +00:00
commit dddee7e7b7

View File

@ -6,6 +6,10 @@
<#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)> <#assign tdiEvent = JsonUtil.jsonToMap(tdiEvent64b)>
<#assign senderTag = tdiEventMsg.senderTag> <#assign senderTag = tdiEventMsg.senderTag>
<#-- Target = 0 : Expedition , Target = 1 : Colis -->
<#if tdiEvent.Target == 0 >
<#stop >
<#else>
{"Header": {"Header":
{ {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
@ -20,29 +24,31 @@
{"Date": {"DateTime": "${tdiEvent.EventDate}", {"Date": {"DateTime": "${tdiEvent.EventDate}",
"AuthorTimeZone": "UTC" "AuthorTimeZone": "UTC"
}, },
<#if tdiEvent.EventCode == "OK-COLLECTED" ||
tdiEvent.EventCode == "OK-EDI" ||
tdiEvent.EventCode == "ADM" ||
tdiEvent.EventCode == "RGP" >
"Code": "TRACKING_EVENT_IFTSTA_349", <#-- Handled by carrier -->
<#else>
<#if tdiEvent.EventCode?starts_with("TA") >
"Code": "TRACKING_EVENT_IFTSTA_56", <#-- Incomplete delivery -->
<#else>
<#if tdiEvent.EventCode?starts_with("T-") == true || <#if tdiEvent.EventCode?starts_with("T-") == true ||
tdiEvent.EventCode == "OK-COLLECTED" || tdiEvent.EventCode?starts_with("TD") == true ||
tdiEvent.EventCode == "OK-IN-TRANST" ||
tdiEvent.EventCode == "OK-OUT-FOR-D" || tdiEvent.EventCode == "OK-OUT-FOR-D" ||
tdiEvent.EventCode == "OK-WITHDRAWA" || tdiEvent.EventCode == "OK-IN-TRANST" >
tdiEvent.EventCode == "OK-EDI" > "Code": "TRACKING_EVENT_IFTSTA_113",<#-- Delivery in progress -->
"Code": "TRACKING_EVENT_IFTSTA_13", <#-- Acheminement conforme -->
<#else> <#else>
<#if tdiEvent.EventCode?starts_with("D-") == true || <#if tdiEvent.EventCode?starts_with("D-") == true ||
tdiEvent.EventCode == "OK-DELIVERED" > tdiEvent.EventCode == "OK-DELIVERED" ||
"Code": "TRACKING_EVENT_IFTSTA_21", <#-- Livraison conforme --> tdiEvent.EventCode == "OK-WITHDRAWA" >
"Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed -->
<#else> <#else>
<#if tdiEvent.EventCode?starts_with("DC") == true || <#if tdiEvent.EventCode?starts_with("DC") == true ||
tdiEvent.EventCode?starts_with("DN") == true || tdiEvent.EventCode?starts_with("DN") == true ||
tdiEvent.EventCode?starts_with("DR") == true > tdiEvent.EventCode?starts_with("DR") == true ||
"Code": "TRACKING_EVENT_IFTSTA_56",<#-- Livraison non aboutiee --> tdiEvent.EventCode == "NEX" >
<#else> "Code": "TRACKING_EVENT_IFTSTA_14",<#-- Delivery completed -->
<#if tdiEvent.EventCode?starts_with("TD") == true ||
tdiEvent.EventCode?starts_with("TA") == true >
"Code": "TRACKING_EVENT_IFTSTA_53",<#-- Acheminement non réalisé -->
<#else>
<#if tdiEvent.EventCode == "OK-IN-TRANST" >
"Code": "TRACKING_EVENT_IFTSTA_5",<#-- Acheminement en cours -->
<#else> <#else>
"Code": "TRACKING_EVENT_UNKNOWN", "Code": "TRACKING_EVENT_UNKNOWN",
</#if> </#if>
@ -56,3 +62,4 @@
] ]
} }
} }
</#if>