Release 2.0.8+3

Merge branch 'SCPN1-9348-2.0' into 'release/2.0'
SCPN1-9348-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!141
2025-09-26 09:23:02 +02:00 · 2025-09-26 07:12:06 +00:00 · 2025-09-25 16:31:24 +02:00 · 2025-09-24 10:22:52 +02:00 · 2025-09-24 08:20:38 +00:00 · 2025-09-24 10:13:06 +02:00
4 changed files with 4 additions and 4 deletions
--- a/RFXtoRP_HsrPrepa.ftl
+++ b/RFXtoRP_HsrPrepa.ftl
@@ -51,8 +51,7 @@
               <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? ) 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>
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/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!="" >
    ,
--- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
+++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl
@@ -29,7 +29,6 @@
        <#else>
          "OrderID": "R${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>
        "OrderID":"${receipt.receipt_reference?trim?json_string}",
        <#-- Header Metadata inclusion -->
        <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">,
        "ShipFrom":
--- a/2
+++ b/2
@@ -1 +1 @@
-2.0.8+1
+2.0.8+3
Author	SHA1	Message	Date
frea	b29f28997a	Release 2.0.8+3	2025-09-26 09:23:02 +02:00
Francis Reat	fc18c04521	Merge branch 'SCPN1-9348-2.0' into 'release/2.0' SCPN1-9348-2.0 See merge request r-d-technique/tiers/reflex-wms-connector!141	2025-09-26 07:12:06 +00:00
GROUP\frea	f4b0561643	SCPN1-9348 (cherry picked from commit `a6628be34e`)	2025-09-25 16:31:24 +02:00
frea	12e157078c	Release 2.0.8+2	2025-09-24 10:22:52 +02:00
Francis Reat	ac7936a675	Merge branch 'SCPN1-9338' into 'release/2.0' SCPN1-9338 See merge request r-d-technique/tiers/reflex-wms-connector!138	2025-09-24 08:20:38 +00:00
Laurie Montant	36804fef81	Correction transfert (cherry picked from commit `4fd4007794`)	2025-09-24 10:13:06 +02:00