Release 2.0.22+4

release2.0-Fix4-v13 into release/2.0

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

ActorPrefix.ftl

@@ -37,7 +37,11 @@
   <#if uniqueness>
     <#local depot = actor>
   <#else>
+    <#if actor?length gt 4>
     <#local depot = actor[4..]>
+    <#else>
+        <#local depot = actor>
+    </#if>
   </#if>
 <#return (depot)>
 </#function>
@@ -78,7 +82,11 @@
   <#if uniqueness>
     <#local supplier = actor>
   <#else>
+    <#if actor?length gt 4>
     <#local supplier = actor[4..]>
+    <#else>
+        <#local supplier = actor>
+    </#if>
   </#if>
 <#return (supplier)>
 </#function>
@@ -117,7 +125,11 @@
   <#if uniqueness>
     <#local carrier = actor>
   <#else>
+    <#if actor?length gt 4>
     <#local carrier = actor[4..]>
+    <#else>
+        <#local carrier = actor>
+    </#if>
   </#if>
 <#return (carrier)>
 </#function>
@@ -156,7 +168,11 @@
   <#if uniqueness>
     <#local consignee = actor>
   <#else>
+    <#if actor?length gt 4>
     <#local consignee = actor[4..]>
+    <#else>
+        <#local consignee = actor>
+    </#if>
   </#if>
 <#return (consignee)>
 </#function>

InternalSettings.ftl

@@ -2,10 +2,10 @@
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- DeleteEF est un paramètre qui permet de déterminer si l’exécution logistique doit être supprimée lors de la création d’une commande.-->
 <#-- Attention : si vous choisissez de la supprimer, toutes les métadonnées associées à cette exécution logistique seront également supprimées.      -->
-<#-- Si DeleteEF_False = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_False = false, nous supprimons l'exécution logistique.-->
+<#-- Si DeleteEF_Creation = true, nous ne supprimons pas l'exécution logistique, Si DeleteEF_Creation = false, nous supprimons l'exécution logistique.-->
 <#-- --------------------------------------------------------------------------------------- -->
 <#-- DeleteEF is a parameter used to determine whether the logistics execution should be deleted when creating an order.-->
 <#-- Warning: if deletion is selected, all metadata related to the logistics execution will also be removed.   -->
-<#-- If DeleteEF_False = true, we do not delete the logistics execution. If DeleteEF_False = false, we delete the logistics execution. -->
+<#-- If DeleteEF_Creation = true, we do not delete the logistics execution. If DeleteEF_Creation = false, we delete the logistics execution. -->
 <#-- --------------------------------------------------------------------------------------- -->
-<#assign DeleteEF_False = true>
+<#assign DeleteEF_Creation = true>

RFXtoRP_HfDtlStockLs.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for stock snapshotted  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#-- sum_elt      : nb element in snapshot (optional parameter)  -->

RFXtoRP_HfExpGrpList.ftl

@@ -1,3 +1,4 @@
+<#-- input        : message HARDIS WMS for expiry group  -->
 <#-- *********************************************** Parameter global ******************** -->
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HfGrade.ftl

@@ -1,3 +1,4 @@
+<#-- input        : message HARDIS WMS for grades  -->
 <#-- *********************************************** Parameter global ******************** -->
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -9,7 +10,7 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Grades">
+		<#stop >
 	<#break>
 
 

RFXtoRP_HfLvTypeList.ftl

@@ -1,3 +1,4 @@
+<#-- input        : message HARDIS WMS for logistics variants types  -->
 <#-- *********************************************** Parameter global ******************** -->
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -10,7 +11,7 @@
 	<#case "U">
 	<#case "D">
 
-		<#stop "no generic FTL file available yet for LV types">
+		<#stop >
 
 	<#break>
 

RFXtoRP_HfOwner.ftl

@@ -1,3 +1,4 @@
+<#-- input        : message HARDIS WMS for owners  -->
 <#-- *********************************************** Parameter global ******************** -->
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
@@ -9,7 +10,7 @@
 	<#case "C">
 	<#case "U">
 	<#case "D">
-		<#stop "no generic FTL file available yet for Owners">
+		<#stop >
 	<#break>
 
 

RFXtoRP_HliAntRecLr.ftl

@@ -0,0 +1,49 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+      <#-- *********************************************** Action = CREATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)>
+         [
+          {
+            <#stop "create  anticipated receipt line">
+          }
+         ]
+      <#break>
+    <#case "U">
+       <#-- *********************************************** Action = UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)>
+          [
+          {
+            <#stop "update anticipated receipt line">
+          }
+         ] 
+         <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign ancReceiptLine = JsonUtil.jsonToMap(dataRfx)>
+         [
+          {
+            <#stop "delete  anticipated receipt line">
+          }
+         ]
+         <#break>
+
+
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HliPrepaL.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for lines of preparation order shipped-->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">

RFXtoRP_HsaCarrier.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for carrier actor -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">

RFXtoRP_HsaCons.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for consignee actor -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">

RFXtoRP_HsaDesPatch.ftl

@@ -16,7 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for desPatch">
+      <#stop >
       <#break>
 
     <#case "D">
@@ -24,7 +24,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign desPatch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for desPatch">
+      <#stop >
       <#break>
     <#default>
           <#stop >

RFXtoRP_HsaDespNt.ftl

@@ -16,7 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for despNt">
+      <#stop >
       <#break>
 
     <#case "D">
@@ -24,7 +24,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign despNt = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for despNt">
+      <#stop >
       <#break>
     <#default>
           <#stop >

RFXtoRP_HsaDispute.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for dispute/claim-->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 

RFXtoRP_HsaIpgMove.ftl

@@ -1,3 +1,8 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message HARDIS WMS for moves-->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>
 <#assign organisationRP = organisation>

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -60,7 +60,7 @@
         </#if>
         "ExternalInfo" : "${reflexMvtStockInterface.stock_move_reference?json_string}",
         <#if reflexMvtStockInterface.ipg_move_operation_year_number!= 0>
-          "OperationReference": "${reflexMvtStockInterface.ipg_move_operation_year_number} - ${reflexMvtStockInterface.ipg_move_operation_number}",
+          "OperationReference": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}-${reflexMvtStockInterface.ipg_move_operation_year_number}-${reflexMvtStockInterface.ipg_move_operation_number}",
         </#if>
 
         "Quantity":

RFXtoRP_HsaItm.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for items  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 

RFXtoRP_HsaItmLv.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
+<#-- input        : message HARDIS WMS for logistic variants  -->
-<#-- project      : projectId in ReflexPlatform  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 
 <#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
 <#assign projectRP = project>

RFXtoRP_HsaLstCarSta.ftl

@@ -1,7 +1,8 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
+<#-- input        : message HARDIS WMS for carrier appointment status  -->
-<#-- project      : projectId in ReflexPlatform  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
+
 <#include "ActorPrefix.ftl">
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">

RFXtoRP_HsaLstCarSta_CarrierExpected.ftl

@@ -1,5 +1,6 @@
 [
     <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt_status.status.creation_datetime,time_zone_rfx) />
+    <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 1)?iso_utc />
     {
         "Header": {
             "ProjectID": "${projectRP}"
@@ -19,7 +20,7 @@
                 </#if>
             </#if>
 			"RefDate": {
-               "DateTime": "${ref_datetime}",
+               "DateTime": "${ref_datetime2}",
                "AuthorTimeZone": "${time_zone_rfx}"
 			 }
         },

RFXtoRP_HsaProStatus.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for preparation status  -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 

RFXtoRP_HsaSup.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message RFX  -->
+<#-- input        : message HARDIS WMS for supplier actor  -->
-<#-- project      : projectId in ReflexPlatform  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">
 <#include "HfRpConfig.ftl">
 <#include "ActorPrefix.ftl">

RFXtoRP_HsrCarrierApt.ftl

@@ -1,7 +1,7 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS-WMS  -->
+<#-- input        : message HARDIS WMS for carrier appointment  -->
-<#-- project      : projectId in ReflexPlatform  -->
+<#-- project      : projectId in HARDIS SC NETWORK  -->
-<#-- organisation : organisationtId in ReflexPlatform  -->
+<#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ActorPrefix.ftl">
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">

RFXtoRP_HsrCarrierApt_CarrierExpected.ftl

@@ -1,6 +1,6 @@
 [
-    <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.creation_datetime,time_zone_rfx) />
+    <#assign ref_datetime = RfxDateTimetoUTCWithTimezone(carrier_apt.metadata.last_update_datetime,time_zone_rfx) />
-    <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 60)?iso_utc />
+    <#assign ref_datetime2 = AddSecondsToDatetime(ref_datetime?datetime.iso, 1)?iso_utc />
     {
         "Header": {
             "ProjectID": "${projectRP}"

RFXtoRP_HsrDepot.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for depot actor -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 

RFXtoRP_HsrLoadInfo.ftl

@@ -17,22 +17,14 @@
        <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
+      <#stop >
-          {
-
-          }
-       ]
       <#break>
 
     <#case "D">
       <#-- *********************************************** Action = DELETE *************************** -->
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign depot = JsonUtil.jsonToMap(dataRfx)>
-       [
+       <#stop >
-           {
-
-           }
-       ]
        <#break>
 
     <#default>

RFXtoRP_HsrPackBranch.ftl

@@ -16,7 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for Pack Branch">
+      <#stop >
       <#break>
 
     <#case "D">
@@ -24,7 +24,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for  Pack Branch">
+      <#stop >
       <#break>
     <#default>
           <#stop >

RFXtoRP_HsrPackOrder.ftl

@@ -16,7 +16,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for Pack Order">
+      <#stop >
       <#break>
 
     <#case "D">
@@ -24,7 +24,7 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
 
-      <#stop "no generic FTL file available yet for Pack Order">
+      <#stop >
       <#break>
     <#default>
           <#stop >

RFXtoRP_HsrPrepa.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for preparation order shipped-->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 <#include "ReflexUtils.ftl">

RFXtoRP_HsrPro.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for preparation order -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 

RFXtoRP_HsrReceiptList.ftl

@@ -1,5 +1,5 @@
 <#-- **** input parameters  ***** -->
-<#-- input        : message HARDIS WMS  -->
+<#-- input        : message HARDIS WMS for receipt -->
 <#-- project      : projectId in HARDIS SC NETWORK  -->
 <#-- organisation : organisationtId in HARDIS SC NETWORK  -->
 

RFXtoRP_PlatformLogCreate.ftl

@@ -23,20 +23,21 @@
 	    },
 	    "TechMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody}
+	      "Label": ${strJsonBody?truncate(32000,'...')}
 	      },
 	    "UserMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody},
+	      "Label": ${strJsonBody?truncate(32000,'...')},
 	      "Params": []
 	    },
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": ${strJsonBody},
+	    "ContextPayload": ${strJsonBody?truncate(32000,'...')},
 	    "Type": "${event}",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
+
 ]

RFXtoRP_RestResponse.ftl

@@ -62,22 +62,22 @@
 				<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
 				<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
 				<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN")  >
-					<#if DeleteEF_False>
+					<#if DeleteEF_Creation>
 					[
 						{
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
 							"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 							"datas" :
-							<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
+							<#include "RFXtoRP_ExecutionflowDeleted.ftl">
 						}
 					]
 					<#else>
 					[
 						{
-							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
+							<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
 													"apiReflexPlatformID" :  "${apiReflexPlatformID}",
 													"datas" :
-							<#include "RFXtoRP_ExecutionflowDeleted.ftl">
+							<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
 						}
 					]
 					</#if>

VERSION

@@ -1 +1 @@
-2.0.22+2
+2.0.22+4