This commit is contained in:
Laurie MONTANT 2026-01-06 16:29:08 +01:00
parent e7c3154c56
commit b1c46cd0f1
5 changed files with 67 additions and 76 deletions

View File

@ -43,23 +43,22 @@
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
} }
</#if> </#if>
<#else> </#if>
<#if eventRP.removedCommissions?? && eventRP.removedCommissions!=""> <#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
<#if eventRP.appointmentCustomFields?has_content> <#if eventRP.appointmentCustomFields?has_content>
{ {
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number> <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number>
"apiRestReflexID" : "${apiRestReflexID}", "apiRestReflexID" : "${apiRestReflexID}",
"datas" : "datas" :
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl"> <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl">
} }
<#else> <#else>
{ {
<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref> <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref>
"apiRestReflexID" : "${apiRestReflexID}", "apiRestReflexID" : "${apiRestReflexID}",
"datas" : "datas" :
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl"> <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
} }
</#if>
</#if> </#if>
</#if> </#if>
<#else> <#else>

View File

@ -9,20 +9,18 @@
}, },
"payload" : "payload" :
{ {
<#assign executionflowCustomFields = eventRP.executionflowCustomFields > <#assign executionflowCustomFields = eventRP.executionflowCustomFields >
"physical_receipt_list": [ "physical_receipt_list": [
<#list addedCommissions as addedCommission> <#list eventRP.addedCommissions as addedCommission>
{
{ "receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}", "originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}", "physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}", "receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}", "receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}" }
} <#sep>,</#sep>
<#sep>,</#sep> </#list>
</#list> ]
]
</#if>
} }
} }

View File

@ -8,16 +8,18 @@
}, },
"payload" : "payload" :
{ {
<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
"physical_receipt_list": [
<#list eventRP.addedCommissions as addedCommission> <#list eventRP.addedCommissions as addedCommission>
<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as CustomFields> {
"physical_receipt_list": [ "receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
{ "originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
"receipt_activity": "${commission.value.activity_code?json_string}", "physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
"originator_code": "${commission.value.originator_code?json_string}", "receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
"physical_receipt_reference": "${commission.value.reference?json_string}", "receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
"receipt_year": "${commission.value.order_year?json_string}", }
"receipt_number": "${commission.value.order_number?json_string}" <#sep>,</#sep>
} </#list>
] ]
} }
} }

View File

@ -9,22 +9,18 @@
}, },
"payload" : "payload" :
{ {
<#if appointment.Commissions??> <#assign executionflowCustomFields = eventRP.executionflowCustomFields >
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [
"physical_receipt_list": [ <#list eventRP.removedCommissions as removedCommission>
{ {
"receipt_activity": "${commission.value.activity_code?json_string}", "receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
"originator_code": "${commission.value.originator_code?json_string}", "originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
"physical_receipt_reference": "${commission.value.reference?json_string}", "physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
"receipt_year": "${commission.value.order_year?json_string}", "receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
"receipt_number": "${commission.value.order_number?json_string}" "receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
} }
] <#sep>,</#sep>
<#else> </#list>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> ]
"appointment_designation":"${appointment.Reason!""?json_string}"
</#if>
</#if>
</#if>
} }
} }

View File

@ -8,22 +8,18 @@
}, },
"payload" : "payload" :
{ {
<#if appointment.Commissions??> <#assign executionflowCustomFields = eventRP.executionflowCustomFields >
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING"> "physical_receipt_list": [
"physical_receipt_list": [ <#list eventRP.removedCommissions as removedCommission>
{ {
"receipt_activity": "${commission.value.activity_code?json_string}", "receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
"originator_code": "${commission.value.originator_code?json_string}", "originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
"physical_receipt_reference": "${commission.value.reference?json_string}", "physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
"receipt_year": "${commission.value.order_year?json_string}", "receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
"receipt_number": "${commission.value.order_number?json_string}" "receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
} }
] <#sep>,</#sep>
<#else> </#list>
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING"> ]
"appointment_designation":"${appointment.Reason!""?json_string}"
</#if>
</#if>
</#if>
} }
} }