Release 1.3.0+1

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -27,8 +27,6 @@
          <#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}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
          </#if>
 
        <#-- Segmentation keys inclusion -->

RFXtoRP_HsaIpgMove.ftl

@@ -12,8 +12,8 @@
       <#assign reflexMvtStockInterface = JsonUtil.jsonToMap(dataRfx)>
 
       <#-- 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 -->
       <#if reflexMvtStockInterface.ipg_move_type == "130" ||
            reflexMvtStockInterface.ipg_move_type == "200" ||
@@ -34,14 +34,15 @@
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
               <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">
+
          }
          ]
          <#else>
             <#-- IPG moves translated into goods received (all type of  receipt)  -->
-               <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
+            <#if reflexMvtStockInterface.ipg_move_type == "100" ||
             reflexMvtStockInterface.ipg_move_type == "110" ||
-                     reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            reflexMvtStockInterface.ipg_move_type == "120"
+            >
             [
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@@ -52,9 +53,6 @@
             ]
             <#else>
                <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
-                     </#if>
-               <#else>
                <#stop>
             </#if>
          </#if>

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -24,11 +24,7 @@
     "Payload": {
       "Goods": {
         "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        <#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">,

RFXtoRP_HsaProStatus.ftl

@@ -17,7 +17,6 @@
       <#assign preparationStatusInterface = JsonUtil.jsonToMap(dataRfx) />
       [
          <#--**Pick batch runned (200) **-->
-         <#if  preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
          <#if preparationStatusInterface.preparation_status_type == "100" && preparationStatusInterface.preparation_status_code == "200" >
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowPreparationExpected>
@@ -64,9 +63,6 @@
                </#if>
             </#if>
          </#if>
-         <#else>
-            <#stop "PRO reference is empty">
-         </#if>
       ]
       <#break>
 

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>
@@ -47,9 +47,8 @@
          }
          </#if>
 
-            <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) 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,14 +73,18 @@
           <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
          }
          </#if>
+
             </#list>
+         <#--  <#sep>,</#sep> -->
           </#list>
+
+
        ]
+
 <#else>
     <#stop "no confirmed quantity for the preparation - preparation closed">
 </#if>
 
-
 <#break>
 <#case "D">
 <#-- *********************************************** Action = DELETE ******************** -->

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

@@ -1,14 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-   <#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}"
+    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
     },
   "Payload":{
     "Carrier": {
@@ -21,6 +20,4 @@
     </#if> -->
   }
   }
-  <#sep>,</#sep>
-   </#list>
 ]

RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl

@@ -1,25 +1,23 @@
 <#include "HfRpConfig.ftl">
 <#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>
+<#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_ipg3.carton_number}",
+      "RefID": "${despatched_ipg.carton_number}",
       "RefDate": {
-        "DateTime": "${dispatched3_datetime}",
+        "DateTime": "${dispatched_datetime}",
         "AuthorTimeZone": "${time_zone_rfx}"            
       }
       },
       "Payload": { }
       }<#sep>,</#sep>
       </#list>
-  <#if preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000")?size!=0 >
   <#sep>,</#sep>
-  </#if>
   </#list> 
 ]

RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl

@@ -2,7 +2,7 @@
 <#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?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
     <#list preparation_line.despatched_ipg_list as despatched_ipg>
     { 
     "Header": {

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,17 +1,13 @@
 <#include "HfRpConfig.ftl">
+
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line>
+  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) 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>

RFXtoRP_HsrPrepa_HandlingunitHUsAdded.ftl

@@ -1,15 +1,12 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
+ 
  { 
     "Header": {
     "ProjectID": "${projectRP}"     
     },
     "ID": {
-      "RefDate": {
-      "AuthorTimeZone": "${time_zone_rfx}",
-      "DateTime": "${HUadded_packing_datetime}"
-    },
     "RefID": "${despatched_ipg.hd_number}"
   },
 

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

@@ -1,14 +1,13 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-  <#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}"
+    "RefID": "${preparationOrder.preparation_line_lst[0].preparation_order_originator_reference?trim?json_string}"
     },
   "Payload":{
     "Carrier": {
@@ -16,6 +15,4 @@
     }
   }
   }
-    <#sep>,</#sep>
-   </#list>
 ]

RFXtoRP_HsrPro.ftl

@@ -16,18 +16,16 @@
       <#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>
@@ -38,7 +36,7 @@
         <#else>
           <#stop "PRO reference is empty">
         </#if>
-
+         }
 
        ]
   <#break>
@@ -48,16 +46,12 @@
         <#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_HsrReceiptList.ftl

@@ -45,7 +45,6 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         <#if receipt.receipt_confirmed == "true" >
         {
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
@@ -68,12 +67,10 @@
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
           <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+
           }
         </#if>
         </#if>
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
        ]
       <#break>
 
@@ -82,17 +79,14 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
          {
 
           <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
           "apiReflexPlatformID" :  "${apiReflexPlatformID}",
           "datas" :
           <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+
          }
-        <#else>
-          <#stop "Receipt reference is empty">
-        </#if>
        ]
          <#break>
 

RPtoRFX_ExecutionflowEvent.ftl

@@ -2,8 +2,6 @@
 <#-- input        : message RFX  -->
 <#-- project      : projectId in ReflexPlatform  -->
 <#-- organisation : organisationtId in ReflexPlatform  -->
-<#include "HfRpConfig.ftl">
-<#include "ReflexUtils.ftl">
 
 <#assign eventRP = JsonUtil.jsonToMap(input)> 
 <#assign projectRP = project>

RPtoRFX_PrepOrder.ftl

@@ -1,18 +1,7 @@
 <#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>
+
+<#assign aDateTime = .now>
+
 
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
@@ -27,11 +16,11 @@
 	 {
 		"originator_reference": "${executionflow.OrderID}",
 		"preparation_type_code": "${preparation_type_code}",
-		"end_consignee_code": "${actorID}",
+		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"requested_delivery_date_type": "${requested_delivery_date_type}",
 		"consolidated_delivery": "${consolidated_delivery_flag}",
@@ -45,26 +34,16 @@
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
 		  	},
-		<#if actorID == defaultactor >
+		<#if executionflow.ShipTo.ActorID == ""> 
 		"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}",
-				"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>
+				"last_name" :"${executionflow.ShipTo.Contact.Lastname!""?json_string}",
+				"mail_address": "${executionflow.ShipTo.Actor.Emails[0]!""}",
+				"mobile_phone_number": "${executionflow.ShipTo.Actor.Phones[0]!""}",
 				"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>
@@ -97,10 +76,10 @@
             "substitution_possible": "false"
 			-->
             
-				}
-			<#sep>,</#sep>
+		}<#sep>,</#sep>
 		</#list>
 		</#if>	     	
 		]	  
 	 }
  }
+	

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -23,22 +23,8 @@
 <#assign protected_flag ="false"/>
 <#assign automatic_generation_flag ="false"/>
 <#assign apt_with_end_consignee_flag="false"/>
-
-<#-- 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>-->
+<#assign load_grouping = "DEFAUT"/>
+
 
 
 

RPtoRFX_Receipt.ftl

@@ -1,5 +1,5 @@
 <#include "RPtoRFX_Receipt_DefaultHeaderData.ftl">
-
+<#assign aDateTime = .now>
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts",
@@ -19,9 +19,9 @@
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
 
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
+			"receipt_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
 		<#else>
-			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
+			"receipt_datetime":  "${aDateTime?iso_utc}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",

ReflexUtils.ftl

@@ -5,10 +5,6 @@
   <#return ((rfxdatetime + offset)?datetime.iso?iso_utc)>
 </#function>
 
-<#function DateTimeUTCtoRfxLocale dateutc locale >
-  <#return dateutc?datetime.iso?iso_nz(locale)>
-</#function>
-
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- Split email reflex into json array string                                               -->
 <#--  Example : splitemail "john.doe@hardis-group.com,;         name@hardis-group.com"       -->

VERSION

@@ -1 +1 @@
-1.2.15+8
+1.3.0+1