Release 1.2.63+1

Release-1.2-V14 into release/1.2

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

ActorPrefix.ftl

@@ -38,7 +38,7 @@
     <#local depot = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local depot = actor[4..]>
+        <#local depot = actor[4..]>
     <#else>
         <#local depot = actor>
     </#if>
@@ -83,7 +83,7 @@
     <#local supplier = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local supplier = actor[4..]>
+        <#local supplier = actor[4..]>
     <#else>
         <#local supplier = actor>
     </#if>
@@ -126,7 +126,7 @@
     <#local carrier = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local carrier = actor[4..]>
+        <#local carrier = actor[4..]>
     <#else>
         <#local carrier = actor>
     </#if>
@@ -169,7 +169,7 @@
     <#local consignee = actor>
   <#else>
     <#if actor?length gt 4>
-    <#local consignee = actor[4..]>
+        <#local consignee = actor[4..]>
     <#else>
         <#local consignee = actor>
     </#if>

RFXtoRP_HsaDesPatch.ftl

@@ -17,7 +17,7 @@
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	  <#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HsaDespNt.ftl

@@ -17,7 +17,7 @@
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -12,6 +12,7 @@
          "RefID": "${reflexMvtStockInterface.hd_number?trim?json_string}"
     },
     "Payload": {
+    "Reference":"${reflexMvtStockInterface.hd_number?trim?json_string}",
     "ReceivedContents" :[
        {
        "DateTime": {

RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl

@@ -1,6 +1,6 @@
 
 
-"SegmentationSelections": [
+"SegmentationKeys": [
   ]
 
 

RFXtoRP_HsrLoadInfo.ftl

@@ -18,14 +18,14 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
        <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE *************************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
        <#stop>
-       <#break>
+	<#break>
 
     <#default>
           <#stop >

RFXtoRP_HsrPackBranch.ftl

@@ -17,7 +17,7 @@
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HsrPackOrder.ftl

@@ -17,7 +17,7 @@
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE ******************** -->
@@ -25,7 +25,7 @@
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
       <#stop>
-      <#break>
+	<#break>
     <#default>
           <#stop >
 </#switch>

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -22,6 +22,11 @@
     },
 
     "Payload": {
+      <#if despatched_ipg.carton_number != "000000000000000000">
+        "Reference": "${despatched_ipg.carton_number}",
+      <#else>
+        "Reference": "${despatched_ipg.hd_number}",
+      </#if>
       "Information" :{
         <#if despatched_ipg.carton_number != "000000000000000000">
            "ContainerType": "${despatched_ipg.carton_type_code?json_string}"

RFXtoRP_PlatformLogCreate.ftl

@@ -27,7 +27,7 @@
 	      },
 	    "UserMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...'),
+	      "Label": ${strJsonBody?truncate(32000,'...')},
 	      "Params": []
 	    },
 	    "DetailElements": [],

RPtoRFX_AppointmentEvent.ftl

@@ -27,6 +27,11 @@
 	<#case "Updated">
 	    <#assign AddComma = false />
 		<#assign appointment = eventRP.data />
+
+        <#-- processing is stopped because the Updated event contains no relevant change to forward to the WMS.	-->
+	    <#if !(eventRP.commissionsUpdated!false) && !(eventRP.reasonUpdated!false) && !(eventRP.slotUpdated!false) && !(eventRP.carrierInformationUpdated!false)>
+			<#stop>
+		</#if>
 	[
 		<#if appointment?? && (!(appointment.WMSCreated??) ||  !appointment.WMSCreated) &&  appointment.Status?? && appointment.Status.Current?? && appointment.Status.Current.StatusCode?? && appointment.Status.Current.StatusCode == AppointmentStatusCode.APPOINTMENT_0150_ALLOCATION_ERROR>
 		{

RPtoRFX_PrepOrder.ftl

@@ -37,15 +37,15 @@
 			"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}",
+		"consolidated_delivery": "false",
 		"pick_sequence_code": "${pick_sequence_code}",
 		"intermediate_consignee": "false",
-		"protected": "${protected_flag}",
+		"protected": "false",
-        "automatic_generation": "${automatic_generation_flag}",
+        "automatic_generation": "true",
 		"deactivate": "false",
 		"optional_attributes": {
 			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
-			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
+			"apt_with_end_consignee": "false",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
 		  	}

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -18,11 +18,7 @@
 <#assign originator_code = ""/>
 <#assign preparation_type_code = ""/>
 <#assign requested_delivery_date_type = ""/>
-<#assign consolidated_delivery_flag ="false"/>
 <#assign pick_sequence_code = ""/>
-<#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-->

VERSION

@@ -1 +1 @@
-1.2.60+5
+1.2.63+1