Release 1.2.12+1

Modifs RPtoRFX 2301241050

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

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -25,7 +25,9 @@
          "ItemID": "${stock.item_code}",  
          "LVBranchID": "${stock.item_logistical_variant_code}",
          <#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>
          
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">

RFXtoRP_HsaIpgMove.ftl

@@ -45,7 +45,7 @@
           >
          [
          {
-           <#assign apiReflexPlatformID = ApiReflexPlatformID.GoodsReceived> 
+           <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived> 
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :         
            <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
@@ -58,7 +58,7 @@
       </#if>
       </#if>
       <#else>
-      <#-- cases of an IPG move with quantity = 0 (weight modification))--> 
+      <#-- cases of an IPG move with quantity = 0 (weight modification)--> 
          <#stop "move ignored quantity = 0">
          </#if>
       <#break>

RFXtoRP_HsrPrepa.ftl

@@ -29,52 +29,22 @@
          "apiReflexPlatformID" :  "${apiReflexPlatformID}",
          "datas" :         
           <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">          
-         },
-
-         <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-          {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl">     
-         },
-         {
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl">          
-         },
-         </#if>
-
-        
+         }
           <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
           <#list preparation_line.despatched_ipg_list as despatched_ipg>
+          <#if despatched_ipg.consignment_unit_id != ""> 
+            ,
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled> 
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :         
             <#include "RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl">          
             }
-
-          <#if despatched_ipg.carton_number != "000000000000000000" && despatched_ipg.carton_number!=despatched_ipg.hd_number >
-          ,
-         {
-           
-
-          <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitHUsAdded> 
-         "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-         "datas" :         
-          <#include "RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl">
-         }
           </#if>
-         <#sep>,</#sep>
-            </#list>
-           <#sep>,</#sep>
-          </#list>
-
  
+            </#list>
+          </#list>
        ]
-      
 <#else>
     <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,23 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
-  { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code}"
-    }
-    <#-- Add transport grade code 
-    <#if preparationOrder.transport_grade_code!="">
-    ,
-    "CarrierService":"${preparationOrder.transport_grade_code}"
-    </#if> -->
-  }
-  }
-]

RFXtoRP_HsrPrepa_GoodsPrepared.ftl

@@ -19,26 +19,11 @@
       "Information" :{
         <#if despatched_ipg.carton_number != "000000000000000000"> 
            "ContainerType": "${despatched_ipg.carton_type_code}"
-           <#-- <#if preparation_line.despatched_cartons_list?? >
-              ,  
-              "Length": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${preparation_line.despatched_cartons_list.overall_depth}"
-              },
-              "Weight": {
-              "Unit": "${weight_unit_rfx}",
-              "Value": "${preparation_line.despatched_cartons_list.carton_gross_weight}"
-              },
-              "Width": {
-              "Unit": "${length_unit_rfx}",
-              "Value": "${preparation_line.despatched_cartons_list.overall_width}"
-              } 
-            </#if> -->
         <#else>
            "ContainerType": "${despatched_ipg.hd_type_code}"
         </#if>
-      },
       
+        },
      <#--  HU Metadata inclusin inclusion -->
     <#include "RFXtoRP_HsrPrepa_GoodsPrepared_HandlingUnitMetadata.ftl">  
     ,
@@ -48,29 +33,28 @@
            "ItemID": "${preparation_line.item_code}",
            "LVBranchID": "${preparation_line.item_lv_code}",
            <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_manufacture_date) /> --> 
               <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
               "PriorityDate": "${priority_date}",
              <#else>
             <#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_receipt_date) /> -->
               <#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
               "PriorityDate": "${priority_date}",
              <#else>
              <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_best_before_date) /> -->
               <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
               "PriorityDate": "${priority_date}",
              <#else>
              <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_sell_by_date) /> -->
                <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
               "PriorityDate": "${priority_date}",
              <#else>
               <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-              <#--  <#assign priority_date = JsonUtil.createUTCDateTime(despatched_ipg.ipg_use_by_date) /> -->
               <#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)>
+              <#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc /> 
+              "PriorityDate": "${priority_date}",
              <#else>
                 "PriorityDate": "error_date",
           </#if>           
@@ -78,6 +62,7 @@
           </#if>             
           </#if>           
           </#if> 
+          </#if> 		  
        
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">
@@ -93,7 +78,6 @@
             "LVID": "${quantity_in_base_lv_RP_Cst}",
             "Value": ${despatched_ipg.quantity_lvs}           
        }
-
       }
       ]
     }

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -1,37 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
- { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID": {
-    "RefID": "${despatched_ipg.hd_number}"
-  },
-
- "Payload": {
-
-"IncludedHandlingunitIDs":  [ "${despatched_ipg.carton_number}" ]
-  <#if preparation_line.despatched_hds_list?? >
-      ,
-    "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>
-
- }
- }
-]

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,18 +0,0 @@
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
-[
- 
-  { 
-    "Header": {
-    "ProjectID": "${projectRP}"     
-    },
-    "ID":{
-    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference}"
-    },
-  "Payload":{
-    "Carrier": {
-        "ActorID":"${preparationOrder.load_data.carrier_code}"
-    }
-  }
-  }
-]

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -7,15 +7,7 @@
     "ProjectID": "${projectRP}"     
     },
     "ID": {
-		<#if despatched_ipg.consignment_unit_id!="">
       "RefID": "${despatched_ipg.consignment_unit_id}"
-		<#else>
-			<#if despatched_ipg.carton_number != "000000000000000000"> 
-				"RefID": "${despatched_ipg.carton_number}"
-			<#else>
-				"RefID": "${despatched_ipg.hd_number}"
-			</#if>
-		</#if>	
       },
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000"> 
@@ -23,13 +15,6 @@
       <#else>
       "HandlingunitID": "${despatched_ipg.hd_number}"
       </#if>
-	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
-    ,
-	    "HUCarrier":{
-	    "ActorID": "${preparationOrder.load_data.carrier_code}"
-	  }
-
-	  </#if>
     }
   }
 ]

RPtoRFX_PrepOrder.ftl

@@ -67,13 +67,13 @@
 			"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",
-            "base_lv_quantity": "true",
+            "substitution_possible": "false"
 			-->
             
 		}<#sep>,</#sep>

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -2,10 +2,18 @@
 
 <#-- How to use MD Header map
     Example : 
-    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"]!""/>
+    <#assign pick_sequence_code = Header_MetaData_Map["OrderType"].String!""/>
+
+    If your MD is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->
 
 
+
 <#assign activity_code = ""/>
 <#assign originator_code = ""/>
 <#assign preparation_type_code = ""/>

RPtoRFX_PrepOrder_DefaultLineData.ftl

@@ -3,7 +3,14 @@
 
 <#-- How to use MD or SK map
     Example : 
-    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"]!""/>
+    <#assign owner_code_to_prepare = SegmentationKeys_Map["Owner"].String!""/>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->
 
 <#assign owner_code_to_prepare = SegmentationKeys_Map["myOwner"]!""/>

RPtoRFX_Receipt_DefaultHeaderData.ftl

@@ -2,7 +2,14 @@
 
 <#-- How to use MD Header map
     Example : 
-    <#assign receipt_type = Header_MetaData_Map["OrderType"]!""/>
+    <#assign receipt_type = Header_MetaData_Map["OrderType"].String!""/>
+
+    If your MD is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->
 
 <#assign activity_code = ""/>

RPtoRFX_Receipt_DefaultLineData.ftl

@@ -3,7 +3,14 @@
 
 <#-- How to use MD or SK map
     Example : 
-    <#assign owner_code = SegmentationKeys_Map["Owner"]!""/>
+    <#assign owner_code = SegmentationKeys_Map["Owner"].String!""/>
+
+    If your SK is :
+        Boolean : .Bool
+        Float : .Float
+        Timestamp : .Timestamp.DateTime or .Timestamp.AuthorTimeZone
+        Int : .Int
+        String : .String
 -->
 
 

ReflexUtils.ftl

@@ -15,12 +15,14 @@
 <#function splitEmailsIntoArray emails >
 <#local str = "[">
 <#list emails?split(';|,| ',"r")?filter(l -> l != "") as email>
+<#if email?matches("^[\\w-\\.]+@([\\w-]+\\.)+[\\w-]{2,4}$")>
 <#if str != "[">		  
 <#local str += ",">
 </#if>
 <#local str += "\"">
 <#local str += email>
 <#local str += "\"">
+</#if>  
 </#list>
 <#local str += "]">
 <#return (str)>

VERSION

@@ -1 +1 @@
-1.3.0-SNAPSHOT
+1.2.12+1