Release 1.2.18+1

adjust json_string

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

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" ||
@@ -31,7 +30,7 @@
             >
             [
             {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :
                <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
@@ -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!="">
+                     reflexMvtStockInterface.ipg_move_type == "120") >
-                  [
+                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-                  {
+                        [
-                  <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
+                        {
-                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                        <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
-                  "datas" :
+                        "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                  <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
+                        "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!="">
+                  <#stop>
-                     <#-- Case of IPG move type volontarilly ignored-->
-                     <#stop " Reference receipt is empty">
-                  <#else>
-                     <#stop>
-                  </#if>
                </#if>
          </#if>
       <#else>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -20,7 +20,11 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
+           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
            "PriorityDate": "${priority_date}",
+           <#else>
+              "PriorityDate": "1970-01-01T00:00:00Z",
+            </#if>
 
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -16,8 +16,8 @@
           "Codes": [
                    <#list lv.id_list as id>
                    {
-                      "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                      "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                      "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                      "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                    }<#sep>,</#sep>
                      </#list>
                    ],

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -39,8 +39,8 @@
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {
-                          "Key":   "${id.logistical_variant_ID_type_code?json_string!""}",
+                          "Key":   "${(id.logistical_variant_ID_type_code!"")?json_string}",
-                          "Value": "${id.logistical_variant_ID_code?json_string!""}"
+                          "Value": "${(id.logistical_variant_ID_code!"")?json_string}"
                        }<#sep>,</#sep>
                          </#list>
                        ],

RFXtoRP_HsrPrepa.ftl

@@ -25,6 +25,7 @@
             <#include "RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl">
             },
             {
+
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitDispatched>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :
@@ -47,6 +48,7 @@
                }
             </#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) />
@@ -76,6 +78,7 @@
             </#if>
                </#list>
             </#list>
+            <#assign refIDHmap ={}>
          ]
    <#else>
       <#stop "no confirmed quantity for the preparation - preparation closed">

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>
-  {
+    <#if !refIDHmap_local[OrderOriginReference]?? >
-    "Header": {
+        <#if refIDHmap_local?size != 0 >
-    "ProjectID": "${projectRP}"
+        ,
-    },
+        </#if>
-    "ID":{
+      <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    "RefID": "${OrderOriginReference}"
+    {
-    },
+      "Header": {
-  "Payload":{
+      "ProjectID": "${projectRP}"
-    "Carrier": {
+      },
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      "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!="">
+    </#if>
-    ,
+  </#list>
-    "CarrierService":"${preparationOrder.transport_grade_code?trim?json_string}"
+  <#assign refIDHmap_local ={}>
-    </#if> -->
-  }
-  }
-  <#sep>,</#sep>
-   </#list>
 ]

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -2,24 +2,28 @@
 <#include "ReflexUtils.ftl">
 [
 <#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]?? >
-    "Header": {
+        <#if refIDHmap?size != 0 >
-      "ProjectID": "${projectRP}"
+        ,
-    },
+        </#if>
-    "ID": {
+        <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}>
-      "RefID": "${despatched_ipg3.carton_number}",
+        {
-      "RefDate": {
+        "Header": {
-        "DateTime": "${dispatched3_datetime}",
+          "ProjectID": "${projectRP}"
-        "AuthorTimeZone": "${time_zone_rfx}"
+           },
-      }
+        "ID": {
-      },
+          "RefID": "${despatched_ipg3.carton_number}",
-      "Payload": { }
+          "RefDate": {
-      }<#sep>,</#sep>
+            "DateTime": "${dispatched3_datetime}",
+            "AuthorTimeZone": "${time_zone_rfx}"
+                }
+           },
+          "Payload": { }
+        }
+     </#if>
       </#list>
-  <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
-  <#sep>,</#sep>
-  </#if>
   </#list>
 ]

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>
-    {
+      <#if !refIDHmap_local[despatched_ipg.hd_number]?? >
-    "Header": {
+          <#if refIDHmap_local?size != 0 >
-      "ProjectID": "${projectRP}"
+          ,
-    },
+          </#if>
-    "ID": {
+          <#assign refIDHmap_local +={despatched_ipg.hd_number,despatched_ipg.hd_number}>
-      "RefID": "${despatched_ipg.hd_number}",
+          {
-      "RefDate": {
+          "Header": {"ProjectID": "${projectRP}"},
-        "DateTime": "${dispatched_datetime}",
+          "ID": {
-        "AuthorTimeZone": "${time_zone_rfx}"
+            "RefID": "${despatched_ipg.hd_number}",
-      }
+            "RefDate": {
-      },
+              "DateTime": "${dispatched_datetime}",
-      "Payload": { }
+              "AuthorTimeZone": "${time_zone_rfx}"
-      }<#sep>,</#sep>
+            }
-      </#list>
+            },
-  <#sep>,</#sep>
+            "Payload": { }
+            }
+      </#if>
+    </#list>
   </#list>
+  <#assign refIDHmap_local ={}>
 ]

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,8 +1,8 @@
 <#include "HfRpConfig.ftl">
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line2>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
-    <#list preparation_line2.despatched_ipg_list as despatched_ipg2>
+    <#list preparation_line.despatched_ipg_list as despatched_ipg>
-    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line2.confirmation_datetime,time_zone_offset_rfx) />
+    <#assign packing_datetime = RfxDateTimetoUTC(preparation_line.confirmation_datetime,time_zone_offset_rfx) />
     {
     "Header": {
       "ProjectID": "${projectRP}"
@@ -12,19 +12,19 @@
       "AuthorTimeZone": "${time_zone_rfx}",
       "DateTime": "${packing_datetime}"
     },
-      <#if despatched_ipg2.carton_number != "000000000000000000">
+      <#if despatched_ipg.carton_number != "000000000000000000">
-        "RefID": "${despatched_ipg2.carton_number}"
+        "RefID": "${despatched_ipg.carton_number}"
       <#else>
-        "RefID": "${despatched_ipg2.hd_number}"
+        "RefID": "${despatched_ipg.hd_number}"
       </#if>
     },
 
     "Payload": {
       "Information" :{
-        <#if despatched_ipg2.carton_number != "000000000000000000">
+        <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg2.carton_type_code}"
+           "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
-           <#if preparation_line2.despatched_cartons_list?? >
+           <#if preparation_line.despatched_cartons_list?? >
-              <#list preparation_line2.despatched_cartons_list?filter(l ->l.carton_number==despatched_ipg2.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}",
@@ -45,9 +45,9 @@
               </#list>
             </#if>
         <#else>
-           "ContainerType": "${despatched_ipg2.hd_type_code?json_string}"
+           "ContainerType": "${despatched_ipg.hd_type_code?json_string}"
-           <#if preparation_line2.despatched_hds_list??>
+           <#if preparation_line.despatched_hds_list??>
-            <#list preparation_line2.despatched_hds_list?filter(j ->j.handling_device_number==despatched_ipg2.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}",
@@ -72,26 +72,26 @@
     "PreparedContents" :[
        {
        "Goods": {
-           "ItemID": "${preparation_line2.item_code?trim?json_string}",
+           "ItemID": "${preparation_line.item_code?trim?json_string}",
-           "LVBranchID": "${preparation_line2.item_lv_code?json_string}",
+           "LVBranchID": "${preparation_line.item_lv_code?json_string}",
-           <#if (despatched_ipg2.ipg_manufacture_date?length != 0) && (despatched_ipg2.ipg_manufacture_date?starts_with("00") == false)>
+           <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-              <#assign priority_date = despatched_ipg2.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+              <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
               "PriorityDate": "${priority_date}",
                 <#else>
-                  <#if (despatched_ipg2.ipg_receipt_date?length != 0) && (despatched_ipg2.ipg_receipt_date?starts_with("00")== false)>
+                  <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-                    <#assign priority_date = despatched_ipg2.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+                    <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
                     "PriorityDate": "${priority_date}",
                       <#else>
-                        <#if (despatched_ipg2.ipg_best_before_date?length != 0) && (despatched_ipg2.ipg_best_before_date?starts_with("00")== false)>
+                        <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-                          <#assign priority_date = despatched_ipg2.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                          <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
                           "PriorityDate": "${priority_date}",
                             <#else>
-                              <#if (despatched_ipg2.ipg_sell_by_date?length != 0) && (despatched_ipg2.ipg_sell_by_date?starts_with("00")== false)>
+                              <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-                                <#assign priority_date = despatched_ipg2.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+                                <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
                                 "PriorityDate": "${priority_date}",
                                   <#else>
-                                    <#if (despatched_ipg2.ipg_use_by_date?length != 0) && (despatched_ipg2.ipg_use_by_date?starts_with("00")== false)>
+                                    <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-                                      <#assign priority_date = despatched_ipg2.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+                                      <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
                                       "PriorityDate": "${priority_date}",
                                         <#else>
                                           <#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
@@ -109,16 +109,16 @@
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
          },
-       "ExecutionflowID": "${preparation_line2.preparation_order_originator_reference?trim?json_string}",
+       "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}",
-        <#if (preparation_line2.pro_originator_reference_line_number!0) != 0>
+        <#if (preparation_line.pro_originator_reference_line_number!0) != 0>
-          "LineID": "${preparation_line2.pro_originator_reference_line_number}",
+          "LineID": "${preparation_line.pro_originator_reference_line_number}",
         <#else>
-          "LineID": "${preparation_line2.pro_line_number!0}",
+          "LineID": "${preparation_line.pro_line_number!0}",
         </#if>
        "ActorID": "${preparationOrder.physical_depot_code?trim?json_string}",
        "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",
-            "Value": ${despatched_ipg2.quantity_lvs}
+            "Value": ${despatched_ipg.quantity_lvs}
        }
 
       }

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -16,7 +16,7 @@
  "Payload": {
 
 "IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? >
+  <#if preparation_line.despatched_hds_list?? && preparation_line.despatched_hds_list[0]??>
       ,
     "Information": {
       "ContainerType": "${preparation_line.despatched_hds_list[0].hd_type_code}",

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>
-  {
+  <#if !refIDHmap_local[OrderOriginReference]?? >
-    "Header": {
+      <#if refIDHmap_local?size != 0 >
-    "ProjectID": "${projectRP}"
+    ,
-    },
+    </#if>
-    "ID":{
+    <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}>
-    "RefID": "${OrderOriginReference}"
+    {
-    },
+      "Header": {
-  "Payload":{
+      "ProjectID": "${projectRP}"
-    "Carrier": {
+      },
-        "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      "ID":{
+      "RefID": "${OrderOriginReference}"
+      },
+    "Payload":{
+      "Carrier": {
+          "ActorID":"${preparationOrder.load_data.carrier_code?trim?json_string}"
+      }
     }
-  }
+    }
-  }
+  </#if>
-    <#sep>,</#sep>
+  </#list>
-   </#list>
+  <#assign refIDHmap_local ={}>
 ]

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>
 

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -52,23 +52,23 @@
           <#else>
             "Actor":
              {
-              "Name" : "${preparation_order.address.name_or_company_name?json_string!""}",
+              "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}",
               "Address" :
                 {
-                 "City" : "${preparation_order.address.post_code_area_name?json_string!""}",
+                 "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}",
                  "CountryCode" : "${preparation_order.address.iso_country_code!""}",
                  "PostalCode" : "${preparation_order.address.postal_code!""}",
-                 "StreetAddressOne" : "${preparation_order.address.street_and_number_and_po_box?json_string!""}",
+                 "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}",
-                 "StreetAddressTwo" : "${preparation_order.address.additional_address_data_1?json_string!""}",
+                 "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}",
-                 "StreetAddressThree" : "${preparation_order.address.additional_address_data_2?json_string!""}"
+                 "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}"
                  }
                   },
               "Contact" :
                 {
-                  "FirstName" : "${preparation_order.address.first_name?json_string!""}",
+                  "FirstName" : "${(preparation_order.address.first_name!"")?json_string}",
-                  "LastName" : "${preparation_order.address.last_name?json_string!""}",
+                  "LastName" : "${(preparation_order.address.last_name!"")?json_string}",
-                  "Emails" : ${splitEmailsIntoArray(preparation_order.address.mail_address!""?json_string)},
+                  "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)},
-                  "Phones" : ["${preparation_order.address.mobile_phone_number?json_string!""}","${preparation_order.address.land_line_phone_number?json_string!""}", "${preparation_order.address.fax_number?json_string!""}" ]
+                  "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ]
                 }
           </#if>
          },

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?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                  <#if (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?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                    <#assign line_detail_priority_date = line.line_detail[0].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">

RFXtoRP_PrepOrder_ShipFromAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 
 	  "Payload": {

RFXtoRP_Receipt_ShipToAcked.ftl

@@ -4,7 +4,7 @@
 	    "ProjectID": "${projectRP}"	   
 	  },
 	  "ID": {
-	       "RefID": "${id.refid}"
+	       "RefID": "${id.refid?json_string}"
 	  },
 	   
 	  "Payload": {

RPtoRFX_PrepOrder.ftl

@@ -1,7 +1,21 @@
 <#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}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -9,15 +23,15 @@
 		"physical_depot_code": "${executionflow.ShipFrom.ActorID}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" : 
+	"payload" :
 	 {
-		"originator_reference": "${executionflow.OrderID}",
+		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
-		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
+		"end_consignee_code": "${actorID}",
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
-		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+			"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}",
@@ -30,53 +44,66 @@
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
-		  	},
+		  	}
-		<#if executionflow.ShipTo.ActorID == ""> 
+		<#if actorID == defaultactor >
-		"address": {
+		,
-				"first_name": "${executionflow.ShipTo.Contact.FirstName!""?json_string}",
+			"address": {
-				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
+				"type_code": "${typecode}",
-				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
+				"title_code" : "${titlecode}",
-				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
+				"contact_type_code" : "${contacttypecode}",
-				"street_and_number_and_po_box": "${executionflow.ShipTo.Actor.Address.StreetAddressOne!""?json_string}",
+				"address_type_code" : "${adresstypecode}",
-				"additional_address_data_1": "${executionflow.ShipTo.Actor.Address.StreetAddressTwo!""?json_string}",
+				"first_name": "${(executionflow.ShipTo.Contact.FirstName!"")?json_string}",
-				"additional_address_data_2": "${executionflow.ShipTo.Actor.Address.StreetAddressThree!""?json_string}",
+				"last_name" :"${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"postal_code": "${executionflow.ShipTo.Actor.Address.PostalCode!""}",
+				"name_or_company_name" : "${(executionflow.ShipTo.Contact.FirstName!"")?json_string} ${(executionflow.ShipTo.Contact.LastName!"")?json_string}",
-				"iso_country_code": "${executionflow.ShipTo.Actor.Address.CountryCode!""}"
+				<#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!"")?json_string}",
+				"post_code_area_name" : "${(executionflow.ShipTo.Actor.Address.City!"")?json_string}",
+				"iso_country_code": "${(executionflow.ShipTo.Actor.Address.CountryCode!"")?json_string}"
+			}
 		</#if>
-		<#if executionflow.Lines??> 
+		<#if executionflow.Lines??>
-		"line_list": [
+		 ,
-		<#list executionflow.Lines as line>
+			"line_list": [
-			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
+			<#list executionflow.Lines as line>
-			<#if line.MetaData??>
+				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
-			<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#if line.MetaData??>
-			</#if>
+				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
-			<#if line.RequestedContent.Goods.SegmentationKeys??>
+				</#if>
-			<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#if line.RequestedContent.Goods.SegmentationKeys??>
-			</#if>
+				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
-			<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
+				</#if>
-		{
+				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
-	  	    "originator_reference_line_number": ${line.LineID?number},
+				{
-			"item_code": "${line.RequestedContent.Goods.ItemID!""}",
+				"originator_reference_line_number": ${line.LineID?number},
-			"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
+				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
-			"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
+				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
-			"owner_code_to_prepare" :"${owner_code_to_prepare}",
+				"base_lv_quantity_to_prepare": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
-			"grade_code_to_prepare" :"${grade_code_to_prepare}",
+				"owner_code_to_prepare" :"${owner_code_to_prepare}",
-			"input_order_data": "false",
+				"grade_code_to_prepare" :"${grade_code_to_prepare}",
-			"batch_1": "${batch_1}",
+				"input_order_data": "false",
-			"base_lv_quantity": "true",
+				"batch_1": "${batch_1}",
-			"any_lv": "false"	
+				"base_lv_quantity": "true",
-			<#-- 
+				"any_lv": "false"
-      		"stock_reservation": "false",
+				<#--
-            "forced_priority_date_min_lead_time": "false",
+				"stock_reservation": "false",
-            "temp_substitution_possible": "false",
+				"forced_priority_date_min_lead_time": "false",
-            "substitution_possible": "false"
+				"temp_substitution_possible": "false",
-			-->
+				"substitution_possible": "false"
-            
+				-->
-		}<#sep>,</#sep>
+
-		</#list>
+				}
-		</#if>	     	
+			<#sep>,</#sep>
-		]	  
+			</#list>
+			]
+		</#if>
+
 	 }
  }
-	

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

RPtoRFX_Receipt.ftl

@@ -1,7 +1,7 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
 
 {
-	"id" : {"refid" : "${executionflow.OrderID}"},
+	"id" : {"refid" : "${executionflow.OrderID?json_string}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
 	"method" : "POST",
 	"uri_substitutions": {
@@ -11,7 +11,7 @@
 	},
 	"payload" : 
 	 {
-		"receipt_reference": "${executionflow.OrderID}",
+		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}", 
 		"work_mode_code" :     "${work_mode_code}",
@@ -25,9 +25,10 @@
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
-		"dock_occupation_duration": 1,
+		"dock_occupation_duration": 1
 		  
 		<#if executionflow.Lines??> 
+		,
 			"line_list": [
 			<#list executionflow.Lines as line>
 
@@ -61,7 +62,6 @@
 			}<#sep>,</#sep>
 		</#list> 	     	
 		]
-		</#if>
+		</#if>		  
-		  
 	 }
  }

VERSION

@@ -1 +1 @@
-1.3.0-SNAPSHOT
+1.2.18+1