Release 2.0.20+1

release-2.0-SCPN1-10100 into release/2.0

See merge request r-d-technique/tiers/reflex-wms-connector!239

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}"

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}",

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}",

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}",

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}",

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}",

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}",

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>
@@ -49,6 +37,7 @@
         <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
         },
       <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.ftl">
+      <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl">
       <#if carrier_apt.status?? && (carrier_apt.status.status_code=="999" || carrier_apt.status.status_code=="040" || carrier_apt.status.status_code=="030")>
       [
         {
@@ -119,7 +108,6 @@
                     }
                   ]
                   <#else>
-                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
                       [
                         {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
@@ -128,16 +116,6 @@
                         <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
                         }
                       ]
-                    <#else>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
-                      }
-                    ]
-                    </#if>
                   </#if>
                 </#if>
               </#if>
@@ -149,10 +127,8 @@
     <#break>
 <#case "D">
       <#-- *********************************************** Action = Delete ******************** -->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
        [
-       <#-- Ajout des lignes-->
+
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",

RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdated.ftl

@@ -0,0 +1,9 @@
+ <#-- A décommenter si besoin de les utiliser-->
+ <#-- Uncomment if you need to use them-->
+ <#--{
+        <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierInformationUpdated>
+        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+        "datas" :
+        <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl">
+        },
+-->

RFXtoRP_HsrCarrierApt_AppointmentCarrierInformationUpdatedToConfigure.ftl

@@ -0,0 +1,42 @@
+<#--
+ [
+ {
+    "Header": {
+        "ProjectID": "${projectRP}"
+    },
+    "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}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		<#else>
+			<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+				"RefID": "${carrier_apt.appointment_reference?json_string}",
+			<#else>
+				"RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+			</#if>
+		</#if>
+    }
+    "Payload": {
+    "ActorID": "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+    <#--To configure-->
+<#--    "CarrierInformation": [
+        {
+        "Key": "string",
+        "Value": {
+        "Bool": "true / false",
+        "Float": 3.1415,
+        "Int": 42,
+        "String": "Hello World !",
+        "Timestamp": {
+            "AuthorTimeZone": "Europe/Paris",
+            "DateTime": "2023-01-01T00:00:00Z"
+        }
+        }
+    ]
+    }
+}
+]
+-->

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!="">
@@ -42,6 +42,14 @@
             {
             "Key": "carrier",
             "Value": "${carrier_apt.planned_carrier?json_string}"
+            },
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
             }
             ]
         },

RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.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}",
+				"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}",
+				"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>
     }

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": {

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": {

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": {

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": {

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.year_number}-${carrier_apt.appointment_number}",
-				"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>
     "Header": {

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!="">
@@ -75,6 +75,14 @@
 			{
 			"Key": "carrier",
 			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
 		],
 		<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
@@ -138,6 +146,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>

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": {

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": {

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!="">
@@ -50,7 +50,7 @@
 						</#if>
 					<#else>
 						<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-						<#assign duration = 0 />		<#-- à confirmer -->
+						<#assign duration = 0 />
 					</#if>
 				</#if>
 			</#if>
@@ -77,9 +77,17 @@
 			{
 			"Key": "carrier",
 			"Value": "${carrier_apt.planned_carrier?json_string}"
+			},
+			{
+			"Key": "loading",
+			"Value": "${carrier_apt.load_appointment?json_string}"
+			},
+			{
+			"Key": "unloading",
+			"Value": "${carrier_apt.unloading_appointment?json_string}"
 			}
 		],
-	<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
+		<#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
 		"Commissions": [
 			<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
 			{
@@ -95,13 +103,6 @@
 			</#list>
 			],
 	<#else>
-		"Commissions": [
-			{
-				"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-				"ProjectID": "${projectRP}",
-				<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
-			}
-		],
 		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
 			"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 		<#else>
@@ -133,7 +134,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>

RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl

@@ -1,82 +0,0 @@
-[
-    {
-		<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-        "Header":{
-          "ProjectID": "${projectRP}"
-        },
-		<#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 -->
-			<#else>
-				"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!="">
-				"AppointmentID": "${carrier_apt.appointment_reference?json_string}",
-			<#else>
-				"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
-			</#if>
-		</#if>
-		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
-        	<#if 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-")>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend is not initialized" >
-		   </#if>
-		   <#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)>
-			   <#stop "planned_unloading_start_datetime or planned_unloading_end_datetime field of appointmend are not valid" >
-		   </#if>
-		<#else>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true" >
-			   <#if 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-")>
-			       <#stop "planned_load_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       </#if>
-				<#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>
-			<#else>
-				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#if  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 "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend is not initialized" >
-		       		</#if>
-					<#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)>
-						<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
-					</#if>
-				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
-				</#if>
-			</#if>
-		</#if>
-	"Slots": [{
-		<#-- calcul de de la durée en fonction des start et end time-->
-			"DurationInSeconds": "${duration}",
-		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false" >
-			<#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>
-			<#if carrier_apt.unloading_appointment == "false" && carrier_apt.load_appointment == "true">
-				<#if carrier_apt.planned_load_start_datetime?starts_with("00") || carrier_apt.planned_load_start_datetime?contains("-00-")>
-					<#stop "planned_load_start_datetime field of appointmend is not initialized" >
-				</#if>
-				"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 "planned_unloading_start_datetime field of appointmend is not initialized" >
-						</#if>
-						"StartDateTime": "${carrier_apt.planned_unloading_start_datetime}"
-				</#if>
-			</#if>
-		</#if>
-		}]
-
-	}
-]

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>

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}",

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>

RPtoRFX_AppointmentEvent.ftl

@@ -66,12 +66,28 @@
 					</#if>
 				</#if>
 			<#else>
-				<#stop "Unsupported Appointment Type for Commissions Update">
+				<#if eventRP.appointmentCustomFields?has_content>
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl">
+				}
+				<#else>
+				{
+					<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
+					"apiRestReflexID" :  "${apiRestReflexID}",
+					"datas" :
+					<#include "RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl">
+				}
+				</#if>
 			</#if>
 		]
 	<#break>
-<#-- *********************************************** Action = SlotUpdated ******************** -->
+<#-- *********************************************** Action = SlotUpdated or CarrierInformationUpdated or ReasonUpdated******************** -->
 	<#case "SlotUpdated">
+	<#case "CarrierInformationUpdated">
+	<#case "ReasonUpdated">
 		<#assign appointment = eventRP.data />
 		[
 			<#if eventRP.appointmentCustomFields?has_content>
@@ -79,19 +95,19 @@
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_number>
 				"apiRestReflexID" :  "${apiRestReflexID}",
 				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByNumber.ftl">
+				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl">
 			}
 			<#else>
 			{
 				<#assign apiRestReflexID = ApiRestReflexID.appointment_put_update_by_ref>
 				"apiRestReflexID" :  "${apiRestReflexID}",
 				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl">
+				<#include "RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl">
 			}
 			</#if>
 		]
 	<#break>
-<#-- *********************************************** Action = SlotUpdated ******************** -->
+<#-- *********************************************** Action = Canceled ******************** -->
 	<#case "Canceled">
 		<#assign appointment = eventRP.data />
 		[

RPtoRFX_CarrierAppointmentDataUpdated.ftl

@@ -0,0 +1,21 @@
+<#-- Note : you can use Order Line Metadata, using the define map : Line_MetaData_Map  -->
+<#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
+
+<#-- How to use MD or SK map
+    <#if appointment.CarrierInformation??>
+        <#assign CarrierInformation_Map = JsonUtil.sequenceToMap(appointment.CarrierInformation, "Key", "Value") />
+        <#if CarrierInformation_Map["Immatriculation"]??>
+            <#assign registration_number1 = CarrierInformation_Map["Immatriculation"].String!""/>
+            "registration_number":"${registration_number1}",
+        <#else>
+            "registration_number":"no plate number",
+        </#if>
+    </#if>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
+-->

RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl

@@ -9,10 +9,10 @@
 	},
 	"payload" :
 	 {
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
 		<#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
-				"unloading_appointment" : "false",
-				"load_appointment" : "true",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
@@ -22,8 +22,6 @@
 				</#if>
 		   <#break>
 		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-				"unloading_appointment" : "true",
-				"load_appointment" : "false",
 				<#if appointment.TimeZone?? && appointment.TimeZone!="">
 					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
 					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",

RPtoRFX_CarrierAppointmentReasonUpdatedByRef.ftl

@@ -0,0 +1,39 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}",
+	"method" : "PUT",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+		"appointment_reference":"${eventRP.refid?json_string}"
+	},
+	"payload" :
+	 {
+		<#switch appointment.AppointmentType>
+	       <#case "APPOINTMENT_TYPE_LOADING">
+		   		"unloading_appointment" : "false",
+				"load_appointment" : "true",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+			<#break>
+		   	<#case  "APPOINTMENT_TYPE_UNLOADING">
+				"unloading_appointment" : "true",
+				"load_appointment" : "false",
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
+        </#switch>
+		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
+	 }
+ }

RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByNumber.ftl

@@ -0,0 +1,39 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/appointment_years/{appointment_year}/appointment_numbers/{appointment_number}",
+	"method" : "PUT",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+		"appointment_year":"${eventRP.appointmentCustomFields.year?json_string}",
+		"appointment_number":"${eventRP.appointmentCustomFields.number?json_string}"
+	},
+	"payload" :
+	 {
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
+		"unloading_appointment" : "${eventRP.appointmentCustomFields.unloading?json_string}",
+		"load_appointment" : "${eventRP.appointmentCustomFields.loading?json_string}",
+       <#switch appointment.AppointmentType>
+	       <#case "APPOINTMENT_TYPE_LOADING">
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+				<#else>
+					"planned_load_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_load_end_datetime": "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+				</#if>
+		   <#break>
+		   <#case  "APPOINTMENT_TYPE_UNLOADING">
+				<#if appointment.TimeZone?? && appointment.TimeZone!="">
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,appointment.TimeZone),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
+		   		<#else>
+					"planned_unloading_start_datetime":"${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
+					"planned_unloading_end_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,time_zone_rfx),time_zone_rfx)}",
+		   		</#if>
+			<#break>
+	       <#default>
+	         <#stop "appointment.AppointmentType not implemented" >
+        </#switch>
+		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
+	 }
+ }

RPtoRFX_CarrierAppointmentSlotOrCarrierInformationUpdatedByRef.ftl

@@ -8,6 +8,7 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
        <#switch appointment.AppointmentType>
 	       <#case "APPOINTMENT_TYPE_LOADING">
 				"unloading_appointment" : "false",

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>

VERSION

@@ -1 +1 @@
-2.0.17+2
+2.0.20+1