unicité

RFXtoRP_HsrPro_ExecutionflowDetected.ftl

@@ -27,11 +27,7 @@
                 "CarrierService":"${preparation_order.transport_grade_code?trim?json_string}",
         </#if> -->
         "ShipFrom": {
-          <#if uniqueness?? && uniqueness!="" >
-            "ActorID": "${preparation_order.physical_depot_code?trim?json_string}"
-          <#else>
-            "ActorID": "${prefixdepot}${preparation_order.physical_depot_code?trim?json_string}"
-          </#if>
+          "ActorID": "${RFXtoRPprefixDepot(preparation_order.physical_depot_code?trim?json_string)}"
         },
        "ShipFromAcked": true,
          "ShipTo": {
@@ -53,11 +49,7 @@
           preparation_order.address.territorial_division_code == "" &&
           preparation_order.address.postal_code == "" &&
           preparation_order.address.iso_country_code == "">
-            <#if uniqueness?? && uniqueness!="" >
-              "ActorID": "${preparation_order.end_consignee_code}"
-            <#else>
-              "ActorID": "${prefixconsignee}${preparation_order.end_consignee_code}"
-            </#if>
+            "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code)}"
           <#else>
             "Actor":
              {
@@ -93,7 +85,6 @@
                 </#if>
           <#-- Line Metadata inclusion -->
           <#include "RFXtoRP_HsrPro_ExecutionflowDetected_LineMetadata.ftl">,
-
              "RequestedContent":
              {
                    "Goods":
@@ -104,10 +95,8 @@
                        <#assign forced_priority_date = preparation_order_line.optional_attributes.forced_priority_date?datetime(rfx_date_format_default)?iso_utc />
                            "PriorityDate": "${forced_priority_date}",
                       </#if>
-
               <#--  Segmentation Keys inclusion -->
             <#include "RFXtoRP_HsrPro_ExecutionflowDetected_SegmentationKeys.ftl">
-
                },
                "Quantity" :
                {
@@ -119,7 +108,6 @@
            </#list>
          ],
          </#if>
-
          "RequestedMilestones" :
           {
              "RequestedDeliveryDateTime" :