SCPN1-8870

This commit is contained in:
Laurie MONTANT 2025-06-16 10:52:41 +02:00
parent 5581b8cd29
commit 8229616050
3 changed files with 15 additions and 11 deletions

View File

@ -17,7 +17,6 @@
<#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
[ [
<#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
<#-- check preparation type code (internal order and reservation are ignored) --> <#-- check preparation type code (internal order and reservation are ignored) -->
<#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030"> <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
<#-- Only if preparation order not confirmed --> <#-- Only if preparation order not confirmed -->
@ -37,9 +36,6 @@
<#-- preparation order type not supported --> <#-- preparation order type not supported -->
<#stop> <#stop>
</#if> </#if>
<#else>
<#stop "PRO reference is empty">
</#if>
] ]
<#break> <#break>
@ -48,16 +44,12 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign preparation_order = JsonUtil.jsonToMap(dataRfx)> <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
[ [
<#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
{ {
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled> <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
"apiReflexPlatformID" : "${apiReflexPlatformID}", "apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" : "datas" :
<#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl"> <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
} }
<#else>
<#stop "PRO reference is empty">
</#if>
] ]
<#break> <#break>

View File

@ -7,7 +7,11 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
"RefID": "${preparation_order.originator_reference?trim?json_string}", <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
"RefID": "${preparation_order.originator_reference?trim?json_string}",
<#else>
"RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
</#if>
"RefDate": { "RefDate": {
"DateTime": "${preparation_status_datetime}", "DateTime": "${preparation_status_datetime}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"

View File

@ -9,7 +9,11 @@
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
}, },
"ID": { "ID": {
"RefID": "${preparation_order.originator_reference?trim?json_string}", <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
"RefID": "${preparation_order.originator_reference?trim?json_string}",
<#else>
"RefID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
</#if>
"RefDate": { "RefDate": {
"DateTime": "${pro_creation_datetime}", "DateTime": "${pro_creation_datetime}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
@ -78,7 +82,11 @@
} }
</#if> </#if>
}, },
<#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
"OrderID": "${preparation_order.originator_reference?trim?json_string}",
<#else>
"OrderID": "${preparation_order.physical_depot_code}${preparation_order.activity_code}${preparation_order.originator_code}${preparation_order.preparation_order_year}${preparation_order.preparation_order_number}",
</#if>
<#if preparation_order.line_list??> <#if preparation_order.line_list??>
"Lines" : [ "Lines" : [
<#list preparation_order.line_list as preparation_order_line > <#list preparation_order.line_list as preparation_order_line >