Release 1.2.17+1

(cherry picked from commit e8510d079c)

RFXtoRP_HsaIpgMove.ftl

@@ -30,7 +30,7 @@
             >
             [
             {
-            <#assign apiReflexPlatformID = ApiReflexPlatformID.StockMoved>
+            <#assign apiReflexPlatformID = ApiReflexPlatformID.MovementCreated>
             "apiReflexPlatformID" :  "${apiReflexPlatformID}",
             "datas" :
                <#include "RFXtoRP_HsaIpgMove_StockMoved.ftl">

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_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,25 +2,28 @@
 <#include "ReflexUtils.ftl">
 [
 <#assign dispatched3_datetime = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
-<#assign generatedComa = false>
+
   <#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 generatedComa >,</#if>
+        <#if refIDHmap?size != 0 >
-    {
+        ,
-    "Header": {
+        </#if>
-      "ProjectID": "${projectRP}"
+        <#assign refIDHmap += {despatched_ipg3.carton_number,despatched_ipg3.carton_number}>
-    },
+        {
-    "ID": {
+        "Header": {
-      "RefID": "${despatched_ipg3.carton_number}",
+          "ProjectID": "${projectRP}"
-      "RefDate": {
+           },
-        "DateTime": "${dispatched3_datetime}",
+        "ID": {
-        "AuthorTimeZone": "${time_zone_rfx}"
+          "RefID": "${despatched_ipg3.carton_number}",
-      }
+          "RefDate": {
-      },
+            "DateTime": "${dispatched3_datetime}",
-      "Payload": { }
+            "AuthorTimeZone": "${time_zone_rfx}"
-      }
+                }
-	  <#assign generatedComa = true>
+           },
+          "Payload": { }
+        }
+     </#if>
       </#list>
   </#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

@@ -22,7 +22,7 @@
     "Payload": {
       "Information" :{
         <#if despatched_ipg.carton_number != "000000000000000000">
-           "ContainerType": "${despatched_ipg.carton_type_code}"
+           "ContainerType": "${despatched_ipg.carton_type_code?json_string}"
            <#if preparation_line.despatched_cartons_list?? >
               <#list preparation_line.despatched_cartons_list?filter(l -> l?? && l.carton_number==despatched_ipg.carton_number) as dimensionCarton>
               ,

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

RPtoRFX_PrepOrder.ftl

@@ -15,7 +15,7 @@
 </#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": {
@@ -25,7 +25,7 @@
 	},
 	"payload" :
 	 {
-		"originator_reference": "${executionflow.OrderID}",
+		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
 		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
@@ -44,8 +44,9 @@
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
-		  	},
+		  	}
 		<#if actorID == defaultactor >
+		,
 			"address": {
 				"type_code": "${typecode}",
 				"title_code" : "${titlecode}",
@@ -66,9 +67,10 @@
 				"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 ******** -->
@@ -100,7 +102,8 @@
 				}
 			<#sep>,</#sep>
 			</#list>
+			]
 		</#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.2.16+3
+1.2.17+1