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
3 changed files with 15 additions and 12 deletions
--- 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+3
+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
@@ -1 +1 @@
 .0.25+3
 .0.25+4