diff --git a/RPtoRFX_CarrierAppointmentCreated.ftl b/RPtoRFX_CarrierAppointmentCreated.ftl index 97dcd3d..dc0f5c3 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -37,10 +37,11 @@ <#include "RPtoRFX_CarrierAppointmentDefaultData.ftl"> <#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].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]?? && + appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID != "" + && appointment.Unloading.Projects[0].Commissions[0].OrderID!= ""> + "appointment_designation":"${(appointment.Reason!"")!?json_string}", + <#else> "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> @@ -72,8 +73,6 @@ <#sep>, ], - <#else> - "appointment_designation":"${(appointment.Reason!"")!?json_string}", <#else> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>