Release 1.2.15+1

Version 1.2.15

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

RFXtoRP_HsaIpgMove.ftl

@@ -12,6 +12,7 @@
       <#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 -->
@@ -34,15 +35,13 @@
             "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"
+                     reflexMvtStockInterface.ipg_move_type == "120") && reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
-            >
                   [
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@@ -52,10 +51,14 @@
                   }
                   ]
                <#else>
+                  <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                      <#-- Case of IPG move type volontarilly ignored-->
+                     <#stop " Reference receipt is empty">
+                  <#else>
                      <#stop>
                   </#if>
                </#if>
+         </#if>
       <#else>
          <#-- cases of an IPG move with quantity = 0 (weight modification)-->
          <#stop>

RFXtoRP_HsaProStatus.ftl

@@ -17,6 +17,7 @@
       <#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>
@@ -63,6 +64,9 @@
                   </#if>
                </#if>
             </#if>
+         <#else>
+            <#stop "PRO reference is empty">
+         </#if>
       ]
       <#break>
 

RFXtoRP_HsrPrepa.ftl

@@ -16,7 +16,7 @@
 <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
-<#if	preparationOrder.total_lv_validated !=0>
+   <#if	preparationOrder.total_lv_validated !=0>
          [
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -31,7 +31,7 @@
             <#include "RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl">
             }
 
-         <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
+            <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="">
                ,
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCarrierUpdated>
@@ -47,7 +47,7 @@
                }
             </#if>
 
-          <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+            <#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 despatched_ipg.consignment_unit_id!="">
                ,
@@ -73,17 +73,14 @@
                <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl">
                }
             </#if>
-
                </#list>
             <#--  <#sep>,</#sep> -->
             </#list>
-
-
          ]
-
+   <#else>
-<#else>
       <#stop "no confirmed quantity for the preparation - preparation closed">
-</#if>
+   </#if>
+
 
 <#break>
 <#case "D">

RFXtoRP_HsrPrepa_CarrierUpdated.ftl

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

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -1,7 +1,7 @@
 <#include "HfRpConfig.ftl">
 
 [
-  <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line>
+  <#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": {

RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl

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

RFXtoRP_HsrPro.ftl

@@ -46,12 +46,18 @@
         <#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,6 +45,7 @@
       <#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>
@@ -67,10 +68,12 @@
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
               "datas" :
               <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-
             }
             </#if>
           </#if>
+        <#else>
+          <#stop "Receipt reference is empty">
+        </#if>
        ]
       <#break>
 
@@ -79,14 +82,17 @@
         <#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,6 +2,8 @@
 <#-- 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,8 +1,5 @@
 <#include "RPtoRFX_PrepOrder_DefaultHeaderData.ftl">
 
-<#assign aDateTime = .now>
-
-
 {
 	"id" : {"refid" : "${executionflow.OrderID}"},
 	"route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders",
@@ -18,9 +15,9 @@
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${executionflow.ShipTo.ActorID!""}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
-		"requested_delivery_start_datetime":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+		"requested_delivery_start_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-		"requested_delivery_start_datetime":  "${aDateTime?iso_utc}",
+		"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}",

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":  "${executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime}",
+			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
-			"receipt_datetime":  "${aDateTime?iso_utc}",
+			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
 		</#if>
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",

ReflexUtils.ftl

@@ -5,6 +5,10 @@
   <#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.14+1
+1.2.15+1