Release 1.2.42+1

Merge branch 'SCPN1-8991-8980-9059-1.2' into 'release/1.2'
SCPN1-8991-8980-9059-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!120
2025-07-10 11:32:59 +02:00 · 2025-07-10 09:31:57 +00:00 · 2025-07-10 09:52:33 +02:00 · 2025-07-09 18:14:43 +02:00 · 2025-07-02 14:37:13 +02:00 · 2025-07-01 15:42:26 +02:00
15 changed files with 130 additions and 24 deletions
--- a/README.md
+++ b/README.md
@@ -8,4 +8,3 @@ These FTL core files aim to translate data flow from Reflex WMS into Reflex plat

 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/

-
--- a/RFXtoRP_HsaDispute_ClaimMetadata.ftl
+++ b/RFXtoRP_HsaDispute_ClaimMetadata.ftl
@@ -0,0 +1,4 @@
+<#-- use protobuf of class HsaDispute to find Reflex Wms fields names  -->
+
+
+"MetaData": [        ]
--- a/RFXtoRP_HsaDispute_Created.ftl
+++ b/RFXtoRP_HsaDispute_Created.ftl
@@ -39,6 +39,8 @@
                </#if>
                "Value": "${dispute.dispute_amount}"
             },
+            <#-- Claim metadata inclusion  -->
+            <#include "RFXtoRP_HsaDispute_ClaimMetadata.ftl">,
            <#-- To configure -->
            <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl">
            <#if dispute.dispute_type_code=="050" >
--- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
+++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl
@@ -29,7 +29,6 @@
         <#-- Goods received Segmentation Keys inclusion  -->
         <#include "RFXtoRP_HsaIpgMove_GoodsReceived_SegmentationKeys.ftl">
         },
-
        <#if reflexMvtStockInterface.receipt_reference!="">
          "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
          "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}",
--- a/RFXtoRP_HsaItm.ftl
+++ b/RFXtoRP_HsaItm.ftl
@@ -18,7 +18,7 @@
      <#assign item = JsonUtil.jsonToMap(dataRfx)>
       [
         {
-           <#if item.logistical_variant_list?? >
+           <#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" :
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -16,7 +16,7 @@
      <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
      <#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
-        <#if receipt.receipt_type = "030">
+        <#if receipt.receipt_type == "030">
        <#stop "ignored message because receipt type = transfert">
        <#else>
          [
@@ -46,29 +46,38 @@
      <#assign receipt = JsonUtil.jsonToMap(dataRfx)>
       [
        <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
-          <#if receipt.receipt_confirmed == "true" >
-            {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
-            }
+         <#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>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
+                  }
          <#else>
-            <#if receipt.receipt_type = "030">
-              <#stop "ignored message because receipt type = transfert">
-            <#else>
+            <#if receipt.receipt_confirmed == "true" >
              {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
-              },
-              {
-              <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
-              "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-              "datas" :
-              <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
-            }
+                <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
+              }
+            <#else>
+              <#if receipt.receipt_type == "030">
+                <#stop "ignored message because receipt type = transfert">
+              <#else>
+                {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
+                },
+                {
+                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
+                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                "datas" :
+                <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
+                }
+              </#if>
            </#if>
          </#if>
        <#else>
--- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl
@@ -26,7 +26,11 @@

      "ShipFrom":
      {
+        <#if receipt.receipt_type == '020'>
+          "ActorID": "${RFXtoRPprefixConsignee(receipt.original_code?trim?json_string)}"
+        <#else>
        "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}"
+        </#if>
      },
        "ShipTo"  :
      {
--- a/RPtoRFX_PrepOrder.ftl
+++ b/RPtoRFX_PrepOrder.ftl
@@ -27,6 +27,7 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
 		"originator_reference": "${executionflow.OrderID?json_string}",
 		"preparation_type_code": "${preparation_type_code}",
 		"end_consignee_code": "${actorID}",
@@ -43,6 +44,7 @@
        "automatic_generation": "${automatic_generation_flag}",
 		"deactivate": "false",
 		"optional_attributes": {
+			<#include "RPtoRFX_PrepOrder_OptionalAttributes.ftl">
 			"apt_with_end_consignee": "${apt_with_end_consignee_flag}",
 			"apt_with_intermediate": "false",
 			"load_grouping": "${load_grouping}"
@@ -82,12 +84,17 @@
 				<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 				<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
 				{
+				<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
 				"originator_reference_line_number": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
--- a/RPtoRFX_PrepOrder_HeaderMetadata.ftl
+++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_PrepOrder_LineMetadata.ftl
+++ b/RPtoRFX_PrepOrder_LineMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_PrepOrder_OptionalAttributes.ftl
+++ b/RPtoRFX_PrepOrder_OptionalAttributes.ftl
@@ -0,0 +1,8 @@
+<#-- Here are the fields that can be added
+"end_consignee_apt_start_datetime": "0000-00-00T00:00:00",
+"end_consignee_apt_end_datetime": "0000-00-00T00:00:00",
+"reason_code": "str",
+"planned_preparation_date": "0000-00-00",
+"despatch_grouping": "string",
+"reservation_end_datetime": "0000-00-00T00:00:00",
+-->
--- a/RPtoRFX_Receipt.ftl
+++ b/RPtoRFX_Receipt.ftl
@@ -13,6 +13,7 @@
 	},
 	"payload" :
 	 {
+		<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
 		"receipt_reference": "${executionflow.OrderID?json_string}",
 		"receipt_type":        "${receipt_type}",
 		"receipt_reason_code": "${receipt_reason_code}",
@@ -37,12 +38,17 @@
 			<#-- ******* line  MetaData and Segmentationkeys to maps ******** -->
 				<#if line.MetaData??>
 				<#assign Line_MetaData_Map = JsonUtil.sequenceToMap(line.MetaData, "Key", "Value") />
+				<#else>
+				<#assign Line_MetaData_Map = {} />
 				</#if>
 				<#if line.RequestedContent.Goods.SegmentationKeys??>
 				<#assign SegmentationKeys_Map = JsonUtil.sequenceToMap(line.RequestedContent.Goods.SegmentationKeys, "Key", "Value") />
+				<#else>
+				<#assign SegmentationKeys_Map = {} />
 				</#if>
 			<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
 			{
+				<#include "RPtoRFX_Receipt_LineMetadata.ftl">
 				"receipt_reference_line_no": ${line.LineID?number},
 				"item_code": "${line.RequestedContent.Goods.ItemID!""}",
 				"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",
--- a/RPtoRFX_Receipt_HeaderMetadata.ftl
+++ b/RPtoRFX_Receipt_HeaderMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/RPtoRFX_Receipt_LineMetadata.ftl
+++ b/RPtoRFX_Receipt_LineMetadata.ftl
@@ -0,0 +1,17 @@
+<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
+<#-- It is possible to map metadata with additional information,comments... -->
+
+<#--
+<#if Header_MetaData_Map["Color"]??>
+      <#assign COLOR = Header_MetaData_Map["Color"].String/>
+      <#if COLOR??>
+         ,
+         "additional_data_value_list":
+            [
+               {
+                  "code": "Color",
+                  "value": "${COLOR}"
+               }
+            ]
+      </#if>,
+-->
--- a/2
+++ b/2
@@ -1 +1 @@
-1.2.36+1
+1.2.42+1
Author	SHA1	Message	Date
frea	3d95e5f3a2	Release 1.2.42+1	2025-07-10 11:32:59 +02:00
Francis Reat	c370b967e6	Merge branch 'SCPN1-8991-8980-9059-1.2' into 'release/1.2' SCPN1-8991-8980-9059-1.2 See merge request r-d-technique/tiers/reflex-wms-connector!120	2025-07-10 09:31:57 +00:00
GROUP\frea	017cd65077	SCPN1-9059	2025-07-10 09:52:33 +02:00
Laurie Montant	64e863bdfc	SCPN1-9059	2025-07-09 18:14:43 +02:00
Laurie Montant	aec4e6068e	SCPN1-8980 (cherry picked from commit `899cdd2508`)	2025-07-02 14:37:13 +02:00
GROUP\frea	9d7293d92e	SCPN1-8991	2025-07-01 15:42:26 +02:00
frea	86d0974c2f	Release 1.2.41+1	2025-06-20 17:56:35 +02:00
frea	d6a7398af1	Release 1.2.40+1	2025-05-27 09:56:37 +02:00
Francis Reat	7a77f373cc	Merge branch 'SCPN1-8800-1.2' into 'release/1.2' SCPN1-8800 into release 1.2 See merge request r-d-technique/tiers/reflex-wms-connector!110	2025-05-27 07:11:07 +00:00
Laurie Montant	6af5f05491	SCPN1-8800 (cherry picked from commit `5581b8cd29`)	2025-05-26 16:58:18 +02:00
freat	10def5ca60	Release 1.2.39+2	2025-05-13 14:43:31 +02:00
Francis Reat	6db75e83e0	Merge branch 'SCPN1-8728-8696-1.2' into 'release/1.2' SCPN1-8728-8696-1-2 See merge request r-d-technique/tiers/reflex-wms-connector!107	2025-05-13 12:40:03 +00:00
frea	af9ff73850	SCPN1-8728-8696	2025-05-13 14:26:35 +02:00
freat	b3cbfeb1a8	Release 1.2.39+1	2025-04-24 14:28:38 +02:00
freat	29e4acfca4	Release 1.2.38+2	2025-04-15 18:32:12 +02:00
Francis Reat	aa68eb52e9	Merge branch 'to-v10-connector1.2' into 'release/1.2' update FTL See merge request r-d-technique/tiers/reflex-wms-connector!100	2025-04-15 16:24:24 +00:00
frea	320bd8988b	update FTL	2025-04-15 18:15:06 +02:00
freat	1905105118	Release 1.2.38+1	2025-04-11 10:38:27 +02:00
freat	9cadf3329e	Release 1.2.37+2	2025-04-09 11:46:44 +02:00
Francis Reat	4502df6fb0	Merge branch 'SCPN1-8597' into 'release/1.2' SCPN1-8597 See merge request r-d-technique/tiers/reflex-wms-connector!96	2025-04-09 09:46:01 +00:00
frea	3ca4b61e3b	SCPN1-8597	2025-04-09 11:44:48 +02:00
freat	4a26fd9249	Release 1.2.37+1	2025-04-09 10:24:39 +02:00
				`@@ -8,4 +8,3 @@ These FTL core files aim to translate data flow from Reflex WMS into Reflex plat`

				`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/`
@@ -1 +1 @@
 .2.36+1
 .2.42+1