RFXtoRP_HsaLstCarSta_CarrierArrived.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsaLstCarSta_CarrierExpected.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsaLstCarSta_LoadingStarted.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl

@@ -5,19 +5,11 @@
             "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 !="">
-                <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!="">
+                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
-                    "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_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}",
-                    "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+			</#if>
-                <#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}"

RFXtoRP_HsrCarrierApt.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS-WMS  -->
+<#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
 <#include "ActorPrefix.ftl">
@@ -12,12 +12,11 @@
 
 <#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>
@@ -25,10 +24,23 @@
           "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>
@@ -137,6 +149,8 @@
     <#break>
 <#case "D">
       <#-- *********************************************** Action = Delete ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
        <#-- Ajout des lignes-->
         {

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}",
+				"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>
-				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"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!="">

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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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 -->
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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 -->
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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 -->
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "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 -->
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${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!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl

@@ -1,19 +1,15 @@
 <#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!="">
-		<#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>
-			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			<#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}",
+			</#if>
 		</#if>
-	</#if>
     "Header": {
       "ProjectID": "${projectRP}"
     },

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}",
+				"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 -->
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${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!="">
@@ -138,8 +138,6 @@
 							<#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>

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!="">
-                    "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 -->
+                    "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 -->
                 <#else>
-                    "RefID": "${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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

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!="">
-                    "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 -->
+                    "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 -->
                 <#else>
-                    "RefID": "${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}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
                 </#if>
             <#else>
                 <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-                    "RefID": "${carrier_apt.appointment_reference?json_string}",
+                    "AppointmentID": "${carrier_apt.appointment_reference?json_string}",
                 <#else>
-                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+                    "AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
                 </#if>
             </#if>
             "RefDate": {

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}",
+				"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 -->
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${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!="">
@@ -133,12 +133,7 @@
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
 					<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-						<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+						<#stop "Not managed">
-							<#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>

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}",
+				"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 -->
 			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				"AppointmentID": "${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!="">
@@ -69,13 +69,11 @@
 				"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#if carrier_apt.planned_unloading_start_datetime?starts_with("00") || carrier_apt.planned_unloading_start_datetime?contains("-00-")>
+						<#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" >
+							<#stop "planned_unloading_start_datetime field of appointmend is not initialized" >
-					</#if>
+						</#if>
-					"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
+						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
-					<#else>
+				</#if>
-						<#stop "Appointment type not supported" >
-					</#if>
 			</#if>
 		</#if>
 		}]

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -9,32 +9,6 @@
       "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>

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -9,32 +9,6 @@
       "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}",

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -9,36 +9,6 @@
     {
       "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>

RPtoRFX_Receipt.ftl

@@ -20,6 +20,7 @@
 		"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>

VERSION

@@ -1 +1 @@
-2.0.18+2
+2.0.17+2