Release 2.0.25+4

Merge branch 'SCPN1-11090' into 'release/2.0'
SCPN1-11090 See merge request r-d-technique/tiers/reflex-wms-connector!308
2026-07-29 14:56:27 +02:00 · 2026-07-29 12:46:48 +00:00 · 2026-07-29 12:21:08 +00:00 · 2026-07-29 12:20:59 +00:00 · 2026-07-29 12:20:51 +00:00 · 2026-07-29 12:20:44 +00:00
5 changed files with 90 additions and 67 deletions
--- a/RFXtoRP_HsrReceiptList.ftl
+++ b/RFXtoRP_HsrReceiptList.ftl
@@ -102,18 +102,22 @@
                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
                }
              <#else>
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
-                },
-                {
-                <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
-                "apiReflexPlatformID" :  "${apiReflexPlatformID}",
-                "datas" :
-                <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
-                }
+                <#if receipt.line_list ?? && receipt.line_list[0]??>
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
+                  },
+                  {
+                  <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
+                  "apiReflexPlatformID" :  "${apiReflexPlatformID}",
+                  "datas" :
+                  <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
+                  }
+                  <#else>
+                    <#stop> <#-- No line -->
+                  </#if>
              </#if>
            <#else>
              <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
@@ -138,6 +142,7 @@
                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                    }
                  <#else>
+                    <#if receipt.line_list ?? && receipt.line_list[0]??>
                    {
                      <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
                      "apiReflexPlatformID" :  "${apiReflexPlatformID}",
@@ -150,10 +155,14 @@
                      "datas" :
                      <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
                    }
+                    <#else>
+                      <#stop> <#-- No line -->
+                    </#if>
                  </#if>
                <#else>
                  <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
                    <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
+                      <#if receipt.line_list ?? && receipt.line_list[0]??>
                    [
                      {
                        <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -168,6 +177,9 @@
                        <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
                      }
                    ]
+                      <#else>
+                        <#stop> <#-- No line -->
+                      </#if>
                    <#else>
                      <#stop> <#-- Receipt reference for transfer is empty-->
                    </#if>
@@ -186,7 +198,7 @@
                      <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
                      }
                    <#else>
-                      <#stop>
+                      <#stop> <#-- No line -->
                    </#if>
                  </#if>
                </#if>
--- a/RFXtoRP_PlatformLogCreate.ftl
+++ b/RFXtoRP_PlatformLogCreate.ftl
@@ -1,7 +1,16 @@
 <#include "HfRpConfig.ftl">
 [
    <#assign UUID = UUID.randomUUID()>
-    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)>
+    <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")>
+    <#assign maxLen = 32000>
+    <#if strJsonBody?length gt maxLen>
+        <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")?replace('"logical_key_list"\\s*:\\s*\\[[^\\]]*\\]', '"logical_key_list": []', 'r')>
+    </#if>
+    <#if strJsonBody?length gt maxLen>
+        <#assign safeJsonBody = "{\"truncated\": true, \"original_size\": " + strJsonBody?length + "}">
+    <#else>
+        <#assign safeJsonBody = strJsonBody>
+    </#if>
 	{
 	  "Header": {
 	    "ProjectID": "${projectRP}"
@@ -17,27 +26,26 @@
 	      <#assign severity = SeverityLevel.ERROR>
 	     "Severity": "${severity}",
 	     "Namespace": "ReflexIntegration",
-	    "DateTime": {
-	      "DateTime": "${aDateTime?iso_utc}",
-	      "AuthorTimeZone": "${time_zone_rfx}"
+		"DateTime": {
+		"DateTime": "${aDateTime?iso_utc}",
+		"AuthorTimeZone": "${time_zone_rfx}"
 	    },
 	    "TechMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')}
+      "Label": "${safeJsonBody?json_string}"
 	      },
 	    "UserMessage": {
 	      "Code": "${restResponsetMsg.status!"no Code"}",
-	      "Label": ${strJsonBody?truncate(32000,'...')},
+          "Label": "${safeJsonBody?json_string}",
 	      "Params": []
 	    },
 	    "DetailElements": [],
 	    "CorrelationID": "${id.correlationid!"no Correlationid"}",
-	    "ContextPayload": ${strJsonBody?truncate(32000,'...')},
+	    "ContextPayload": "${safeJsonBody?json_string}",
 	    "Type": "${event}",
 	    "Task": "${id.apiRestReflexID!"no Task"}",
 	    "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
 	    "StackTrace": ""
 	  }
 	}
-
 ]
--- a/RFXtoRP_RestResponse.ftl
+++ b/RFXtoRP_RestResponse.ftl
@@ -358,7 +358,7 @@
 			]
 			</#switch>
 			<#break>
-	<#-- *********************************************** ApiRestID = canceled ******************** -->
+	<#-- *********************************************** ApiRestID = status ******************** -->
 	<#case "status_appointment_put_update_by_ref">
 	<#case "status_appointment_put_update_by_number">
 		<#switch restResponsetMsg.status!no_status>
--- a/RPtoRFX_CarrierAppointmentCreated.ftl
+++ b/RPtoRFX_CarrierAppointmentCreated.ftl
@@ -37,10 +37,14 @@
 		<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
 		<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
 			<#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
-				appointment.Unloading.Projects[0]?? &&
-				appointment.Unloading.Projects[0].Commissions??>
-			"physical_receipt_list": [
-				<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
+			appointment.Unloading.Projects[0]?? &&
+			appointment.Unloading.Projects[0].Commissions?? >
+				<#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" &&
+				(appointment.Unloading.Projects[0].Commissions[0].OrderID!"") == "">
+					"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+				<#else>
+					"physical_receipt_list": [
+					<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
 					<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
 					{
 						"receipt_activity": "${custom.value.activity_code?json_string}",
@@ -53,9 +57,9 @@
 					</#list>
 					<#sep>,</#sep>
 					</#list>
-				],
-			"anticipated_receipt_list": [
-				<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
+					],
+					"anticipated_receipt_list": [
+					<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission>
 					<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>
 					{
 						"activity": "${custom.value.activity_code?json_string}",
@@ -69,9 +73,8 @@
 					</#list>
 					<#sep>,</#sep>
 					</#list>
-				],
-			<#else>
-				"appointment_designation":"${(appointment.Reason!"")!?json_string}",
+					],
+				</#if>
 			</#if>
 		<#else>
 			<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.25+2
+2.0.25+4
Author	SHA1	Message	Date
Nathan SOULIER	3230207b81	Release 2.0.25+4	2026-07-29 14:56:27 +02:00
Laurie CELLIER	d74a5e2cf9	Merge branch 'SCPN1-11090' into 'release/2.0' SCPN1-11090 See merge request r-d-technique/tiers/reflex-wms-connector!308	2026-07-29 12:46:48 +00:00
Laurie CELLIER	3d6afa4f30	SCPN1-11090 (cherry picked from commit 911ed1d5cf8238a7ca8d267005ca9ac18aee551b) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:21:08 +00:00
Laurie CELLIER	3f8ee07798	SCPN1-11090 (cherry picked from commit 72bf165112481625c9164f153e5368da710375f2) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:20:59 +00:00
Laurie CELLIER	ff617683e7	SCPN1-11090 (cherry picked from commit 70fe4a3eda48a1cd6bf6be79858acb01d24c3286) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:20:51 +00:00
Laurie CELLIER	d12a852ae4	SCPN1-11090 (cherry picked from commit cb1b99af9644613d8cc4033e10ef971f66328417) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:20:44 +00:00
Laurie CELLIER	35819ec7b5	SCPN1-11090 (cherry picked from commit af2ccc088c2dd4a2ab1385ba705b7615a2297ca3) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:20:31 +00:00
Laurie CELLIER	baa910ab21	SCPN1-11090 (cherry picked from commit 8b8abd09daf3f10bec389d98457d2258e169c08c) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:20:17 +00:00
Laurie CELLIER	d358b41bf0	SCPN1-11090 (cherry picked from commit fb17a8e1172803a8de6c7c07a3b0689720f8398e) Co-authored-by: Laurie Montant <laurie.montant@hardis-group.com>	2026-07-29 12:20:03 +00:00
Nathan SOULIER	22051fb31d	Release 2.0.25+3	2026-07-23 10:37:52 +02:00
Nathan SOULIER	36207120d6	Merge branch 'release2.0-SCPN1-11065' into 'release/2.0' SCPN1-11065 See merge request r-d-technique/tiers/reflex-wms-connector!303	2026-07-23 08:36:01 +00:00
Laurie Montant	01038d40c0	SCPN1-11065	2026-07-20 16:55:34 +02:00
@@ -1 +1 @@
 .0.25+2
 .0.25+4