modifs labelled

2024-09-30 15:28:24 +02:00
parent 9f02fce236
commit e97066c118
2 changed files with 19 additions and 12 deletions
--- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
+++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl
@@ -8,7 +8,16 @@
    "ProjectID": "${projectRP}"
    },
    "ID": {
-			"RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      <#if despatched_ipg.consignment_unit_id!="">
+			  "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}"
+      <#else>
+        <#if despatched_ipg.carton_number != "000000000000000000">
+          "RefID":"${despatched_ipg.carton_number}"
+        <#else>
+          "RefID":"${despatched_ipg.hd_number}"
+        </#if>
+      </#if>
+
      "RefDate": {
              "DateTime": "${dispatched_datetime4}",
              "AuthorTimeZone": "${time_zone_rfx}"