diff --git a/RFXtoRP_HsrCarrierApt.ftl b/RFXtoRP_HsrCarrierApt.ftl index 2276a6c..8060999 100644 --- a/RFXtoRP_HsrCarrierApt.ftl +++ b/RFXtoRP_HsrCarrierApt.ftl @@ -36,35 +36,7 @@ <#break> <#case "U"> <#-- *********************************************** Action = Update ********************--> - <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> - <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - <#assign ID = "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}" /> - <#else> - <#assign ID = "${carrier_apt.year_number}-${carrier_apt.appointment_number}" /> - - <#else> - <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> - <#assign ID = "${carrier_apt.appointment_reference?json_string}" /> - <#else> - <#assign ID = "${carrier_apt.year_number}-${carrier_apt.appointment_number}" /> - - - <#assign payload = '{"Header": {"ProjectID": "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"},"IDs": [{"RefID": "${ID}"}],"Options": {"Only": ["ID.RefID","Payload.WMSCreated"]}}'/> - <#assign queryApiReflexPlatformID = QueryApiReflexPlatformID.AppointmentGetByIds> - <#assign response = QueryApiReflexPlatformCall.call(queryApiReflexPlatformID,payload) /> - <#assign appointmentRP = JsonUtil.jsonToMap(response)> - - <#if !appointmentRP?? || !appointmentRP.Objects?? || !appointmentRP.Objects[0]?? || !appointmentRP.Objects[0].ID.RefID?? || !appointmentRP.Objects[0].Payload?? || !appointmentRP.Objects[0].Payload.WMSCreated?? || !appointmentRP.Objects[0].Payload.WMSCreated> - [ - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.BookingForceBookAppointment> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl"> - } - ] - <#else> - [ + [ { <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated> "apiReflexPlatformID" : "${apiReflexPlatformID}", @@ -159,7 +131,6 @@ ] - <#break> <#case "D"> <#-- *********************************************** Action = Delete ******************** --> diff --git a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl index a36034c..5c64918 100644 --- a/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl +++ b/RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl @@ -61,8 +61,12 @@ <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_unloading_end_datetime?datetime.iso) /> - <#if (duration <= 0)> + <#if (duration < 0)> <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" > + <#else> + <#if (duration == 0)> + <#assign duration = 1 /> + <#else> <#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" > @@ -71,8 +75,12 @@ <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_LOADING> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_load_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> - <#if (duration <= 0)> - <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" > + <#if (duration < 0)> + <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> + <#if (duration == 0)> + <#assign duration = 1 /> + <#else> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> @@ -81,8 +89,12 @@ <#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNLOADING> <#assign duration = DurationBetweenTwoDatetimeInSeconds(carrier_apt.planned_unloading_start_datetime?datetime.iso,carrier_apt.planned_load_end_datetime?datetime.iso) /> - <#if (duration <= 0)> + <#if (duration < 0)> <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > + <#else> + <#if (duration == 0)> + <#assign duration = 1 /> + <#else> <#stop "Appointment type not supported" > diff --git a/VERSION b/VERSION index 21005a3..e6fb6be 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.60+2 +1.2.60+3