Merge branch 'release/2.0' into 'main-2.0'

release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!232
Release 2.0.18+2
2026-01-27 07:56:59 +00:00 · 2026-01-27 08:56:06 +01:00 · 2026-01-27 07:53:20 +00:00 · 2026-01-27 08:37:08 +01:00 · 2026-01-27 08:36:54 +01:00 · 2026-01-26 16:01:53 +01:00
24 changed files with 228 additions and 92 deletions
--- a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl
+++ b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl
@ -5,11 +5,19 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+            <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
                </#if>
+            </#if>
            "RefDate": {
               "DateTime": "${ref_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl
+++ b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl
@ -5,10 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+   		   <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
            </#if>
 			"RefDate": {
               "DateTime": "${ref_datetime}",
--- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl
+++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl
@ -5,10 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
            </#if>
 			"RefDate": {
               "DateTime": "${ref_datetime}",
--- a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl
+++ b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl
@ -5,10 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+   		   <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
            </#if>
 			"RefDate": {
               "DateTime": "${ref_datetime}",
--- a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl
+++ b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl
@ -5,10 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
            </#if>
 			"RefDate": {
               "DateTime": "${ref_datetime}",
--- a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl
+++ b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl
@ -5,10 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
            </#if>
 			"RefDate": {
               "DateTime": "${ref_datetime}",
--- a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl
+++ b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl
@ -5,10 +5,18 @@
            "ProjectID": "${projectRP}"
        },
        "ID": {
+   		    <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true">
+                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                    "RefID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                <#else>
+                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
+            <#else>
                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
                <#else>
                    "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
+                </#if>
            </#if>
 			"RefDate": {
               "DateTime": "${ref_datetime}",
--- a/RFXtoRP_HsrCarrierApt.ftl
+++ b/RFXtoRP_HsrCarrierApt.ftl
@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
+<#-- input        : message HARDIS-WMS  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 <#include "ActorPrefix.ftl">
@ -12,11 +12,12 @@

 <#assign aDateTime = .now>

+<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+<#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
+
 <#switch cloudEventMsg.action>
  <#case "C">
       <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
       [
        {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceBookAppointment>
@ -24,23 +25,10 @@
          "datas" :
          <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
        }
-        <#if (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" && (carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-") || carrier_apt.planned_unloading_end_datetime?starts_with("00") || carrier_apt.planned_unloading_end_datetime?contains("-00-"))) || (carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" && (carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-") ||  carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-"))) || (carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true" && (carrier_apt.planned_load_end_datetime?starts_with("00") || carrier_apt.planned_load_end_datetime?contains("-00-") || carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")))>
-          <#stop "One of the datetime fields of appointment is not initialized" >
-        <#else>
-        ,
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
-        }
-        </#if>
       ]
  <#break>
    <#case "U">
    <#--   *********************************************** Action = Update ********************-->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
      [
        {
        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
@ -149,8 +137,6 @@
    <#break>
 <#case "D">
      <#-- *********************************************** Action = Delete ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
       [
       <#-- Ajout des lignes-->
        {
--- a/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
+++ b/RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl
@ -7,9 +7,9 @@
        "ID": {
        <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
--- a/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierArrived.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            <#else>
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            </#if>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
+++ b/RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl
@ -7,15 +7,15 @@
        "ID": {
           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            <#else>
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            </#if>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
+++ b/RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl
@ -7,15 +7,15 @@
        "ID": {
           <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            <#else>
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            </#if>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl
+++ b/RFXtoRP_HsrCarrierApt_LoadingStarted.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            <#else>
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            </#if>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl
@ -1,13 +1,17 @@
 <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
 [
  {
+    <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
+		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+			"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		<#else>
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+		</#if>
+	<#else>
 		<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
 			"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
 		<#else>
-			<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-			<#else>
-				"AppointmentID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 		</#if>
 	</#if>
    "Header": {
--- a/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl
@ -6,9 +6,9 @@
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
@ -138,6 +138,8 @@
 							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 						</#if>
 						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
--- a/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
+++ b/RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                </#if>
            <#else>
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            </#if>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
+++ b/RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl
@ -7,15 +7,15 @@
        "ID": {
            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                </#if>
            <#else>
                <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
+                    "RefID": "${carrier_apt.appointment_reference?json_string}",
                <#else>
-                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                </#if>
            </#if>
            "RefDate": {
--- a/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl
@ -7,9 +7,9 @@
        },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
@ -133,7 +133,12 @@
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#stop "Not managed">
+						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
+						</#if>
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 				</#if>
 			</#if>
--- a/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
+++ b/RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl
@ -6,9 +6,9 @@
        },
 		<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 			</#if>
 		<#else>
 			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
@ -73,6 +73,8 @@
 						<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
 					</#if>
 					"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+					<#else>
+						<#stop "Appointment type not supported" >
 					</#if>
 			</#if>
 		</#if>
--- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl
@ -9,6 +9,32 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
+       "CustomFields": [
+            {
+                "Key": "depot_code",
+                "Value": "${preparation_order.physical_depot_code?trim?json_string}"
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${preparation_order.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${preparation_order.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${preparation_order.originator_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${preparation_order.preparation_order_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${preparation_order.preparation_order_number}"
+            }
+        ],
      <#if preparation_order.originator_reference?? && preparation_order.originator_reference!="">
        "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}",
      <#else>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@ -9,6 +9,32 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
+      "CustomFields": [
+            {
+                "Key": "depot_code",
+                "Value": "${receipt.physical_depot_code?trim?json_string}"
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            }
+        ],
        "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
      "RefDate": {
            "DateTime": "${receipt_creation_datetime}",
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@ -9,6 +9,36 @@
    {
      "Header": {"ProjectID": "${projectRP}"},
      "ID": {
+         "CustomFields": [
+            {
+                "Key": "depot_code",
+                <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
+                    "Value": "${receipt.origin_order_line_depot?trim?json_string}"
+                <#else>
+                    "Value": "${receipt.physical_depot_code?trim?json_string}"
+                </#if>
+            },
+            {
+                "Key": "activity_code",
+                "Value": "${receipt.activity_code?trim?json_string}"
+            },
+            {
+                "Key": "originator_code",
+                "Value": "${receipt.originator_code?trim?json_string}"
+            },
+            {
+                "Key": "reference",
+                "Value": "${receipt.receipt_reference?trim?json_string}"
+            },
+            {
+                "Key": "order_year",
+                "Value": "${receipt.receipt_year}"
+            },
+             {
+                "Key": "order_number",
+                "Value": "${receipt.receipt_number}"
+            }
+        ],
          <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="">
            "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}",
          <#else>
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@ -20,7 +20,6 @@
 		"work_mode_code" :     "${work_mode_code}",
 		"original_code"  : "${RPtoRFXprefixSupplier(executionflow.ShipFrom.ActorID)}",
 		"carrier_code"   : "${RPtoRFXprefixCarrier(executionflow.Carrier.ActorID!"")}",
-
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
--- a/2
+++ b/2
@ -1 +1 @@
-2.0.17+2
+2.0.18+2
Author	SHA1	Message	Date
Francis Reat	b78d04bfba	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!232	2026-01-27 07:56:59 +00:00
Francis Reat	4e436a918d	Release 2.0.18+2	2026-01-27 08:56:06 +01:00
Francis Reat	b21e75c8e2	Merge branch 'release2.0-SCPN1-10095' into 'release/2.0' release2.0-SCPN1-10095 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!230	2026-01-27 07:53:20 +00:00
Laurie Montant	caefae873c	SCPN1-10095 (cherry picked from commit c324773fad1b60fcc2fad64c853f1c4945209336)	2026-01-27 08:37:08 +01:00
Laurie Montant	f5c5afac1b	SCPN1-10095 (cherry picked from commit 5552265833aa9ec73aae44a0b3464e110f98d46d)	2026-01-27 08:36:54 +01:00
Laurie Montant	1864bef8bb	SCPN1-10095 (cherry picked from commit 8fe3dd364c3bf521f33b858cbe0ea1d96fbbd192)	2026-01-26 16:01:53 +01:00
Francis Reat	62688a15c4	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!227	2026-01-22 14:41:19 +00:00
Francis Reat	4b5e20e6a9	Release 2.0.18+1	2026-01-22 15:35:54 +01:00
Francis Reat	5fa439f297	Merge branch 'release2.0-fixv12' into 'release/2.0' release2.0-fixv12 into release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!226	2026-01-22 13:20:22 +00:00
Francis Reat	39914dbdde	fixv12	2026-01-21 17:17:41 +01:00
Francis Reat	fde8ffe813	Merge branch 'develop' into release2.0-fixv12	2026-01-21 17:16:09 +01:00
Laurie Montant	833821a8a3	SCPN1-10068	2026-01-21 14:50:17 +01:00
Laurie Montant	c556124565	SCPN1-10068	2026-01-21 10:55:03 +01:00
Laurie Montant	83d1fbfcaa	RDV	2026-01-19 16:11:06 +01:00
Laurie Montant	509d47a979	SCPN1-10047	2026-01-19 13:53:33 +01:00
Laurie Montant	8128e55ede	SCPN1-10047	2026-01-19 11:40:13 +01:00
Laurie Montant	0ef7219e29	SCPN1-10047	2026-01-19 11:36:09 +01:00
Laurie Montant	9a130211ba	SCPN1-10047	2026-01-16 17:16:19 +01:00
Laurie Montant	6def04b358	SCPN1-10047	2026-01-16 17:14:20 +01:00
Laurie Montant	cd63035277	SCPN1-10047	2026-01-16 17:04:51 +01:00
Laurie Montant	2f04415f2e	SCPN1-10047	2026-01-16 17:00:58 +01:00
Laurie Montant	8821916dc6	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into develop	2026-01-16 16:58:41 +01:00
Laurie Montant	474061200b	SCPN1-10047	2026-01-16 16:58:36 +01:00
Francis Reat	2098be0ce7	fix error syntax	2026-01-16 16:58:08 +01:00
Laurie Montant	e8bcece299	SCPN1-10047	2026-01-16 16:20:16 +01:00
Laurie Montant	cff6c1fd3f	SCPN1-10040	2026-01-15 15:27:29 +01:00
Francis Reat	46260b8241	rollback (cherry picked from commit 0a34359e1240232c51a57431b9a4b8f95d717db3)	2026-01-15 09:32:15 +01:00
Laurie Montant	3e3091f194	SCPN1-9991	2026-01-14 11:56:56 +01:00
Francis Reat	efddfdc821	hsrAntRec	2026-01-13 18:09:02 +01:00
Francis Reat	e03da2db8d	hsrAntRec (cherry picked from commit 4496a4a2ce4de3653a264b25bcab2bf1b0ee2174)	2026-01-13 18:01:42 +01:00
Francis Reat	f5c8640d11	The loading and unloading appointment is not yet managed. (cherry picked from commit 7e57d91cb63c44699f3e2f60298bb8d75a283f4d)	2026-01-09 15:37:48 +01:00
Francis Reat	db3e72699e	Merge branch 'release/2.0' into 'main-2.0' release/2.0 into main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!223	2026-01-08 17:01:55 +00:00
Francis Reat	a6fec0c333	SCPN1-9943	2026-01-08 15:29:01 +01:00
Francis Reat	eaeed34a73	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!219	2026-01-08 09:30:52 +00:00
Francis Reat	fcddee4196	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!216	2026-01-08 07:56:14 +00:00
Cedric Rodier	d92fa3e2df	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 See merge request r-d-technique/tiers/reflex-wms-connector!213	2025-12-23 14:40:06 +00:00
Christian Senet	7db9eae7eb	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!208	2025-12-19 12:56:08 +00:00
Francis Reat	c16b522308	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!205	2025-12-18 08:09:23 +00:00
Francis Reat	7246a2a117	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!190	2025-12-03 09:18:55 +00:00
Francis Reat	a9aac3269e	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!186	2025-11-26 08:44:03 +00:00
Francis Reat	ec844cbe49	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!159	2025-11-06 10:11:10 +00:00
Francis Reat	39c8280fa4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!157	2025-11-04 09:35:47 +00:00
Francis Reat	7cbc5111e9	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main2.0 See merge request r-d-technique/tiers/reflex-wms-connector!155	2025-10-29 09:49:58 +00:00
Francis Reat	0d3b459386	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!152	2025-10-24 08:41:23 +00:00
Francis Reat	71fdf435bd	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!151	2025-10-16 13:50:08 +00:00
Francis Reat	7f55b4f86a	Merge branch 'release/2.0' into 'main-2.0' Release 2.0 to main 2.0 See merge request r-d-technique/tiers/reflex-wms-connector!142	2025-09-26 07:24:15 +00:00
Francis Reat	ca5ba7c103	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!139	2025-09-24 08:25:40 +00:00
Francis Reat	7e054d70d2	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!135	2025-09-09 07:31:32 +00:00
Francis Reat	75ab1602d4	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!131	2025-09-08 08:57:49 +00:00
Francis Reat	831e6f098b	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!127	2025-08-26 14:41:50 +00:00
Francis Reat	19de302683	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!123	2025-07-10 09:36:18 +00:00
Francis Reat	6d4e2d5949	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!115	2025-06-20 15:59:43 +00:00
Francis Reat	4d0382970f	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!113	2025-05-27 08:00:16 +00:00
Francis Reat	218cf62dae	Merge branch 'release/2.0' into 'main-2.0' Release/2.0 -> Main-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!109	2025-05-13 12:53:01 +00:00
Cedric Rodier	6ed0f8e9da	Merge branch 'release/2.0' into 'main' MR->Main See merge request r-d-technique/tiers/reflex-wms-connector!104	2025-04-24 15:04:25 +00:00
 @ -1 +1 @@
 .0.17+2
 .0.18+2