SCPN1-10882

This commit is contained in:
2026-06-11 15:40:52 +02:00
parent bf214b7a55
commit 40b4a1672e

View File

@@ -36,29 +36,9 @@
</#switch> </#switch>
<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl"> <#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
<#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? && <#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0]?? &&
appointment.Unloading.Projects[0].Commissions[0]?? && appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!="" appointment.Unloading.Projects[0].Commissions??>
&& appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID == "" >
"anticipated_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.OrderID?? && l.OrderID !="") as commission>
<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
{
"activity": "${custom.value.activity_code?json_string}",
"originator_code": "${custom.value.originator_code?json_string}",
"anticipated_receipt_reference": "${custom.value.anticipated_receipt_reference?json_string}",
"anticipated_receipt_year": "${custom.value.anticipated_receipt_year?json_string}",
"anticipated_receipt_number": "${custom.value.anticipated_receipt_number?json_string}"
}
<#sep>,</#sep>
</#list>
<#sep>,</#sep>
</#list>
],
<#else>
<#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? &&
appointment.Unloading.Projects[0].Commissions?? &&
appointment.Unloading.Projects[0].Commissions[0]?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!="" >
"physical_receipt_list": [ "physical_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission> <#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom> <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
@@ -74,10 +54,24 @@
<#sep>,</#sep> <#sep>,</#sep>
</#list> </#list>
], ],
"anticipated_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
{
"activity": "${custom.value.activity_code?json_string}",
"originator_code": "${custom.value.originator_code?json_string}",
"anticipated_receipt_reference": "${custom.value.anticipated_receipt_reference?json_string}",
"anticipated_receipt_year": "${custom.value.anticipated_receipt_year?json_string}",
"anticipated_receipt_number": "${custom.value.anticipated_receipt_number?json_string}"
}
<#sep>,</#sep>
</#list>
<#sep>,</#sep>
</#list>
],
<#else> <#else>
"appointment_designation":"${(appointment.Reason!"")!?json_string}", "appointment_designation":"${(appointment.Reason!"")!?json_string}",
</#if> </#if>
</#if>
<#else> <#else>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
"appointment_designation":"${(appointment.Reason!"")?json_string}", "appointment_designation":"${(appointment.Reason!"")?json_string}",