Merge branch 'ftl-2.0-for-release1.12.1' into 'release/2.0'

ftl-2.0-for-release1.12.1

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

RFXtoRP_HsrCarrierApt.ftl

@@ -49,7 +49,8 @@
         "datas" :
         <#include "RFXtoRP_HsrCarrierApt_AppointmentCustomFieldsUpdated.ftl">
         },
-      <#if carrier_apt.status?? && carrier_apt.status.status_code=="999">
+      <#include "RFXtoRP_HsrCarrierApt_AppointmentMetadataUpdated.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>

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,38 @@
+<#--
+ [
+ {
+    "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>
+    }
+    "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_SiteForceBookAppointment.ftl

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

RFXtoRP_RestResponse.ftl

@@ -270,7 +270,8 @@
 			</#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>
 			[
@@ -343,7 +344,9 @@
 			]
 			</#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>
 			[
@@ -417,7 +420,8 @@
 			</#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">
 		<#switch restResponsetMsg.status!no_status>
 			<#case no_status>
 			[

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -14,8 +14,8 @@
 
 
 
-<#assign activity_code = "ALI"/>
+<#assign activity_code = ""/>
-<#assign originator_code = "001"/>
+<#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,