SCPN1-10253

This commit is contained in:
2026-03-02 16:18:04 +01:00
parent 70ec04c65a
commit eea2a41313
5 changed files with 9 additions and 33 deletions

View File

@@ -112,15 +112,12 @@
"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", "ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
"ProjectID": "${projectRP}", "ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}", "PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}", "OrganisationID": "${organisationRP}"
<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
], ],
"ProjectID" : "${projectRP}", "ProjectID" : "${projectRP}"
<#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl"> }]
}],
<#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl">
}, },
<#else> <#else>
"Loading" : "Loading" :
@@ -130,13 +127,10 @@
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}", "ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}", "PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}", "OrganisationID": "${organisationRP}"
<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
}], }],
"ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
<#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl"> }]
}],
<#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl">
}, },
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",

View File

@@ -108,15 +108,12 @@
"ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}", "ExecutionflowID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year?json_string}${physical_receipt.receipt_number?json_string}",
"ProjectID": "${projectRP}", "ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}", "PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}", "OrganisationID": "${organisationRP}"
<#include "RFXtoRP_HsrCarrierApt_Quantities.ftl">
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
], ],
"ProjectID" : "${projectRP}", "ProjectID" : "${projectRP}"
<#include "RFXtoRP_HsrCarrierApt_ProjectQuantities.ftl"> }]
}],
<#include "RFXtoRP_HsrCarrierApt_TotalQuantities.ftl">
}, },
<#else> <#else>
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">

View File

@@ -1,5 +0,0 @@
"ProjectQuantities": [
]

View File

@@ -1,5 +0,0 @@
"Quantities": [
]

View File

@@ -1,5 +0,0 @@
"TotalQuantities": [
]