This commit is contained in:
Laurie MONTANT 2025-12-22 16:23:47 +01:00
parent a3fc98c8d9
commit 369a8b7e10
3 changed files with 12 additions and 17 deletions

View File

@ -28,7 +28,7 @@
<#assign appointment = eventRP.data /> <#assign appointment = eventRP.data />
[ [
<#if eventRP.appointmentCustomFields?has_content> <#if eventRP.appointmentCustomFields?has_content>
<#list eventRP.executionflowCustomFields as commission> <#list eventRP.executionflowCustomFields.entrySet()(l ->l.value?? && l.value?has_content) as commission>
{ {
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
"apiRestReflexID" : "${apiRestReflexID}", "apiRestReflexID" : "${apiRestReflexID}",
@ -42,6 +42,7 @@
"datas" : "datas" :
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
} }
<#sep>,</#sep>
</#list> </#list>
</#if> </#if>
] ]

View File

@ -12,16 +12,13 @@
<#if appointment.Commissions??> <#if appointment.Commissions??>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
"physical_receipt_list": [ "physical_receipt_list": [
<#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
{ {
"receipt_activity": "${custom.value.activity_code?json_string}", "receipt_activity": "${commission.value.activity_code?json_string}",
"originator_code": "${custom.value.originator_code?json_string}", "originator_code": "${commission.value.originator_code?json_string}",
"physical_receipt_reference": "${custom.value.reference?json_string}", "physical_receipt_reference": "${commission.value.reference?json_string}",
"receipt_year": "${custom.value.order_year?json_string}", "receipt_year": "${commission.value.order_year?json_string}",
"receipt_number": "${custom.value.order_number?json_string}" "receipt_number": "${commission.value.order_number?json_string}"
} }
<#sep>,</#sep>
</#list>
] ]
<#else> <#else>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">

View File

@ -11,16 +11,13 @@
<#if appointment.Commissions??> <#if appointment.Commissions??>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
"physical_receipt_list": [ "physical_receipt_list": [
<#list commission.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
{ {
"receipt_activity": "${custom.value.activity_code?json_string}", "receipt_activity": "${commission.value.activity_code?json_string}",
"originator_code": "${custom.value.originator_code?json_string}", "originator_code": "${commission.value.originator_code?json_string}",
"physical_receipt_reference": "${custom.value.reference?json_string}", "physical_receipt_reference": "${commission.value.reference?json_string}",
"receipt_year": "${custom.value.order_year?json_string}", "receipt_year": "${commission.value.order_year?json_string}",
"receipt_number": "${custom.value.order_number?json_string}" "receipt_number": "${commission.value.order_number?json_string}"
} }
<#sep>,</#sep>
</#list>
] ]
<#else> <#else>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> <#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">