SCPN1-8870

2025-06-24 15:28:59 +02:00 · 2025-06-24 15:28:59 +02:00 · 3d816434af
commit 3d816434af
parent 9f0bedc583
7 changed files with 36 additions and 18 deletions
--- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
+++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl
@ -8,7 +8,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-      "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+      </#if>
    "RefDate": {
      "DateTime": "${preparation_status_datetime}",
      "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl
@ -7,7 +7,11 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+        "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+      <#else>
+        "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+      </#if>
       "RefDate": {
        "DateTime": "${preparation_status_datetime}",
        "AuthorTimeZone": "${time_zone_rfx}"
--- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl
@ -7,10 +7,14 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        <#else>
+          "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl
+++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl
@ -7,10 +7,14 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
-       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        <#else>
+          "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+        </#if>
+        "RefDate": {
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsaProStatus_TransportStarted.ftl
+++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl
@ -7,10 +7,14 @@
      "ProjectID": "${projectRP}"
    },
    "ID": {
-         "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        <#if preparationStatusInterface.preparation_order_originator_reference?? && preparationStatusInterface.preparation_order_originator_reference!="">
+          "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}",
+        <#else>
+          "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_year?trim?json_string}${preparationStatusInterface.preparation_order_number?trim?json_string}",
+        </#if>
       "RefDate": {
-        "DateTime": "${preparation_status_datetime}",
-        "AuthorTimeZone": "${time_zone_rfx}"
+          "DateTime": "${preparation_status_datetime}",
+          "AuthorTimeZone": "${time_zone_rfx}"
      }
    },

--- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl
@ -3,9 +3,9 @@
 <#include "ActorPrefix.ftl">
 [
  <#assign refIDHmap_local ={}>
-   <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line>
+   <#list preparationOrder.preparation_line_lst as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-    <#if !refIDHmap_local[OrderOriginReference]?? >
+
        <#if refIDHmap_local?size != 0 >
        ,
        </#if>
@ -28,7 +28,6 @@
      </#if> -->
    }
    }
-    </#if>
  </#list>
  <#assign refIDHmap_local ={}>
 ]
--- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
+++ b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl
@ -5,7 +5,7 @@
  <#assign refIDHmap_local ={}>
  <#list preparationOrder.preparation_line_lst as preparation_line>
  <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string>
-  <#if !refIDHmap_local[OrderOriginReference]?? >
+
      <#if refIDHmap_local?size != 0 >
    ,
    </#if>
@ -23,7 +23,6 @@
      }
    }
    }
-  </#if>
  </#list>
  <#assign refIDHmap_local ={}>
 ]