Release 1.2.45+4

SCPN1-9437 to release1.2

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

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, Reference receipt is empty-->
-                        <#stop >
-                     </#if>
                <#else>
                   <#stop>
                </#if>

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -37,6 +37,9 @@
             <#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>
         <#else>
@@ -44,8 +47,8 @@
             "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}",
+            "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.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_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>

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>

RFXtoRP_HsrPrepa.ftl

@@ -56,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))>
+            <#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 hd_numberHmap += {despatched_ipg.hd_number,despatched_ipg.hd_number}>
                ,
                {
                <#assign apiReflexPlatformID = ApiReflexPlatformID.TrackingHULabeled>

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_HsrReceiptList.ftl

@@ -15,7 +15,6 @@
 
       <#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>
@@ -41,17 +40,12 @@
             <#stop>
           </#if>
         </#if>
-    <#else>
-      <#--  "Receipt reference is empty"-->
-      <#stop>
-    </#if>
       <#break>
     <#case "U">
        <#-- *********************************************** Action = UPDATE ******************** -->
       <#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>
@@ -91,10 +85,6 @@
               </#if>
             </#if>
           </#if>
-        <#else>
-          <#-- Receipt reference is empty-->
-          <#stop >
-        </#if>
        ]
       <#break>
 
@@ -103,7 +93,6 @@
         <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
       <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
        [
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
           <#if receipt.line_list ??>
             {
 
@@ -116,10 +105,6 @@
               <#--  No line-->
               <#stop>
             </#if>
-        <#else>
-           <#-- Receipt reference is empty-->
-          <#stop >
-        </#if>
        ]
          <#break>
 

RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl

@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
@@ -25,11 +25,14 @@
           }
         </#if>
       <#else>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         {
           "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}"
@@ -40,7 +43,6 @@
         }
         <#break>
       </#if>
-      </#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

@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
@@ -25,11 +25,14 @@
           }
         </#if>
       <#else>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         {
           "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}"
@@ -40,7 +43,6 @@
         }
         <#break>
       </#if>
-      </#if>
     </#list>
   </#if>
 ]

RFXtoRP_HsrReceiptList_ReceiptExpected.ftl

@@ -14,7 +14,7 @@
           {
             "Header": {"ProjectID": "${projectRP}"},
             "ID": {
-                "RefID": "${receipt_line.receipt_reference?trim?json_string}",
+                "RefID": "${receipt_line.origin_order_line_reference?trim?json_string}",
               "RefDate": {
               "DateTime": "${receipt_status_datetime}",
               "AuthorTimeZone": "${time_zone_rfx}"
@@ -25,11 +25,14 @@
           }
         </#if>
       <#else>
-        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
         {
           "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}"
@@ -40,7 +43,6 @@
         }
         <#break>
       </#if>
-      </#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 />
 

VERSION

@@ -1 +1 @@
-1.2.44+2
+1.2.45+4