Release 1.2.16+4

Merge branch 'SCPN1-6641' into 'release/1.2'
SCPN1-6641 et SCPN1-6642 See merge request r-d-technique/tiers/reflex-wms-connector!42
2024-05-30 17:20:55 +02:00 · 2024-05-30 15:05:08 +00:00 · 2024-05-30 16:30:59 +02:00 · 2024-05-30 14:30:09 +02:00 · 2024-05-16 17:55:49 +02:00 · 2024-05-16 15:30:52 +00:00
15 changed files with 267 additions and 149 deletions
--- a/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
+++ b/RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl
@@ -27,7 +27,9 @@
         <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc />
         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
          "PriorityDate" : "${priority_date}",
-         </#if>
+        <#else>
+            "PriorityDate": "1970-01-01T00:00:00Z",
+        </#if>

       <#-- Segmentation keys inclusion -->
       <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
--- a/RFXtoRP_HsaIpgMove.ftl
+++ b/RFXtoRP_HsaIpgMove.ftl
@@ -14,8 +14,7 @@
      <#-- exclusion of the cases of an IPG move with quantity = 0 (weight modification) -->

      <#if reflexMvtStockInterface.ipg_move_quantity_in_base_lvs != 0>
-
-      <#-- IPG moves translated into Stock moves -->
+         <#-- IPG moves translated into Stock moves -->
         <#if reflexMvtStockInterface.ipg_move_type == "130" ||
            reflexMvtStockInterface.ipg_move_type == "200" ||
            reflexMvtStockInterface.ipg_move_type == "210" ||
@@ -41,22 +40,22 @@
            <#-- IPG moves translated into goods received (all type of  receipt)  -->
               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                     reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                  [
-                  {
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  "datas" :
-                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
-                  }
-                  ]
+                     reflexMvtStockInterface.ipg_move_type == "120") >
+                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+                        [
+                        {
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        "datas" :
+                        <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+                        }
+                        ]
+                      <#else>
+                        <#-- Case of IPG move type volontarilly ignored-->
+                        <#stop " Reference receipt is empty">
+                     </#if>
               <#else>
-                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                     <#-- Case of IPG move type volontarilly ignored-->
-                     <#stop " Reference receipt is empty">
-                  <#else>
-                     <#stop>
-                  </#if>
+                  <#stop>
               </#if>
         </#if>
      <#else>
--- a/RFXtoRP_HsaIpgMove_StockMoved.ftl
+++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl
@@ -24,7 +24,11 @@
    "Payload": {
      "Goods": {
        "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        "PriorityDate": "${ipg_priority_datetime}",
+        <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+          "PriorityDate": "${ipg_priority_datetime}",
+        <#else>
+            "PriorityDate": "1970-01-01T00:00:00Z",
+        </#if>

        <#-- Segmentation keys inclusions -->
        <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -2,7 +2,7 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-
+<#include "ReflexUtils.ftl">
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>
@@ -25,6 +25,7 @@
            <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
            },
            {
+
            <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
@@ -47,8 +48,10 @@
               }
            </#if>

+            <#assign refIDHmap ={}>
            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
            <#list preparation_line.despatched_ipg_list as despatched_ipg>
+            <#assign HUadded_packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
            <#if despatched_ipg.consignment_unit_id!="">
               ,
               {
@@ -74,8 +77,8 @@
               }
            </#if>
               </#list>
-            <#--  <#sep>,</#sep> -->
            </#list>
+            <#assign refIDHmap ={}>
         ]
   <#else>
      <#stop "no confirmed quantity for the preparation - preparation closed">
--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@@ -1,26 +1,33 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+  <#assign refIDHmap_local ={}>
   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${OrderOriginReference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+    <#if !refIDHmap_local[OrderOriginReference]?? >
+        <#if refIDHmap_local?size != 0 >
+        ,
+        </#if>
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      }
+      <#-- Add transport grade code
+      <#if preparationOrder.transport_grade_code!="">
+      ,
+      "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+      </#if> -->
    }
-    <#-- Add transport grade code
-    <#if preparationOrder.transport_grade_code!="">
-    ,
-    "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
-    </#if> -->
-  }
-  }
-  <#sep>,</#sep>
-   </#list>
+    }
+    </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl
@@ -1,23 +1,29 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-<#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
-    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    { 
-    "Header": {
-      "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-      "RefID": "${despatched_ipg.carton_number}",
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"            
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
+<#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3>
+    <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3>
+      <#if !refIDHmap[despatched_ipg3.carton_number]?? >
+        <#if refIDHmap?size != 0 >
+        ,
+        </#if>
+        <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}>
+        {
+        "Header": {
+          "ProjectID": "${projectRP}"
+           },
+        "ID": {
+          "RefID": "${despatched_ipg3.carton_number}",
+          "RefDate": {
+            "DateTime": "${dispatched3_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+                }
+           },
+          "Payload": { }
+        }
+     </#if>
      </#list>
-  <#sep>,</#sep>
-  </#list> 
+  </#list>
 ]
--- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl
@@ -2,22 +2,27 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
+<#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
-    "ID": {
-      "RefID": "${despatched_ipg.hd_number}",
-      "RefDate": {
-        "DateTime": "${dispatched_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
-      }
-      },
-      "Payload": { }
-      }<#sep>,</#sep>
-      </#list>
-  <#sep>,</#sep>
+      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={despatched_ipg.hd_number,despatched_ipg.hd_number}>
+          {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            "RefID": "${despatched_ipg.hd_number}",
+            "RefDate": {
+              "DateTime": "${dispatched_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+            },
+            "Payload": { }
+            }
+      </#if>
+    </#list>
  </#list>
+  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl
@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
-
 [
  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
    <#list preparation_line.despatched_ipg_list as despatched_ipg>
+    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
    {
    "Header": {
      "ProjectID": "${projectRP}"
    },
    "ID": {
+       "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${packing_datetime}"
+    },
      <#if despatched_ipg.carton_number != "000000000000000000">
        "RefID": "${despatched_ipg.carton_number}"
      <#else>
@@ -20,7 +24,7 @@
        <#if despatched_ipg.carton_number != "000000000000000000">
           "ContainerType": "${despatched_ipg.carton_type_code}"
           <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
+              <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
              ,
              "Length": {
              "Unit": "${length_unit_rfx}",
@@ -43,7 +47,7 @@
        <#else>
           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
           <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
+            <#list preparation_line.despatched_hds_list?filter(j -> j?? && j.handling_device_number==despatched_ipg.hd_number) as dimensionHU>
            ,
              "Length": {
                "Unit": "${length_unit_rfx}",
--- a/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
+++ b/RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl
@@ -0,0 +1,40 @@
+<#include "HfRpConfig.ftl">
+<#include "ReflexUtils.ftl">
+[
+ {
+    "Header": {
+    "ProjectID": "${projectRP}"
+    },
+    "ID": {
+      "RefDate": {
+      "AuthorTimeZone": "${time_zone_rfx}",
+      "DateTime": "${HUadded_packing_datetime}"
+    },
+    "RefID": "${despatched_ipg.hd_number}"
+  },
+
+ "Payload": {
+
+"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
+  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
+      ,
+    "Information": {
+      "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",
+      "Length": {
+        "Unit": "${length_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_type_depth}
+      },
+      "Weight": {
+        "Unit": "${weight_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_gross_weight}
+      },
+      "Width": {
+        "Unit": "${length_unit_rfx}",
+        "Value": ${preparation_line.despatched_hds_list[0].hd_type_width}
+      }
+    }
+    </#if>
+
+ }
+ }
+]
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@@ -1,21 +1,28 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+  <#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  {
-    "Header": {
-    "ProjectID": "${projectRP}"
-    },
-    "ID":{
-    "RefID": "${OrderOriginReference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+  <#if !refIDHmap_local[OrderOriginReference]?? >
+      <#if refIDHmap_local?size != 0 >
+    ,
+    </#if>
+    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
+    {
+      "Header": {
+      "ProjectID": "${projectRP}"
+      },
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      }
    }
-  }
-  }
-    <#sep>,</#sep>
-   </#list>
+    }
+  </#if>
+  </#list>
+  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPro.ftl
+++ b/RFXtoRP_HsrPro.ftl
@@ -16,16 +16,18 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-         {
+
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
          <#-- check preparation type code (internal order and reservation are ignored)  -->
          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
            <#-- Only if preparation order not confirmed  -->
            <#if preparation_order.preparation_order_confirmed == "false" >
+            {
              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
              "datas" :
              <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
+            }
            <#else>
            <#stop "preparation order already confirmed">
           </#if>
@@ -36,7 +38,7 @@
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-         }
+

       ]
  <#break>
@@ -46,18 +48,16 @@
        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
       [
-        {
        <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
-          {
+        {
          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :
          <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
-          }
+        }
        <#else>
          <#stop "PRO reference is empty">
        </#if>
-        }
       ]
         <#break>

--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -51,13 +51,16 @@
            {
              "ItemID":   "${line.item_code?trim?json_string!"0"}",
              "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-              <#if line.line_without_detail??>
-                  <#if (line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+              <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
                   "PriorityDate": "${line_without_detail_priority_date}",
-                  </#if>
              <#else>
-                <#stop >
+                <#if (line.line_detail?? && line.line_detail.priority_date?length != 0) && (line.line_detail.priority_date?starts_with("00") == false)>
+                    <#assign line_detail_priority_date = line.line_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${line_detail_priority_date}",
+                <#else>
+                    "PriorityDate": "1970-01-01T00:00:00Z",
+                </#if>
              </#if>
              <#-- Segmentation Keys inclusion -->
              <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl">
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -1,4 +1,18 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
+<#-- Valeurs par défaut Adresse -->
+<#-- Default values -->
+<#assign typecode ="010">
+<#assign titlecode ="1">
+<#assign contacttypecode ="010">
+<#assign adresstypecode ="010">
+<#-- Si vous utilisez des acteurs non référencés, il faudra créer un destinataire "VIZ" dans Reflex WMS pour utiliser cette fonctionnalité -->
+<#-- If you are using unreferenced actors, you will need to create a "VIZ" consignee in Reflex WMS to use this feature -->
+<#assign defaultactor ="VIZ">
+<#if executionflow.ShipTo.ActorID?? && executionflow.ShipTo.ActorID!="">
+	<#assign actorID = executionflow.ShipTo.ActorID >
+<#else>
+	<#assign actorID = defaultactor >
+</#if>

 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
@@ -9,15 +23,15 @@
 		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" : 
+	"payload" :
 	 {
 		"originator_reference": "${executionflow.OrderID}",
 		"preparation_type_code": "${preparation_type_code}",
-		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"end_consignee_code": "${actorID}",
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
+			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
@@ -31,52 +45,62 @@
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
 		  	},
-		<#if executionflow.ShipTo.ActorID == ""> 
-		"address": {
+		<#if actorID == defaultactor >
+			"address": {
+				"type_code": "${typecode}",
+				"title_code" : "${titlecode}",
+				"contact_type_code" : "${contacttypecode}",
+				"address_type_code" : "${adresstypecode}",
 				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
-				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
-				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
+				"last_name" :"${executionflow.ShipTo.Contact.LastName!""?json_string}",
+				"name_or_company_name" : "${executionflow.ShipTo.Contact.FirstName!""?json_string} ${executionflow.ShipTo.Contact.LastName!""?json_string}",
+				<#if executionflow.ShipTo.Contact.Emails?? && executionflow.ShipTo.Contact.Emails[0]!="">
+					"mail_address": "${executionflow.ShipTo.Contact.Emails[0]}",
+				</#if>
+				<#if executionflow.ShipTo.Contact.Phones?? && executionflow.ShipTo.Contact.Phones[0]!="">
+					"mobile_phone_number": "${executionflow.ShipTo.Contact.Phones[0]}",
+				</#if>
 				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
 				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
 				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
 				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
+				"post_code_area_name" : "${executionflow.ShipTo.Actor.Address.City!""}",
 				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
-			  },
+			},
 		</#if>
-		<#if executionflow.Lines??> 
-		"line_list": [
-		<#list executionflow.Lines as line>
-			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-			<#if line.MetaData??>
-			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-			</#if>
-			<#if line.RequestedContent.Goods.SegmentationKeys??>
-			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-			</#if>
-			<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
-		{
-	  	    "originator_reference_line_number": ${line.LineID?number},
-			"item_code": "${line.RequestedContent.Goods.ItemID!""}",
-			"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
-			"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
-			"owner_code_to_prepare" :"${owner_code_to_prepare}",
-			"grade_code_to_prepare" :"${grade_code_to_prepare}",
-			"input_order_data": "false",
-			"batch_1": "${batch_1}",
-			"base_lv_quantity": "true",
-			"any_lv": "false"	
-			<#-- 
-      		"stock_reservation": "false",
-            "forced_priority_date_min_lead_time": "false",
-            "temp_substitution_possible": "false",
-            "substitution_possible": "false"
-			-->
-            
-		}<#sep>,</#sep>
-		</#list>
-		</#if>	     	
-		]	  
+		<#if executionflow.Lines??>
+			"line_list": [
+			<#list executionflow.Lines as line>
+				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
+				<#if line.MetaData??>
+				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				</#if>
+				<#if line.RequestedContent.Goods.SegmentationKeys??>
+				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				</#if>
+				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
+				{
+				"originator_reference_line_number": ${line.LineID?number},
+				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
+				"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
+				"owner_code_to_prepare" :"${owner_code_to_prepare}",
+				"grade_code_to_prepare" :"${grade_code_to_prepare}",
+				"input_order_data": "false",
+				"batch_1": "${batch_1}",
+				"base_lv_quantity": "true",
+				"any_lv": "false"
+				<#--
+				"stock_reservation": "false",
+				"forced_priority_date_min_lead_time": "false",
+				"temp_substitution_possible": "false",
+				"substitution_possible": "false"
+				-->
+
+				}
+			<#sep>,</#sep>
+			</#list>
+		</#if>
+		]
 	 }
 }
-	
--- a/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
+++ b/RPtoRFX_PrepOrder_DefaultHeaderData.ftl
@@ -1,7 +1,7 @@
 <#-- Note : you can use Order Header Metadata, using the define map : Header_MetaData_Map  -->

 <#-- How to use MD Header map
-    Example : 
+    Example :
    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>

    If your MD is :
@@ -23,8 +23,22 @@
 <#assign protected_flag ="false"/>
 <#assign automatic_generation_flag ="false"/>
 <#assign apt_with_end_consignee_flag="false"/>
-<#assign load_grouping = "DEFAUT"/>
-
+
+<#-- A supprimer si utilisation de la table de correspondance-->
+<#--To be deleted if using the correspondence table-->
+<#assign load_grouping = "default">
+
+
+<#-- Table de correspondance Transporteur/Code regroupement chargement,
+affectation à un chargement si paramétrage  regroupement chargement+plan de base distribution-->
+<#--Carrier / Load Grouping Code Correspondence Table,
+Assigning to a load if you set up Load Grouping+Distribution Master Plan-->
+<#-- Example -->
+    <#--<#if executionflow.Carrier.ActorID == "TEST" >
+        <#assign load_grouping = "TEST">
+        <#else>
+        <#assign load_grouping = "default">
+    </#if>-->



--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.15+1
+1.2.16+4
Author	SHA1	Message	Date
freat	011540fc51	Release 1.2.16+4	2024-05-30 17:20:55 +02:00
Francis Reat	5e9804db40	Merge branch 'SCPN1-6641' into 'release/1.2' SCPN1-6641 et SCPN1-6642 See merge request r-d-technique/tiers/reflex-wms-connector!42	2024-05-30 15:05:08 +00:00
frea	e344cca043	SCPN1-6642	2024-05-30 16:30:59 +02:00
frea	b0b4714df9	SCPN1-6641	2024-05-30 14:30:09 +02:00
freat	15bd095feb	Release 1.2.16+3	2024-05-16 17:55:49 +02:00
Francis Reat	c0dd029d1f	Merge branch 'SCPN1-6564' into 'release/1.2' SCPN1-6564 See merge request r-d-technique/tiers/reflex-wms-connector!38	2024-05-16 15:30:52 +00:00
frea	2e0d61310b	SCPN1-6564	2024-05-16 17:00:32 +02:00
freat	f62ccadba5	Release 1.2.16+2	2024-05-13 17:07:22 +02:00
Francis Reat	2c29166ccb	Merge branch 'SCPN1-6535' into 'release/1.2' modifs HUGP See merge request r-d-technique/tiers/reflex-wms-connector!36	2024-05-13 15:05:20 +00:00
Laurie Montant	4534155f2e	modifs HUGP (cherry picked from commit `b3da874dd3`)	2024-05-13 16:42:15 +02:00
freat	5948467818	Release 1.2.16+1	2024-05-02 10:21:58 +02:00
freat	c63e4ff5c8	Release 1.2.15+8	2024-04-24 18:23:25 +02:00
Francis Reat	457cfc85c2	Merge branch 'SCPN1-6461' into 'release/1.2' SCPN1-6461 See merge request r-d-technique/tiers/reflex-wms-connector!33	2024-04-24 16:19:29 +00:00
Laurie Montant	6809b32410	Création de commande (cherry picked from commit `82dfc05cdb`)	2024-04-24 17:49:09 +02:00
freat	37a5e64e83	Release 1.2.15+7	2024-04-11 11:22:18 +02:00
Francis Reat	2f31833bc3	Merge branch 'versio-1.2.15' into 'release/1.2' Modifs RPtoRFX 1701240947 SCPN1-6379 See merge request r-d-technique/tiers/reflex-wms-connector!31	2024-04-11 09:21:32 +00:00
Laurie Montant	cff0f18d8a	modifs ipgmove (cherry picked from commit `6b6cef5332`)	2024-04-11 11:12:11 +02:00
freat	22b78b4ffe	Release 1.2.15+6	2024-04-10 16:57:58 +02:00
Francis Reat	25bf3110e9	Merge branch 'versio-1.2.15' into 'release/1.2' modifs hsrpro SCPN1-6374 See merge request r-d-technique/tiers/reflex-wms-connector!29	2024-04-10 14:56:34 +00:00
Laurie Montant	0a32ead29a	modifs hsrpro (cherry picked from commit `d7c9c72762`)	2024-04-10 16:39:48 +02:00
freat	46a9dc8996	Release 1.2.15+5	2024-04-09 17:45:00 +02:00
Francis Reat	1eb262c91c	Merge branch 'versio-1.2.15' into 'release/1.2' SCPN1-6368 See merge request r-d-technique/tiers/reflex-wms-connector!28	2024-04-09 15:40:44 +00:00
Laurie Montant	2588fda3a8	modifs ipg (cherry picked from commit `87efb21e64`)	2024-04-09 17:16:18 +02:00
freat	d060d3eb10	Release 1.2.15+4	2024-03-27 15:03:49 +01:00
Francis Reat	28e99e9a2b	Merge branch 'version-1.2.15' into 'release/1.2' SCPN1-6284 See merge request r-d-technique/tiers/reflex-wms-connector!26	2024-03-27 14:01:44 +00:00
frea	78b0b467a3	Merge branch 'develop' into version-1.2.15	2024-03-26 14:07:53 +01:00
frea	eca09f2e9e	Merge branch 'develop' of https://gitlab.hardis-group.com/r-d-technique/tiers/reflex-wms-connector into SCPN1-6203	2024-03-26 11:46:09 +01:00
Laurie Montant	cfb8e2ab5a	modifs HUadded	2024-03-26 11:21:10 +01:00
Laurie Montant	d1512d4269	modifs date packing	2024-03-26 11:08:38 +01:00
Laurie Montant	264f9131d0	modifs goods	2024-03-26 10:26:59 +01:00
Laurie Montant	fd9f248619	modifs goods	2024-03-26 10:19:20 +01:00
Laurie Montant	0fff71b759	modifs goods	2024-03-26 10:09:15 +01:00
Laurie Montant	196ab387ac	modifs date	2024-03-26 10:00:03 +01:00
Laurie Montant	5cafa068a7	Modifs date emballage	2024-03-25 18:03:45 +01:00
freat	6f287e878a	Release 1.2.15+3	2024-03-21 17:39:10 +01:00
Francis Reat	c3a23254b1	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!25	2024-03-21 16:32:23 +00:00
frea	c47672b8cc	Merge branch 'develop' into version-1.2.15	2024-03-21 17:27:44 +01:00
Laurie Montant	12483253f1	modifs	2024-03-21 17:04:46 +01:00
Laurie Montant	f0f6e39407	modifs	2024-03-21 16:51:18 +01:00
Laurie Montant	fb0bab260a	modifs	2024-03-21 16:48:52 +01:00
Laurie Montant	040ba2a392	modifs	2024-03-21 16:45:40 +01:00
Laurie Montant	753de14f97	modifs HuAddes	2024-03-21 16:22:59 +01:00
freat	9cdcd2784d	Release 1.2.15+2	2024-03-21 09:38:35 +01:00
Francis Reat	cfe6bddf8d	Merge branch 'version-1.2.15' into 'release/1.2' Version 1.2.15 See merge request r-d-technique/tiers/reflex-wms-connector!24	2024-03-21 07:48:06 +00:00
frea	0cb3cc7dd0	update priority_date	2024-03-21 08:45:48 +01:00
Laurie Montant	59a7783203	modifs priority date	2024-03-20 17:12:01 +01:00
Laurie Montant	03362d6a8b	modifs HuAdded	2024-03-20 17:07:47 +01:00
Laurie Montant	f7125548db	modifs moved	2024-03-20 10:55:37 +01:00
Laurie Montant	92e37e8baa	modifs ipgmoved	2024-03-20 10:42:42 +01:00
@@ -1 +1 @@
 .2.15+1
 .2.16+4