From f99dce48687f99888174a8e14f426af033a675d9 Mon Sep 17 00:00:00 2001
From: Laurie Montant <laurie.montant@hardis-group.com>
Date: Thu, 11 Jun 2026 11:47:42 +0200
Subject: [PATCH] SCPN1-10893

---
 RPtoRFX_CarrierAppointmentCreated.ftl | 55 ++++++++++++++++++---------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl
index a81a0e9..de38ddc 100644
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -38,24 +38,45 @@
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
 			<#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": [
-				<#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>
-					{
-						"receipt_activity": "${custom.value.activity_code?json_string}",
-						"originator_code": "${custom.value.originator_code?json_string}",
-						"physical_receipt_reference": "${custom.value.reference?json_string}",
-						"receipt_year": "${custom.value.order_year?json_string}",
-						"receipt_number": "${custom.value.order_number?json_string}"
-					}
-					<#sep>,</#sep>
-					</#list>
-					<#sep>,</#sep>
-					</#list>
-				],
+				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[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID=="" >
+				 "anticipated_receipt_list": [
+					<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.OrderID?? && l.OrderID !="" && l.ExecutionflowID?? && l.ExecutionflowID=="") as commission>
+						<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
+						{
+							"receipt_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>
-				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+				<#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": [
+					<#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>
+						{
+							"receipt_activity": "${custom.value.activity_code?json_string}",
+							"originator_code": "${custom.value.originator_code?json_string}",
+							"physical_receipt_reference": "${custom.value.reference?json_string}",
+							"receipt_year": "${custom.value.order_year?json_string}",
+							"receipt_number": "${custom.value.order_number?json_string}"
+						}
+						<#sep>,</#sep>
+						</#list>
+						<#sep>,</#sep>
+						</#list>
+					],
+				<#else>
+					"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+				</#if>
 			</#if>
 		<#else>
 			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>