Release 2.0.25+8

release2.0-SCPN1-11488 into release2.0

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

RFXtoRP_HfDtlStockLs_StockSnapshotted.ftl

@@ -26,13 +26,7 @@
        "Goods": {
          "ItemID": "${stock.item_code?trim?json_string}",
          "LVBranchID": "${stock.item_logistical_variant_code}",
-         <#assign priority_date = stock.priority_date?datetime(rfx_date_format_default)?iso_utc />
+         "PriorityDate": "${RfxDatetoTimestampUTC(stock.priority_date,rfx_date_format_default)}",
-         <#if (stock.priority_date!="") && (stock.priority_date?starts_with("00")== false) >
-          "PriorityDate" : "${priority_date}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
-        </#if>
-
        <#-- Segmentation keys inclusion -->
        <#include "RFXtoRP_HfDtlStockLs_StockSnapshotted_SegmentationKeys.ftl">
        }

RFXtoRP_HliReceiptLr_ExecutionflowLinesAdded.ftl

@@ -30,14 +30,12 @@
               "ItemID":   "${line.item_code?trim?json_string!"0"}",
               "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
               <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                   "PriorityDate": "${RfxDatetoTimestampUTC(line.line_without_detail.priority_date,rfx_date_format_default)}",
-                   "PriorityDate": "${line_without_detail_priority_date}",
               <#else>
                 <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${RfxDatetoTimestampUTC(line.line_detail[0].priority_date,rfx_date_format_default)}",
-                    "PriorityDate": "${line_detail_priority_date}",
                 <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
+                    "PriorityDate": "${DEFAULT_TIMESTAMP}",
                 </#if>
               </#if>
               <#-- Segmentation Keys inclusion -->

RFXtoRP_HliReceiptLr_TransfertExecutionflowLinesAdded.ftl

@@ -34,14 +34,12 @@
                 "ItemID":   "${line.item_code?trim?json_string!"0"}",
                 "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
                 <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${RfxDatetoTimestampUTC(line.line_without_detail.priority_date,rfx_date_format_default)}",
-                    "PriorityDate": "${line_without_detail_priority_date}",
                 <#else>
                   <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                      <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                      "PriorityDate": "${RfxDatetoTimestampUTC(line.line_detail[0].priority_date,rfx_date_format_default)}",
-                      "PriorityDate": "${line_detail_priority_date}",
                   <#else>
-                      "PriorityDate": "1970-01-01T00:00:00Z",
+                      "PriorityDate": "${DEFAULT_TIMESTAMP}",
                   </#if>
                 </#if>
                 <#-- Segmentation Keys inclusion -->
@@ -101,15 +99,13 @@
                       {
                         "ItemID":   "${line.item_code?trim?json_string!"0"}",
                         "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
-                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
+                        <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) >
-                            <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                            "PriorityDate": "${RfxDatetoTimestampUTC(line.line_without_detail.priority_date,rfx_date_format_default)}",
-                            "PriorityDate": "${line_without_detail_priority_date}",
                         <#else>
-                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
+                          <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0)>
-                              <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                              "PriorityDate": "${RfxDatetoTimestampUTC(line.line_detail[0].priority_date,rfx_date_format_default)}",
-                              "PriorityDate": "${line_detail_priority_date}",
                           <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
+                              "PriorityDate": "${DEFAULT_TIMESTAMP}",
                           </#if>
                         </#if>
                         <#-- Segmentation Keys inclusion -->
@@ -166,7 +162,7 @@
                               <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
                               "PriorityDate": "${line_detail_priority_date}",
                           <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
+                              "PriorityDate": "${DEFAULT_TIMESTAMP}",
                           </#if>
                         </#if>
                         <#-- Segmentation Keys inclusion -->

RFXtoRP_HsaIpgMove_GoodsReceived.ftl

@@ -3,8 +3,7 @@
 <#include "ActorPrefix.ftl">
 [
     <#assign receipt_confirmation_datetime = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
-	<#assign priority_date = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
+	    {
-    {
     "Header": {
       "ProjectID": "${projectRP}"
     },
@@ -22,11 +21,7 @@
        "Goods": {
            "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
            "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}",
-           <#if (priority_date!="") && (priority_date?starts_with("00")== false) >
+           "PriorityDate": "${RfxDatetoTimestampUTC(reflexMvtStockInterface.ipg_priority_date,rfx_date_format_default)}",
-              "PriorityDate": "${priority_date}",
-           <#else>
-              "PriorityDate": "1970-01-01T00:00:00Z",
-            </#if>
          <#-- Goods received Segmentation Keys inclusion  -->
          <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
          },

RFXtoRP_HsaIpgMove_StockMoved.ftl

@@ -22,7 +22,6 @@
             "520":"STOCK_MOVEMENT_TYPE_OUTBOUND"
             }>
 <#assign generation_date = RfxDateTimetoUTCWithTimezone(reflexMvtStockInterface.ipg_move_creation_datetime,time_zone_rfx) />
-<#assign ipg_priority_datetime = reflexMvtStockInterface.ipg_priority_date?datetime(rfx_date_format_default)?iso_utc />
 [
   {
     "Header": {
@@ -31,11 +30,7 @@
     "Payload": {
       "Goods": {
         "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}",
-        <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) >
+        "PriorityDate": "${RfxDatetoTimestampUTC(reflexMvtStockInterface.ipg_priority_date,rfx_date_format_default)}",
-          "PriorityDate": "${ipg_priority_datetime}",
-        <#else>
-            "PriorityDate": "1970-01-01T00:00:00Z",
-        </#if>
 
         <#-- Segmentation keys inclusions -->
         <#include "RFXtoRP_HsaIpgMove_StockMoved_SegmentationKeys.ftl">,

RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl

@@ -82,37 +82,31 @@
            "ItemID": "${preparation_line.item_code?trim?json_string}",
            "LVBranchID": "${preparation_line.item_lv_code?json_string}",
 
-          <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
+          <#if despatched_ipg.ipg_use_by_date?? && despatched_ipg.ipg_use_by_date?length != 0 && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)>
-				    <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc />
+				    "PriorityDate": "${RfxDatetoTimestampUTC(despatched_ipg.ipg_use_by_date,rfx_date_format_default)}",
-				    "PriorityDate": "${priority_date}",
           <#else>
-            <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
+            <#if despatched_ipg.ipg_best_before_date?? && despatched_ipg.ipg_best_before_date?length != 0 && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)>
-              <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc />
+                "PriorityDate": "${RfxDatetoTimestampUTC(despatched_ipg.ipg_best_before_date,rfx_date_format_default)}",
-                "PriorityDate": "${priority_date}",
               <#else>
-                <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
+                <#if despatched_ipg.ipg_sell_by_date?? && (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)>
-                  <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc />
+                    "PriorityDate": "${RfxDatetoTimestampUTC(despatched_ipg.ipg_sell_by_date,rfx_date_format_default)}",
-                    "PriorityDate": "${priority_date}",
                   <#else>
-                    <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)>
+                    <#if despatched_ipg.ipg_manufacture_date?? && (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00")== false)>
-							<#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc />
+                      "PriorityDate": "${RfxDatetoTimestampUTC(despatched_ipg.ipg_manufacture_date,rfx_date_format_default)}",
-							"PriorityDate": "${priority_date}",
+                    <#else>
-						<#else>
+                      <#if despatched_ipg.ipg_receipt_date?? && (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
-							<#if (despatched_ipg.ipg_receipt_date?length != 0) && (despatched_ipg.ipg_receipt_date?starts_with("00")== false)>
+                        "PriorityDate": "${RfxDatetoTimestampUTC(despatched_ipg.ipg_receipt_date,rfx_date_format_default)}",
-								<#assign priority_date = despatched_ipg.ipg_receipt_date?datetime(rfx_date_format_default)?iso_utc />
+                      <#else>
-								"PriorityDate": "${priority_date}",
+                        <#if preparationOrder.stock_despatch_at_preparation_datetime?? && (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
-							<#else>
+                            "PriorityDate": "${RfxDatetoTimestampUTC(preparationOrder.stock_despatch_at_preparation_datetime,rfx_date_format_default)}",
-								<#if (preparationOrder.stock_despatch_at_preparation_datetime?length != 0) && (preparationOrder.stock_despatch_at_preparation_datetime?starts_with("00")== false)>
+                        <#else>
-									<#assign priority_date = preparationOrder.stock_despatch_at_preparation_datetime?datetime(rfx_date_format_default)?iso_utc />
+                          "PriorityDate": "${DEFAULT_TIMESTAMP}",
-                                    "PriorityDate": "${priority_date}",
-                                <#else>
-									"PriorityDate": "1970-01-01T00:00:00Z",
-                                </#if>
-                            </#if>
                         </#if>
                     </#if>
+                  </#if>
                 </#if>
-             </#if>
+              </#if>
+            </#if>
 
        <#-- Segmentation Keys inclusion -->
        <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl">

RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl

@@ -108,14 +108,12 @@
               "ItemID":   "${line.item_code?trim?json_string!"0"}",
               "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
               <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                   <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                   "PriorityDate": "${RfxDatetoTimestampUTC(line.line_without_detail.priority_date,rfx_date_format_default)}",
-                   "PriorityDate": "${line_without_detail_priority_date}",
               <#else>
                 <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                    <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                   "PriorityDate": "${RfxDatetoTimestampUTC(line.line_detail[0].priority_date,rfx_date_format_default)}",
-                    "PriorityDate": "${line_detail_priority_date}",
                 <#else>
-                    "PriorityDate": "1970-01-01T00:00:00Z",
+                    "PriorityDate": "${DEFAULT_TIMESTAMP}",
                 </#if>
               </#if>
               <#-- Segmentation Keys inclusion -->

RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl

@@ -105,14 +105,12 @@
                 "ItemID":   "${line.item_code?trim?json_string!"0"}",
                 "LVBranchID":   "${line.item_lv_code?json_string!"0"}",
                 <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)>
-                    <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc />
+                     "PriorityDate": "${RfxDatetoTimestampUTC(line.line_without_detail.priority_date,rfx_date_format_default)}",
-                    "PriorityDate": "${line_without_detail_priority_date}",
                 <#else>
                   <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)>
-                      <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
+                      "PriorityDate": "${RfxDatetoTimestampUTC(line.line_detail[0].priority_date,rfx_date_format_default)}",
-                      "PriorityDate": "${line_detail_priority_date}",
                   <#else>
-                      "PriorityDate": "1970-01-01T00:00:00Z",
+                      "PriorityDate": "${DEFAULT_TIMESTAMP}",
                   </#if>
                 </#if>
                 <#-- Segmentation Keys inclusion -->
@@ -246,7 +244,7 @@
                               <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
                               "PriorityDate": "${line_detail_priority_date}",
                           <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
+                              "PriorityDate": "${DEFAULT_TIMESTAMP}",
                           </#if>
                         </#if>
                         <#-- Segmentation Keys inclusion -->
@@ -369,7 +367,7 @@
                               <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc />
                               "PriorityDate": "${line_detail_priority_date}",
                           <#else>
-                              "PriorityDate": "1970-01-01T00:00:00Z",
+                              "PriorityDate": "${DEFAULT_TIMESTAMP}",
                           </#if>
                         </#if>
                         <#-- Segmentation Keys inclusion -->

RPtoRFX_PrepOrder.ftl

@@ -41,7 +41,7 @@
 		"pick_sequence_code": "${pick_sequence_code}",
 		"intermediate_consignee": "false",
 		"protected": "false",
-        "automatic_generation": "true",
+        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
 			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">

RPtoRFX_PrepOrder_DefaultHeaderData.ftl

@@ -19,6 +19,7 @@
 <#assign preparation_type_code = "010"/>
 <#assign requested_delivery_date_type = "010"/>
 <#assign pick_sequence_code = ""/>
+<#assign automatic_generation_flag = ""/>
 
 <#-- A supprimer si utilisation de la table de correspondance-->
 <#--To be deleted if using the correspondence table-->

ReflexUtils.ftl

@@ -45,3 +45,28 @@
 <#local str += "]">
 <#return (str)>
 </#function>
+
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- validate and convert HARDIS WMS date field into UTC timestamp                           -->
+<#--  Example : RfxDatetoTimestampUTC("2025-11-00", "yyyy-MM-dd)                             -->
+<#--  return "2025-11-00T00:00:00Z"                                                          -->
+<#-- --------------------------------------------------------------------------------------- -->
+<#-- Default timestamp to use in case of invalid date -->
+<#assign DEFAULT_TIMESTAMP = "1970-01-01T00:00:00Z">
+<#function RfxDatetoTimestampUTC rfxdate rfx_date_format >
+    <#local fallback = DEFAULT_TIMESTAMP>
+    
+    <#if !rfxdate?matches("[0-9]*-[0-9]*-[0-9]*")>
+        <#return fallback>
+    </#if>
+          
+	<#attempt>
+	   <#if rfxdate?? && rfxdate == rfxdate?date(rfx_date_format)?string(rfx_date_format) >
+	     <#return rfxdate?datetime(rfx_date_format)?iso_utc>,
+	   <#else>
+	     <#return fallback> 
+	   </#if>
+	<#recover>
+	  <#return fallback>
+    </#attempt>
+</#function>

VERSION

@@ -1 +1 @@
-2.0.25+6
+2.0.25+8