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..89aa492 100644 --- a/RPtoRFX_CarrierAppointmentCreated.ftl +++ b/RPtoRFX_CarrierAppointmentCreated.ftl @@ -37,10 +37,14 @@ <#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??> - "physical_receipt_list": [ - <#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission> + appointment.Unloading.Projects[0]?? && + appointment.Unloading.Projects[0].Commissions?? > + <#if (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> { "receipt_activity": "${custom.value.activity_code?json_string}", @@ -53,9 +57,9 @@ <#sep>, - ], - "anticipated_receipt_list": [ - <#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission> + ], + "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}", @@ -69,9 +73,8 @@ <#sep>, - ], - <#else> - "appointment_designation":"${(appointment.Reason!"")!?json_string}", + ], + <#else> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>