Merge branch 'SCPN1-8601' into 'release/2.0'
correction pour la v9 et v10 connecteur TDI See merge request r-d-technique/tiers/tdi-connector!13
This commit is contained in:
commit
9dfe72ee02
@ -7,7 +7,7 @@
|
|||||||
<#assign senderTag = tdiEventMsg.senderTag>
|
<#assign senderTag = tdiEventMsg.senderTag>
|
||||||
|
|
||||||
<#-- Target = 0 : Expedition , Target = 1 : Colis -->
|
<#-- Target = 0 : Expedition , Target = 1 : Colis -->
|
||||||
<#if tdiEvent.Target == 0 >
|
<#if tdiEvent.Target == 0 || (tdiEvent.Target == 1 && tdiEvent.ParcelNumber?? && tdiEvent.ParcelNumber == "")>
|
||||||
<#stop >
|
<#stop >
|
||||||
<#else>
|
<#else>
|
||||||
{"Header":
|
{"Header":
|
||||||
@ -16,7 +16,7 @@
|
|||||||
},
|
},
|
||||||
"ID":
|
"ID":
|
||||||
{
|
{
|
||||||
"RefID": "${tdiEvent.ParcelNumber!tdiEvent.HUReference1}"
|
"RefID": "${tdiEvent.ParcelNumber}"
|
||||||
},
|
},
|
||||||
"Payload":
|
"Payload":
|
||||||
{"Events": [
|
{"Events": [
|
||||||
@ -47,7 +47,6 @@
|
|||||||
tdiEvent.EventCode == "POD" ||
|
tdiEvent.EventCode == "POD" ||
|
||||||
tdiEvent.EventCode == "FAC" ||
|
tdiEvent.EventCode == "FAC" ||
|
||||||
tdiEvent.EventCode == "OK-WITHDRAWA" >
|
tdiEvent.EventCode == "OK-WITHDRAWA" >
|
||||||
|
|
||||||
"Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed -->
|
"Code": "TRACKING_EVENT_IFTSTA_21",<#-- Process Completed -->
|
||||||
<#else>
|
<#else>
|
||||||
<#if tdiEvent.EventCode?starts_with("DC") == true ||
|
<#if tdiEvent.EventCode?starts_with("DC") == true ||
|
||||||
@ -70,5 +69,4 @@
|
|||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</#if>
|
</#if>
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user