Merge branch 'SCPN1-7302' into 'release/1.2'

modifs

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

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -1,13 +1,17 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 [
-
+<#assign dispatched_datetime4 = RfxDateTimetoUTC(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_offset_rfx) />
   {
     "Header": {
     "ProjectID": "${projectRP}"
     },
     "ID": {
 			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      "RefDate": {
+              "DateTime": "${dispatched_datetime4}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+           }
       },
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000">

RPtoRFX_PrepOrder.ftl

@@ -89,7 +89,7 @@
 				"owner_code_to_prepare" :"${owner_code_to_prepare}",
 				"grade_code_to_prepare" :"${grade_code_to_prepare}",
 				"input_order_data": "false",
-				"batch_1": "${batch_1}",
+				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
 				<#--

RPtoRFX_Receipt.ftl

@@ -9,16 +9,16 @@
 		"physical_depot_code": "${executionflow.ShipTo.ActorID!""}",
 		"originator_code": "${originator_code}"
 	},
-	"payload" : 
+	"payload" :
 	 {
 		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
-		"receipt_reason_code": "${receipt_reason_code}", 
+		"receipt_reason_code": "${receipt_reason_code}",
 		"work_mode_code" :     "${work_mode_code}",
 		"original_code"  : "${executionflow.ShipFrom.ActorID}",
 		"carrier_code"   : "${executionflow.Carrier.ActorID!""}",
 
-		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??> 
+		<#if executionflow.RequestedMilestones?? && executionflow.RequestedMilestones.RequestedDeliveryDateTime??>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(executionflow.RequestedMilestones.RequestedDeliveryDateTime.DateTime,time_zone_rfx)}",
 		<#else>
 			"receipt_datetime":  "${DateTimeUTCtoRfxLocale(.now?iso_utc?string,time_zone_rfx)}",
@@ -26,8 +26,8 @@
 		"carrier_appointment_made": "false",
 		"receipt_in_cross_docking": "false",
 		"dock_occupation_duration": 1
-		  
-		<#if executionflow.Lines??> 
+
+		<#if executionflow.Lines??>
 		,
 			"line_list": [
 			<#list executionflow.Lines as line>
@@ -47,7 +47,7 @@
 				"level_1_quantity": ${line.RequestedMetrics.QuantityInBaseLV.Value!0},
 				"owner_code": "${owner_code}",
 				"grade_code": "${grade_code}",
-				"batch_1": "${batch_1!""}",					
+				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
 			   		<#--"held_for_check": "false",
 			   		"held _for_repacking": "false",
@@ -60,8 +60,8 @@
   				} -->
 
 			}<#sep>,</#sep>
-		</#list> 	     	
+		</#list>
 		]
-		</#if>		  
+		</#if>
 	 }
  }