From 71e4b030f7ed8b8478d6c5e30d18e7eef4f601a2 Mon Sep 17 00:00:00 2001 From: Francis Reat Date: Tue, 31 Mar 2026 08:53:18 +0200 Subject: [PATCH] Merge branch 'develop' into develop-1.2 # Conflicts: # README.md # RFXtoRP_HfDtlStockLs.ftl # RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl # RFXtoRP_HliPrepaL.ftl # RFXtoRP_HliReceiptLr.ftl # RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl # RFXtoRP_HlrProL.ftl # RFXtoRP_HlrProL_ExecutionflowLinesAdded.ftl # RFXtoRP_HsaCarrier.ftl # RFXtoRP_HsaCarrier_ActorCreated.ftl # RFXtoRP_HsaCons.ftl # RFXtoRP_HsaCons_ActorCreated.ftl # RFXtoRP_HsaDesPatch.ftl # RFXtoRP_HsaDespNt.ftl # RFXtoRP_HsaDispute.ftl # RFXtoRP_HsaDispute_Created.ftl # RFXtoRP_HsaIpgMove_GoodsReceived.ftl # RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl # RFXtoRP_HsaLstCarSta.ftl # RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl # RFXtoRP_HsaProStatus.ftl # RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl # RFXtoRP_HsaProStatus_PreparationCompleted.ftl # RFXtoRP_HsaProStatus_PreparationExpected.ftl # RFXtoRP_HsaProStatus_PreparationStarted.ftl # RFXtoRP_HsaProStatus_TransportStarted.ftl # RFXtoRP_HsaSup_ActorCreated.ftl # RFXtoRP_HsrCarrierApt.ftl # RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl # RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl # RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.ftl # RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl # RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl # RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl # RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl # RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl # RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl # RFXtoRP_HsrDepot_ActorCreated.ftl # RFXtoRP_HsrLoadInfo.ftl # RFXtoRP_HsrPrepa.ftl # RFXtoRP_HsrPrepa_CarrierUpdated.ftl # RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl # RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl # RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl # RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl # RFXtoRP_HsrPro.ftl # RFXtoRP_HsrPro_ExecutionflowDetected.ftl # RFXtoRP_HsrPro_ExecutionflowDetected_HeaderMetadata.ftl # RFXtoRP_HsrReceiptList.ftl # RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl # RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl # RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl # RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl # RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl # RFXtoRP_HsrReceiptList_ReceiptExpected.ftl # RFXtoRP_RestResponse.ftl # RPtoRFX_AppointmentEvent.ftl # RPtoRFX_CarrierAppointmentCreated.ftl # RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl # RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl # RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl # RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl # RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl # RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl # RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl # RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl # RPtoRFX_ExecutionflowEvent.ftl # RPtoRFX_PrepOrder_HeaderMetadata.ftl # RPtoRFX_PrepOrder_LineMetadata.ftl # RPtoRFX_Receipt.ftl # RPtoRFX_Receipt_HeaderMetadata.ftl # RPtoRFX_Receipt_LineMetadata.ftl # RPtoRFX_Receipt_OptionalAttributes.ftl # ReflexUtils.ftl --- RPtoRFX_AppointmentEvent.ftl | 57 ++++++++++++++++++++++++++++++++++-- 1 file changed, 55 insertions(+), 2 deletions(-) diff --git a/RPtoRFX_AppointmentEvent.ftl b/RPtoRFX_AppointmentEvent.ftl index 57a0906..9febf0b 100644 --- a/RPtoRFX_AppointmentEvent.ftl +++ b/RPtoRFX_AppointmentEvent.ftl @@ -28,8 +28,61 @@ <#assign AddComma = false /> <#assign appointment = eventRP.data /> [ - <#if eventRP.commissionsUpdated> - <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions !=""> + <#if appointment?? && (!(appointment.WMSCreated??) || !appointment.WMSCreated) && appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_create> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentCreated.ftl"> + } + <#else> + <#if eventRP.commissionsUpdated> + <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.addedUnloadCommissions?? && eventRP.addedUnloadCommissions != ""> + <#if eventRP.appointmentCustomFields?has_content> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl"> + } + <#else> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl"> + } + + <#assign AddComma = true /> + + <#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING" && eventRP.removedUnloadCommissions?? && eventRP.removedUnloadCommissions!=""> + <#if AddComma == true> + , + + + <#if eventRP.appointmentCustomFields?has_content> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl"> + } + <#else> + { + <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref> + "apiRestReflexID" : "${apiRestReflexID}", + "datas" : + <#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl"> + } + + <#assign AddComma = true /> + + + <#-- *********************************************** Action = reasonUpdated or slotUpdated ******************** --> + <#if eventRP.reasonUpdated || eventRP.slotUpdated || eventRP.carrierInformationUpdated> + <#if AddComma == true> + , + <#if eventRP.appointmentCustomFields?has_content> { <#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>