SCPN1-11090

(cherry picked from commit 72bf165112481625c9164f153e5368da710375f2)

Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>
This commit is contained in:
2026-07-29 12:20:59 +00:00
parent ff617683e7
commit 3f8ee07798

View File

@@ -38,15 +38,15 @@
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
<#if appointment.Unloading?? && appointment.Unloading.Projects?? && <#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
appointment.Unloading.Projects[0]?? && appointment.Unloading.Projects[0]?? &&
appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0].Commissions?? >
appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && <#if appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? &&
appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID == ""&& appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID == ""&&
appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID?? &&
appointment.Unloading.Projects[0].Commissions[0].OrderID == ""> appointment.Unloading.Projects[0].Commissions[0].OrderID == "">
"appointment_designation":"${(appointment.Reason!"")!?json_string}", "appointment_designation":"${(appointment.Reason!"")!?json_string}",
<#else> <#else>
"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>
{ {
"receipt_activity": "${custom.value.activity_code?json_string}", "receipt_activity": "${custom.value.activity_code?json_string}",
@@ -59,9 +59,9 @@
</#list> </#list>
<#sep>,</#sep> <#sep>,</#sep>
</#list> </#list>
], ],
"anticipated_receipt_list": [ "anticipated_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission> <#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> <#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}", "activity": "${custom.value.activity_code?json_string}",
@@ -75,7 +75,8 @@
</#list> </#list>
<#sep>,</#sep> <#sep>,</#sep>
</#list> </#list>
], ],
</#if>
</#if> </#if>
<#else> <#else>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>