SCPN1-8696

This commit is contained in:
Laurie MONTANT 2025-04-28 13:31:39 +02:00
parent c7bce6018b
commit ffad895309
2 changed files with 40 additions and 22 deletions

View File

@ -61,6 +61,14 @@
<#assign receipt = JsonUtil.jsonToMap(dataRfx)> <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
[ [
<#if receipt.receipt_reference?? && receipt.receipt_reference!=""> <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
<#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1=0 && receipt.confirmation_total_level_2=0 && receipt.confirmation_total_level_3=0>
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl">
}
<#else>
<#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true"> <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true">
{ {
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
@ -68,6 +76,14 @@
"datas" : "datas" :
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
} }
<#else>
<#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1=0 && receipt.confirmation_total_level_2=0 && receipt.confirmation_total_level_3=0>
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
}
<#else> <#else>
<#if receipt.receipt_confirmed == "true" > <#if receipt.receipt_confirmed == "true" >
{ {
@ -91,6 +107,8 @@
} }
</#if> </#if>
</#if> </#if>
</#if>
</#if>
<#else> <#else>
<#stop "Receipt reference is empty"> <#stop "Receipt reference is empty">
</#if> </#if>

View File

@ -8,7 +8,7 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
"RefID": "${receipt.receipt_reference?trim?json_string}", "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
"RefDate": { "RefDate": {
"DateTime": "${receipt_status_datetime}", "DateTime": "${receipt_status_datetime}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"