From d358b41bf0209bd8efbbd3907e684fb6758f2611 Mon Sep 17 00:00:00 2001 From: Laurie CELLIER Date: Wed, 29 Jul 2026 12:20:03 +0000 Subject: [PATCH] SCPN1-11090 (cherry picked from commit fb17a8e1172803a8de6c7c07a3b0689720f8398e) Co-authored-by: Laurie Montant --- RFXtoRP_RestResponse.ftl | 2 +- RPtoRFX_CarrierAppointmentCreated.ftl | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/RFXtoRP_RestResponse.ftl b/RFXtoRP_RestResponse.ftl index 5c24aaa..4f87a5e 100644 --- a/RFXtoRP_RestResponse.ftl +++ b/RFXtoRP_RestResponse.ftl @@ -358,7 +358,7 @@ ] <#break> - <#-- *********************************************** ApiRestID = canceled ******************** --> + <#-- *********************************************** ApiRestID = status ******************** --> <#case "status_appointment_put_update_by_ref"> <#case "status_appointment_put_update_by_number"> <#switch restResponsetMsg.status!no_status> diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index b1a4c5c..3376ce0 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -38,7 +38,9 @@ <#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?? && + 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!= ""> "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>