Release 2.0.19+1

release-2.0-SCPN1-10100 into release/2.0

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

RFXtoRP_HsaLstCarSta.ftl

@@ -19,8 +19,8 @@
       <#-- *********************************************** Action = Update ******************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
         <#assign carrier_apt_status = JsonUtil.jsonToMap(dataRfx)>
-		<#if !carrier_apt_status.status??>
-	        <#stop 'the updated appointment Status not initialized'>
+		<#if !carrier_apt_status.status?? || carrier_apt_status.appointment_year_number==0>
+	        <#stop >
         </#if>
 		[
 			{

RFXtoRP_HsaLstCarSta_CarrierArrived.ftl

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

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

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

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

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

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-   		    <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !="">
-                "RefID": "${carrier_apt_status.appointment_reference?json_string}",
+   		    <#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>
-                "RefID": "${carrier_apt_status.physical_depot?json_string}${carrier_apt_status.appointment_year_number?json_string}${carrier_apt_status.appointment_number?json_string}",
-			</#if>
+                <#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_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,36 +12,23 @@
 
 <#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>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
           <#include "RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl">
-        },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCarrierExpected>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCarrierExpected.ftl">
-        },
-        {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
-          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-          "datas" :
-          <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
         }
        ]
   <#break>
     <#case "U">
     <#--   *********************************************** Action = Update ********************-->
-      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
-      <#assign carrier_apt = JsonUtil.jsonToMap(dataRfx)>
       [
         {
         <#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentCustomFieldsUpdated>
@@ -49,7 +36,9 @@
         "datas" :
         <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
         },
-      <#if carrier_apt.status?? && carrier_apt.status.status_code=="999">
+      <#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")>
       [
         {
         <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteCancelAppointment>
@@ -119,25 +108,14 @@
                     }
                   ]
                   <#else>
-                    <#if carrier_apt.physical_receipt_list??  && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
-                      }
-                    ]
-                    <#else>
-                    [
-                      {
-                      <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteForceRescheduleAppointment>
-                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                      "datas" :
-                      <#include "RFXtoRP_HsrCarrierApt_UpdateSlotAppointment.ftl">
-                      }
-                    ]
-                    </#if>
+                      [
+                        {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.SiteWMSUpdateAppointment>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl">
+                        }
+                      ]
                   </#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_AppointmentCarrierExpected.ftl

@@ -1,26 +0,0 @@
-[
-    <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-    {
-        "Header": {
-            "ProjectID": "${projectRP}"
-        },
-        "ID": {
-        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "RefID": "${carrier_apt.appointment_reference?json_string}",
-        <#else>
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-                "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            </#if>
-		</#if>
-			"RefDate": {
-               "DateTime": "${ref_datetime}",
-               "AuthorTimeZone": "${time_zone_rfx}"
-			 }
-        },
-        "Payload":{
-            "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
-        }
-    }
-]

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

@@ -5,14 +5,18 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-        <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
-            "RefID": "${carrier_apt.appointment_reference?json_string}",
-        <#else>
-            <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
-                "RefID": "${carrier_apt.appointment_reference?json_string}${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
-            </#if>
+        <#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>
         "RefDate": {
             "DateTime": "${ref_datetime}",
@@ -38,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_AppointmentMetadataUpdated.ftl

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

RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdatedToConfigure.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-->
+<#--    "MetaData": [
+        {
+        "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_CarrierArrived.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#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>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrCarrierApt_CarrierDeparted.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+           <#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>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrCarrierApt_LoadingCompleted.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+           <#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>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrCarrierApt_LoadingStarted.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#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>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrCarrierApt_SiteCancelAppointment.ftl

@@ -1,15 +1,19 @@
 <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
 [
   {
-    <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+    <#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}",
-			</#if>
+			"AppointmentID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
 		</#if>
+	</#if>
     "Header": {
       "ProjectID": "${projectRP}"
     },

RFXtoRP_HsrCarrierApt_SiteForceBookAppointment.ftl

@@ -4,13 +4,17 @@
           "ProjectID": "${projectRP}"
         },
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
-		<#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}",
+		<#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.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+				"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>
 		</#if>
 		"TimeZone":"${time_zone_rfx}",
@@ -25,7 +29,7 @@
 		   </#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-")>
+			   <#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>
@@ -35,10 +39,17 @@
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
+					<#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 -->
+					<#assign duration = 0 />
 				</#if>
 			</#if>
 		</#if>
@@ -64,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">,
@@ -79,6 +98,7 @@
 					<#else>
 						"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
 					</#if>
+					"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
 					"ProjectID": "${projectRP}",
 		            <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}<#sep>,</#sep>
@@ -92,10 +112,18 @@
                     <#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
 				}
 			],
-			<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
-				"Reason": "${carrier_apt.appointment_designation?json_string}",
+			<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+				"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
 			<#else>
-				"Reason": "No commission",
+				<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+					"Reason": "${carrier_apt.appointment_designation?json_string}",
+				<#else>
+					<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+						"Reason": "${carrier_apt.appointment_reference?json_string}",
+					<#else>
+						"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+					</#if>
+				</#if>
 			</#if>
 		</#if>
 		"Slots": [{
@@ -105,7 +133,6 @@
 			    <#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">
@@ -114,7 +141,14 @@
 		       		</#if>
 			   		"StartDateTime": "${carrier_apt.planned_load_start_datetime}"
 				<#else>
-						<#stop "Not managed">
+					<#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}"
+					<#else>
+						<#stop "Appointment type not supported" >
+					</#if>
 				</#if>
 			</#if>
 		}]

RFXtoRP_HsrCarrierApt_UnloadingCompleted.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#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 -->
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#if>
             <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrCarrierApt_UnloadingStarted.ftl

@@ -5,11 +5,19 @@
             "ProjectID": "${projectRP}"
         },
         "ID": {
-            <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference !="">
-                "RefID": "${carrier_apt.appointment_reference?json_string}",
+            <#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 -->
+                <#else>
+                    "RefID": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#-- pour les RDV récurrents, aligner les statuts quand la balise sera dispo -->
+                </#if>
             <#else>
-                "RefID": "${carrier_apt.physical_depot?json_string}${carrier_apt.year_number?json_string}${carrier_apt.appointment_number?json_string}",
-			</#if>
+                <#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>
             "RefDate": {
                "DateTime": "${ref_datetime}",
                "AuthorTimeZone": "${time_zone_rfx}"

RFXtoRP_HsrCarrierApt_UpdateAppointment.ftl

@@ -5,13 +5,17 @@
         "Header":{
           "ProjectID": "${projectRP}"
         },
-		<#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}",
+		<#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.physical_depot?json_string}${carrier_apt.year_number}${carrier_apt.appointment_number}",
+				"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>
 		</#if>
 		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
@@ -35,14 +39,24 @@
 				</#if>
 			<#else>
 				<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
-					<#stop "Not managed">
-				<#else>
-					<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN>
-					<#assign duration = 0 />		<#-- à confirmer -->
+					<#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 />
+					</#if>
 				</#if>
 			</#if>
 		</#if>
 		"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
+		"TimeZone":"${time_zone_rfx}",
 		"CustomFields": [
 			{
 			"Key": "depot",
@@ -63,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>
 			{
@@ -81,7 +103,19 @@
 			</#list>
 			],
 	<#else>
-		<#stop>
+		<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
+			"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
+		<#else>
+			<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
+				"Reason": "${carrier_apt.appointment_designation?json_string}",
+			<#else>
+				<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
+					"Reason": "${carrier_apt.appointment_reference?json_string}",
+				<#else>
+					"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
+				</#if>
+			</#if>
+		</#if>
 	</#if>
 	"Slots": [{
 			<#-- calcul de de la durée en fonction des start et end time-->
@@ -100,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,68 +0,0 @@
-[
-    {
-		<#assign creation_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
-        "Header":{
-          "ProjectID": "${projectRP}"
-        },
-		<#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}",
-			</#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">
-					<#stop "Not managed">
-				<#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">
-					<#stop "Not managed">
-				</#if>
-			</#if>
-		</#if>
-		}]
-
-	}
-]

RFXtoRP_HsrPrepa.ftl

@@ -27,14 +27,13 @@
                "datas" :
                <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
                },
+               <#include "RFXtoRP_HsrPrepa_ExecutionflowMetadataUpdated.ftl">
                {
-
                <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
                <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
                }
-
                <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
                   ,
                   {

RFXtoRP_HsrPrepa_ExecutionflowMetaDataUpdatedToConfigure.ftl

@@ -0,0 +1,27 @@
+<#--
+{
+    "Header": {
+    "ProjectID": "${projectRP}"
+    },
+    "ID":{
+    "RefID": "${Your_Object_ID}"
+    },
+    "Payload":{
+        "MetaData": [
+        {
+        "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_HsrPrepa_ExecutionflowMetadataUpdated.ftl

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

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>

RFXtoRP_RestResponse.ftl

@@ -212,10 +212,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -239,10 +239,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -261,16 +261,17 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
 			<#break>
 	<#-- *********************************************** ApiRestID = appointment_put_update_ref ******************** -->
-	<#case "appointment_put_update_ref">
+	<#case "appointment_put_update_by_ref">
+	<#case "appointment_put_update_by_number">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[
@@ -286,10 +287,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -313,10 +314,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -335,15 +336,17 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
 			<#break>
-	<#case "Canceled">
+	<#-- *********************************************** ApiRestID = canceled ******************** -->
+	<#case "status_appointment_put_update_by_ref">
+	<#case "status_appointment_put_update_by_number">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[
@@ -359,10 +362,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -386,10 +389,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -408,16 +411,19 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>
 			<#break>
 			<#-- *********************************************** ApiRestID = appointment_post_physical_receipt_associations ******************** -->
-	<#case "appointment_post_physical_receipt_associations">
+	<#case "appointment_post_physical_receipt_associations_by_ref">
+	<#case "appointment_post_physical_receipt_associations_by_number">
+	<#case "appointment_post_physical_receipt_dissociations_by_ref">
+	<#case "appointment_post_physical_receipt_dissociations_by_number">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[
@@ -433,10 +439,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			<#break>
@@ -460,10 +466,10 @@
 						<#include "RFXtoRP_PlatformLogCreate.ftl">
 					},
 					{
-						<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+						<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 						"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 						"datas" :
-						<#include "RFXtoRP_RestResponseAllocationError.ftl">
+						<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 					}
 				]
 				</#if>
@@ -482,10 +488,10 @@
 					<#include "RFXtoRP_PlatformLogCreate.ftl">
 				},
 				{
-					<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
+					<#assign apiReflexPlatformID = ApiReflexPlatformID.AppointmentAllocationError>
 					"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 					"datas" :
-					<#include "RFXtoRP_RestResponseAllocationError.ftl">
+					<#include "RFXtoRP_RestResponseAppointmentAllocationError.ftl">
 				}
 			]
 			</#switch>

RFXtoRP_RestResponseAppointmentAllocationError.ftl

@@ -0,0 +1,22 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+<#include "ActorPrefix.ftl">
+[
+  {
+    "Header": {
+      "ProjectID": "${projectRP}"
+    },
+    "ID": {
+        "RefID": "${id.refid!"no RefID"?trim?json_string}",
+       "RefDate": {
+        "DateTime": "${aDateTime?iso_utc}",
+        "AuthorTimeZone": "${time_zone_rfx}"
+      }
+    },
+
+    "Payload": {
+      "ActorID":"${RFXtoRPprefixDepot(id.actorID)?trim?json_string}"
+    }
+
+  }
+]

RPtoRFX_AppointmentEvent.ftl

@@ -26,26 +26,68 @@
 <#-- *********************************************** Action = CommissionsUpdated ******************** -->
 	<#case "CommissionsUpdated">
 		<#assign appointment = eventRP.data />
-		[
-			<#if eventRP.appointmentCustomFields?has_content>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
-			}
+		[	<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
+				<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">				    
+					<#if eventRP.appointmentCustomFields?has_content>
+						{
+							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_number>
+							"apiRestReflexID" :  "${apiRestReflexID}",
+							"datas" :
+							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl">
+						}
+						<#else>
+						{
+							<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
+							"apiRestReflexID" :  "${apiRestReflexID}",
+							"datas" :
+							<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
+						}
+					</#if>
+				</#if>
+				<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
+					<#if eventRP.addedCommissions?? && eventRP.addedCommissions!="">
+					   ,
+					</#if>	
+
+					<#if eventRP.appointmentCustomFields?has_content>
+					{
+						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_number>
+						"apiRestReflexID" :  "${apiRestReflexID}",
+						"datas" :
+						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl">
+					}
+					<#else>
+					{
+						<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_dissociations_by_ref>
+						"apiRestReflexID" :  "${apiRestReflexID}",
+						"datas" :
+						<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl">
+					}
+					</#if>
+				</#if>
 			<#else>
-			{
-				<#assign apiRestReflexID = ApiRestReflexID.appointment_post_physical_receipt_associations_by_ref>
-				"apiRestReflexID" :  "${apiRestReflexID}",
-				"datas" :
-				<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
-			}
+				<#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>
@@ -53,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_CarrierAppointmentCanceledByNumber.ftl

@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"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}/status",
 	"method" : "PUT",
 	"uri_substitutions": {

RPtoRFX_CarrierAppointmentCanceledByRef.ftl

@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}/status",
 	"method" : "PUT",
 	"uri_substitutions": {

RPtoRFX_CarrierAppointmentCancellationCode.ftl

@@ -1,2 +1,2 @@
-<#-- To custom with cancellation reason code-->
+<#-- To custom with cancellation reason code, the reason code must be cancellation type-->
 "cancellation_reason_code": ""

RPtoRFX_CarrierAppointmentCreated.ftl

@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -12,15 +12,25 @@
 	       <#case "APPOINTMENT_TYPE_LOADING">
 			   "unloading_appointment" : "false",
 			   "load_appointment" : "true",
-               "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)}",
-		   <#break>
+               <#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",
-			   "planned_unloading_start_datetime" : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.StartDateTime,time_zone_rfx),time_zone_rfx)}",
-               "planned_unloading_end_datetime"   : "${DateTimeUTCtoRfxLocale(RfxDateTimetoUTCWithTimezone(appointment.Slot.EndDateTime,appointment.TimeZone),time_zone_rfx)}",
-		   <#break>
+			   <#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>
@@ -46,11 +56,7 @@
 				</#if>
 			<#else>
 				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					<#if appointment.Commissions[0].OrderID ?? && appointment.Commissions[0].OrderID!="">
-						"appointment_designation":"LOADING",
-					<#else>
 						"appointment_designation":"${(appointment.Reason!"")?json_string}",
-					</#if>
 				</#if>
 			</#if>
 		</#if>

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_CarrierAppointmentDefaultData.ftl

@@ -2,8 +2,15 @@
 <#-- Note : you can use Order Line Segmentation keys, using the define map : SegmentationKeys_Map  -->
 
 <#-- How to use MD or SK map
-    Example :
-    <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
+    <#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

RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByNumber.ftl

@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"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}/physical_receipt_associations",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -9,25 +9,18 @@
 	},
 	"payload" :
 	 {
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
-				{
-					"receipt_activity": "${custom.value.activity_code?json_string}",
-					"originator_code": "${custom.value.originator_code?json_string}",
-					"physical_receipt_reference": "${custom.value.reference?json_string}",
-					"receipt_year": "${custom.value.order_year?json_string}",
-					"receipt_number": "${custom.value.order_number?json_string}"
-				}
-				<#sep>,</#sep>
-				</#list>
-				]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"LOADING"
-				</#if>
-			</#if>
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
  }

RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl

@@ -1,5 +1,5 @@
 {
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
 	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}/physical_receipt_associations",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -8,25 +8,18 @@
 	},
 	"payload" :
 	 {
-		<#if appointment.Commissions??>
-			<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
-				"physical_receipt_list": [
-				<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as custom>
-				{
-					"receipt_activity": "${custom.value.activity_code?json_string}",
-					"originator_code": "${custom.value.originator_code?json_string}",
-					"physical_receipt_reference": "${custom.value.reference?json_string}",
-					"receipt_year": "${custom.value.order_year?json_string}",
-					"receipt_number": "${custom.value.order_number?json_string}"
-				}
-				<#sep>,</#sep>
-				</#list>
-				]
-			<#else>
-				<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
-					"appointment_designation":"LOADING"
-				</#if>
-			</#if>
-		</#if>
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.addedCommissions as addedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
 	 }
  }

RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByNumber.ftl

@@ -0,0 +1,26 @@
+{
+	"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}/physical_receipt_dissociations",
+	"method" : "POST",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+        "appointment_year":"${eventRP.appointmentCustomFields.year?json_string}",
+		"appointment_number":"${eventRP.appointmentCustomFields.number?json_string}"
+	},
+	"payload" :
+	 {
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.removedCommissions as removedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
+	 }
+ }

RPtoRFX_CarrierAppointmentPhysicalReceiptDissociationByRef.ftl

@@ -0,0 +1,25 @@
+{
+	"id" : {"refid" : "${eventRP.refid?json_string}","actorID":"${RPtoRFXprefixDepot(eventRP.actor)}"},
+	"route" : "rest/public/v1/physical_depots/{physical_depot_code}/carrier_appointments/{appointment_reference}/physical_receipt_dissociations",
+	"method" : "POST",
+	"uri_substitutions": {
+		"physical_depot_code": "${RPtoRFXprefixDepot(eventRP.actor)}",
+        "appointment_reference":"${eventRP.refid?json_string}"
+	},
+	"payload" :
+	 {
+		<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
+		"physical_receipt_list": [
+		<#list eventRP.removedCommissions as removedCommission>
+		{
+			"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
+			"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
+			"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
+			"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
+			"receipt_number": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_number?json_string}"
+		}
+		<#sep>,</#sep>
+		</#list>
+		]
+	 }
+ }

RPtoRFX_CarrierAppointmentReasonUpdatedByNumber.ftl

@@ -0,0 +1,38 @@
+{
+	"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" :
+	 {
+		"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_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

@@ -0,0 +1,40 @@
+{
+	"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" :
+	 {
+		<#include "RPtoRFX_CarrierAppointmentDataUpdated.ftl">
+       <#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_CarrierAppointmentSlotUpdatedByNumber.ftl

@@ -1,30 +0,0 @@
-{
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
-	"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" :
-	 {
-       <#switch appointment.AppointmentType>
-	       <#case "APPOINTMENT_TYPE_LOADING">
-				"unloading_appointment" : "false",
-				"load_appointment" : "true",
-				"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)}",
-		   <#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-				"unloading_appointment" : "true",
-				"load_appointment" : "false",
-				"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)}",
-		   	<#break>
-	       <#default>
-	         <#stop "appointment.AppointmentType not implemented" >
-        </#switch>
-		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
-	 }
- }

RPtoRFX_CarrierAppointmentSlotUpdatedByRef.ftl

@@ -1,29 +0,0 @@
-{
-	"id" : {"refid" : "${eventRP.refid?json_string}"},
-	"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",
-				"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)}",
-		   <#break>
-		   <#case  "APPOINTMENT_TYPE_UNLOADING">
-				"unloading_appointment" : "true",
-				"load_appointment" : "false",
-				"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)}",
-		   	<#break>
-	       <#default>
-	         <#stop "appointment.AppointmentType not implemented" >
-        </#switch>
-		"appointment_designation":"${(appointment.Reason!"")!?json_string}"
-	 }
- }

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -14,8 +14,8 @@
 
 
 
-<#assign activity_code = "ALI"/>
-<#assign originator_code = "001"/>
+<#assign activity_code = ""/>
+<#assign originator_code = ""/>
 <#assign preparation_type_code = "010"/>
 <#assign requested_delivery_date_type = "010"/>
 <#assign consolidated_delivery_flag ="false"/>
@@ -26,7 +26,7 @@
 
 <#-- A supprimer si utilisation de la table de correspondance-->
 <#--To be deleted if using the correspondence table-->
-<#assign load_grouping = "TEST">
+<#assign load_grouping = "">
 
 
 <#-- Table de correspondance Transporteur/Code regroupement chargement,

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>

ReflexUtils.ftl

@@ -16,14 +16,14 @@
     <#assign timeInMilliseconds = (1000 * seconds) >
     <#assign aDate = date?long + timeInMilliseconds>
     <#return aDate?number_to_datetime>
-</#function>  
+</#function>
 
 <#-- -------------------------------------------------------------------------------------------- -->
 <#-- Duration between two datetimes in second                                                     -->
 <#-- -------------------------------------------------------------------------------------------- -->
 <#function DurationBetweenTwoDatetimeInSeconds startDate endDate>
     <#return (endDate?long - startDate?long) / 1000 >
-</#function>  
+</#function>
 
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- Split email HARDIS WMS into json array string                                           -->

VERSION

@@ -1 +1 @@
-2.0.14+1
+2.0.19+1