Release 1.2.45+4

SCPN1-9437 to release1.2

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

README.md

@@ -1,10 +1,20 @@
 # Reflex Platform Core FTLs
 
+## Overview
 
+The **Reflex WMS Connector** is a set of **FreeMarker templates (FTL)** designed to transform **outgoing JSON flows from Reflex WMS** into **flows compatible with Reflex Platform**.
 
-These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API.
+This connector does not contain any standalone executable code: it is intended to be used by **Reflex integration engines** or **data exchange pipelines**, where it applies the mapping rules defined in the `.ftl` files.
 
+## Role of the FTL Files
 
+- Each `.ftl` file corresponds to a **flow type** (order, stock, receipt, shipment, etc.).
+- These templates use the **FreeMarker** syntax to:
+  - Extract the required fields from the WMS source flow.
+  - Apply transformation rules (mapping, conversions, enrichments).
+  - Generate a **final structured JSON** for Reflex Platform.
 
-You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/
+## Useful Resources
 
+- [FreeMarker Documentation](https://freemarker.apache.org/docs/index.html)
+- [Reflex Platform](https://auth.reflex-platform.com/)

RFXtoRP_HliPrepaL.ftl

@@ -0,0 +1,31 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+<#include "ReflexUtils.ftl">
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+<#include "RFX_PartnerAPP_Settings.ftl">
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+<#case "C">
+<#--<#case "U">
+    <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+    <#stop "no generic FTL file available yet for preparationOrderLines">
+    <#break>
+<#case "D">
+    <#-- *********************************************** Action = DELETE ******************** -->
+    <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+    <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+    <#stop "no generic FTL file available yet for preparationOrderLines">
+    <#break>
+<#break>
+
+<#default>
+<#stop>
+</#switch>

RFXtoRP_HliReceiptLr.ftl

@@ -0,0 +1,34 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+    <#case "C">
+    <#case "U">
+        <#-- *********************************************** Action = CREATE ******************** -->
+
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
+
+        <#stop "no generic FTL file available yet for receiptLines">
+        <#break>
+
+      <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+        <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+        <#assign receiptLines = JsonUtil.jsonToMap(dataRfx)>
+
+        <#stop "no generic FTL file available yet for receiptLines">
+        <#break>
+
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HlrProL.ftl

@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for preparationOrderLines">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign preparationOrderLines = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for preparationOrderLines">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HsaDispute.ftl

@@ -36,7 +36,8 @@
                 <#stop>
               </#if>
             <#else>
-              <#stop "Reference is empty">
+              <#--  "Reference is empty"-->
+              <#stop>
             </#if>
           </#if>
        ]

RFXtoRP_HsaIpgMove.ftl

@@ -47,7 +47,6 @@
                <#if (reflexMvtStockInterface.ipg_move_type == "100" ||
                      reflexMvtStockInterface.ipg_move_type == "110" ||
                      reflexMvtStockInterface.ipg_move_type == "120") >
-                     <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
                         [
                         {
                         <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsReceived>
@@ -56,10 +55,6 @@
                         <#include "RFXtoRP_HsaIpgMove_GoodsReceived.ftl">
                         }
                         ]
-                      <#else>
-                        <#-- Case of IPG move type volontarilly ignored-->
-                        <#stop " Reference receipt is empty">
-                     </#if>
                <#else>
                   <#stop>
                </#if>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -29,14 +29,33 @@
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },
-        <#if reflexMvtStockInterface.receipt_reference!="">
+        <#if reflexMvtStockInterface.ipg_move_type?? & reflexMvtStockInterface.ipg_move_type=="120"> <#-- if it is a transfer-type movement -->
+          <#if reflexMvtStockInterface.origin_order_line_reference?? && reflexMvtStockInterface.origin_order_line_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.origin_order_line_reference?trim?json_string}",
+          <#else>
+            <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
               "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
               "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
             <#else>
-          "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
-          "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}",
+              "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+              "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
             </#if>
+          </#if>
+        <#else>
+          <#if reflexMvtStockInterface.receipt_reference?? && reflexMvtStockInterface.receipt_reference!="">
+            "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+            "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
+          <#else>
+            "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+            "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_year_number}${reflexMvtStockInterface.receipt_number}",
+          </#if>
+        </#if>
+        <#if reflexMvtStockInterface.origin_order_line_number_reference?? && reflexMvtStockInterface.origin_order_line_number_reference!=0>
+          "LineID": "${reflexMvtStockInterface.origin_order_line_number_reference}",
+        <#else>
           "LineID": "${reflexMvtStockInterface.receipt_line_number}",
+        </#if>
         "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}",
         "Quantity": {
             "LVID": "${quantity_in_base_lv_RP_Cst}",

RFXtoRP_HsaItm.ftl

@@ -18,14 +18,10 @@
       <#assign item = JsonUtil.jsonToMap(dataRfx)>
        [
          {
-           <#if item.logistical_variant_list??  && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
            <#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
            "apiReflexPlatformID" :  "${apiReflexPlatformID}",
            "datas" :
             <#include "RFXtoRP_HsaItm_ItemCreated.ftl">
-        <#else>
-          <#stop "no LV for the item">
-        </#if>
          }
        ]
       <#break>

RFXtoRP_HsaItmLv_LogisticVariantUpdated.ftl

@@ -12,7 +12,7 @@
            {
           "LVID": "${lv.logistical_variant_code?json_string}",
           "Name" : "${lv.lv_type_code?json_string}",
-          <#if lv.id_list??>
+          <#if lv.id_list??  && (lv.id_list?size == lv.id_list?filter(l ->l??)?size)>
           "Codes": [
                    <#list lv.id_list as id>
                    {

RFXtoRP_HsaItm_ItemCreated.ftl

@@ -21,15 +21,17 @@
       },
 
       <#-- Item metadata inclusion -->
-      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">,
+      <#include "RFXtoRP_HsaItm_ItemCreated_ItemMetadata.ftl">
 
       <#-- Item Photo URI could be added here -->
       <#if item.url?? && item.url!="">
-        "PhotoURI": "${item.url?json_string}",
+      ,
+        "PhotoURI": "${item.url?json_string}"
       </#if>
 
     <#-- Loop for the Logistical Variants - LV -->
-        <#if item.logistical_variant_list??>
+        <#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
+        ,
           "LogisticVariants": [
 
            <#list item.logistical_variant_list as logistical_variant>
@@ -37,7 +39,7 @@
             "LVID": "${logistical_variant.logistical_variant_code?json_string}",
             "Name" : "${logistical_variant.lv_type_code?json_string}",
 
-              <#if logistical_variant.id_list??>
+              <#if logistical_variant.id_list?? && (logistical_variant.id_list?size == logistical_variant.id_list?filter(l ->l??)?size)>
             "Codes": [
                        <#list logistical_variant.id_list as id>
                        {

RFXtoRP_HsaProStatus.ftl

@@ -65,7 +65,8 @@
             </#if>
          </#if>
       <#else>
-            <#stop "PRO reference is empty">
+         <#--PRO reference is empty-->
+         <#stop >
       </#if>
       ]
       <#break>

RFXtoRP_HsrPackBranch.ftl

@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Branch">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packBranch = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for  Pack Branch">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HsrPackOrder.ftl

@@ -0,0 +1,32 @@
+<#-- **** input parameters  ***** -->
+<#-- input        : message RFX  -->
+<#-- project      : projectId in ReflexPlatform  -->
+<#-- organisation : organisationtId in ReflexPlatform  -->
+
+<#assign cloudEventMsg = JsonUtil.jsonToMap(input)>
+<#assign projectRP = project>
+<#assign organisationRP = organisation>
+
+<#assign aDateTime = .now>
+
+<#switch cloudEventMsg.action>
+  <#case "C">
+  <#case "U">
+      <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+
+    <#case "D">
+      <#-- *********************************************** Action = DELETE ******************** -->
+      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
+      <#assign packOrder = JsonUtil.jsonToMap(dataRfx)>
+
+      <#stop "no generic FTL file available yet for Pack Order">
+      <#break>
+    <#default>
+          <#stop >
+</#switch>
+

RFXtoRP_HsrPrepa.ftl

@@ -18,6 +18,7 @@
 <#assign preparationOrder = JsonUtil.jsonToMap(dataRfx)>
 
    <#if	preparationOrder.total_lv_validated !=0>
+      <#if preparationOrder.preparation_line_lst??>
          [
             {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.HandlingunitGoodsPrepared>
@@ -55,8 +56,7 @@
             <#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 = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) />
-            <#if !hd_numberHmap[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
-               <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
+            <#if (!hd_numberHmap[despatched_ipg.hd_number]?? || !hd_numberHmap[despatched_ipg.carton_number]??) && (trackingNumberSource==2 || trackingNumberSource==3 || (despatched_ipg.consignment_unit_id!="" && trackingNumberSource==1))>
                ,
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>
@@ -96,7 +96,12 @@
             <#assign refIDHmap ={}>
          ]
       <#else>
-      <#stop "no confirmed quantity for the preparation - preparation closed">
+         <#--   No line-->
+         <#stop >
+      </#if>
+   <#else>
+      <#--   no confirmed quantity for the preparation - preparation closed-->
+      <#stop >
    </#if>
 
 

RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl

@@ -53,8 +53,10 @@
     "Payload": {
       <#if despatched_ipg.carton_number != "000000000000000000">
       "HandlingunitID": "${despatched_ipg.carton_number}"
+      <#assign hd_numberHmap += {despatched_ipg.carton_number,despatched_ipg.carton_number}>
       <#else>
       "HandlingunitID": "${despatched_ipg.hd_number}"
+      <#assign hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
       </#if>
 	  <#if preparationOrder.load_data?? && preparationOrder.load_data.carrier_code?? && preparationOrder.load_data.carrier_code!="" >
     ,

RFXtoRP_HsrPro.ftl

@@ -16,12 +16,10 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
-
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
           <#-- check preparation type code (internal order and reservation are ignored)  -->
-          <#if preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030">
-            <#-- Only if preparation order not confirmed  -->
-            <#if preparation_order.preparation_order_confirmed == "false" >
+          <#if preparation_order.preparation_type_code?? && (preparation_order.preparation_type_code == "010" || preparation_order.preparation_type_code == "030")>
+            <#if preparation_order.line_list??>
               {
                 <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                 "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -29,16 +27,16 @@
                 <#include "RFXtoRP_HsrPro_ExecutionflowDetected.ftl">
               }
             <#else>
-           <#-- preparation order already confirmed -->
+              <#-- No line -->
               <#stop>
             </#if>
-
           <#else>
           <#-- preparation order type not supported -->
             <#stop>
           </#if>
         <#else>
-          <#stop "PRO reference is empty">
+          <#-- PRO reference is empty -->
+          <#stop>
         </#if>
        ]
   <#break>
@@ -49,6 +47,7 @@
       <#assign preparation_order = JsonUtil.jsonToMap(dataRfx)>
        [
         <#if  preparation_order.originator_reference?? && preparation_order.originator_reference!="">
+          <#if preparation_order.line_list??>
             {
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
               "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -56,7 +55,12 @@
               <#include "RFXtoRP_HsrPro_ExecutionflowCancelled.ftl">
             }
           <#else>
-          <#stop "PRO reference is empty">
+            <#-- No line -->
+            <#stop>
+          </#if>
+        <#else>
+          <#-- PRO reference is empty -->
+          <#stop>
         </#if>
        ]
          <#break>

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -78,7 +78,7 @@
                 }
           </#if>
          },
-
+        "OrderID": "${preparation_order.originator_reference?trim?json_string}",
        <#if preparation_order.line_list??>
        "Lines" : [
            <#list preparation_order.line_list as preparation_order_line >

RFXtoRP_HsrReceiptList.ftl

@@ -15,10 +15,10 @@
 
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
-      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
         <#if receipt.receipt_type == "030">
           <#stop "ignored message because receipt type = transfert">
         <#else>
+          <#if receipt.line_list ??>
           [
           {
             <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -35,9 +35,10 @@
 
           }
           ]
-        </#if>
           <#else>
-        <#stop "Receipt reference is empty">
+            <#--  No line-->
+            <#stop>
+          </#if>
         </#if>
       <#break>
     <#case "U">
@@ -45,7 +46,6 @@
       <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
          <#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
                   {
                   <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -65,6 +65,7 @@
               <#if receipt.receipt_type == "030">
                 <#stop "ignored message because receipt type = transfert">
               <#else>
+                <#if receipt.line_list ??>
                   {
                     <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                     "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -77,11 +78,12 @@
                   "datas" :
                   <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
                   }
-              </#if>
-            </#if>
-          </#if>
                 <#else>
-          <#stop "Receipt reference is empty">
+                  <#--  No line-->
+                  <#stop>
+                </#if>
+              </#if>
+            </#if>
           </#if>
        ]
       <#break>
@@ -91,7 +93,7 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+          <#if receipt.line_list ??>
             {
 
               <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
@@ -100,7 +102,8 @@
               <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
             }
             <#else>
-          <#stop "Receipt reference is empty">
+              <#--  No line-->
+              <#stop>
             </#if>
        ]
          <#break>

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -1,14 +1,20 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
 <#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
-
+<#assign refIDHmap_local ={}>
 [
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
           {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
+            "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
@@ -17,4 +23,26 @@
             "Payload": {
             }
           }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -9,7 +9,11 @@
       "ProjectID": "${projectRP}"
     },
     "ID": {
+      <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         "RefID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      </#if>
       "RefDate": {
             "DateTime": "${receipt_creation_datetime}",
             "AuthorTimeZone": "${time_zone_rfx}"
@@ -44,7 +48,11 @@
           "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}"
         },
       </#if>
-
+       <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+        "OrderID": "${receipt.receipt_reference?trim?json_string}",
+      <#else>
+        "OrderID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+      </#if>
       <#if receipt.line_list??>
        "Lines" : [
           <#list receipt.line_list as line>

RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl

@@ -1,13 +1,20 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) />
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
           {
-     "Header": {
-      "ProjectID": "${projectRP}"
-    },
+            "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-      "RefID": "${receipt.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
@@ -16,4 +23,26 @@
             "Payload": {
             }
           }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -1,21 +1,48 @@
 <#include "HfRpConfig.ftl">
 <#include "ReflexUtils.ftl">
-<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) />
-
+<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) />
+<#assign refIDHmap_local ={}>
 [
+  <#if receipt.line_list??>
+    <#list receipt.line_list as receipt_line >
+      <#if receipt_line.origin_order_line_reference?? && receipt_line.origin_order_line_reference!="">
+        <#if !refIDHmap_local[receipt_line.origin_order_line_reference]?? >
+          <#if refIDHmap_local?size != 0 >
+          ,
+          </#if>
+          <#assign refIDHmap_local +={receipt_line.origin_order_line_reference,receipt_line.origin_order_line_reference}>
           {
-    "Header": {
-      "ProjectID": "${projectRP}"
-    },
+            "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-         "RefID": "${receipt.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
               }
           },
-
-    "Payload": {}
-
+            "Payload": {
             }
+          }
+        </#if>
+      <#else>
+        {
+          "Header": {"ProjectID": "${projectRP}"},
+          "ID": {
+            <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+              "RefID": "${receipt.receipt_reference?trim?json_string}",
+            <#else>
+              "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year}${receipt.receipt_number}",
+            </#if>
+            "RefDate": {
+              "DateTime": "${receipt_status_datetime}",
+              "AuthorTimeZone": "${time_zone_rfx}"
+            }
+          },
+          "Payload": {
+          }
+        }
+        <#break>
+      </#if>
+    </#list>
+  </#if>
 ]

RPtoRFX_ExecutionflowEvent.ftl

@@ -17,6 +17,7 @@
 
 <#switch eventRP.event>
 	  <#case "Created">
+	  <#case "Renotified">
 			 <#-- *********************************************** Action = CREATE or UPDATE ******************** -->
 			<#assign executionflow = eventRP.data />
 

RPtoRFX_PrepOrder.ftl

@@ -105,13 +105,6 @@
 				"batch_1": "${batch_1?json_string}",
 				"base_lv_quantity": "true",
 				"any_lv": "false"
-				<#--
-				"stock_reservation": "false",
-				"forced_priority_date_min_lead_time": "false",
-				"temp_substitution_possible": "false",
-				"substitution_possible": "false"
-				-->
-
 				}
 			<#sep>,</#sep>
 			</#list>

RPtoRFX_Receipt.ftl

@@ -57,15 +57,9 @@
 				"grade_code": "${grade_code}",
 				"batch_1": "${batch_1?json_string!""}",
 				"optional_attributes": {
-			   		<#--"held_for_check": "false",
-			   		"hold_code": "false", -->
+				<#include "RPtoRFX_Receipt_OptionalAttributes.ftl">
 				"hold_for_specific_code": "false"
 		 		}
-		  		<#--"quality_control_attributes": {
-	        		"qcf_to_create_for_receipt_line": "false",
-	         		"exclude_item_from_inspection": "false"
-  				} -->
-
 			}<#sep>,</#sep>
 		</#list>
 		]

RPtoRFX_Receipt_OptionalAttributes.ftl

@@ -0,0 +1,16 @@
+<#-- Here are the fields that can be added
+"batch_2": "string",
+"batch_3": "string",
+"anticipated_receipt_line_activity_code": "str",
+"anticipated_receipt_line_physical_depot_code": "str",
+"anticipated_receipt_line_originator_code": "string",
+"anticipated_receipt_reference": "string",
+"anticipated_receipt_planned_date": "0000-00-00",
+"anticipated_receipt_reference_line_no": 999999,
+"reservation_consignee_code": "string",
+"reservation_consignee_group_code": "string",
+"pro_reservation_reference": "string",
+"held_for_check": "false",
+"held_for_repacking": "false",
+"hold_code": "str"
+-->

VERSION

@@ -1 +1 @@
-1.2.42+1
+1.2.45+4