diff --git a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl index bf31116..242111f 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierArrived.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl index dc4ed53..2875778 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierDeparted.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl index dc4ed53..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl +++ b/RFXtoRP_HsaLstCarSta_CarrierExpected.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl index dc4ed53..2875778 100644 --- a/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl +++ b/RFXtoRP_HsaLstCarSta_LoadingCompleted.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl index dc4ed53..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl +++ b/RFXtoRP_HsaLstCarSta_LoadingStarted.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl index dc4ed53..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl +++ b/RFXtoRP_HsaLstCarSta_UnloadingCompleted.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl index 3b8b98e..81e923f 100644 --- a/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl +++ b/RFXtoRP_HsaLstCarSta_UnloadingStarted.ftl @@ -5,11 +5,19 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> - "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#if carrier_apt_status.constant_appointment?? && carrier_apt_status.constant_appointment== "true"> + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference!=""> + "AppointmentID": "${carrier_apt_status.appointment_reference?json_string}-${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> + "AppointmentID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + <#else> - "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", - + <#if carrier_apt_status.appointment_reference?? && carrier_apt_status.appointment_reference !=""> + "RefID": "${carrier_apt_status.appointment_reference?json_string}", + <#else> + "RefID": "${carrier_apt_status.appointment_year_number?json_string}-${carrier_apt_status.appointment_number?json_string}", + + "RefDate": { "DateTime": "${ref_datetime}", "AuthorTimeZone": "${time_zone_rfx}"