You've already forked reflex-wms-connector
SCPN1-10882
This commit is contained in:
@@ -107,84 +107,87 @@
|
|||||||
<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
|
<#include "RFXtoRP_HsrCarrierApt_SegmentationSelections.ftl">,
|
||||||
<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
|
<#include "RFXtoRP_HsrCarrierApt_CarrierInformation.ftl">,
|
||||||
<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
|
<#include "RFXtoRP_HsrCarrierApt_MetadataAppointment.ftl">,
|
||||||
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
|
<#if ( (carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
|
||||||
"Unloading" :
|
<#assign AddComma = false />
|
||||||
{
|
"Unloading" :
|
||||||
"Projects" : [{
|
{
|
||||||
"Commissions": [
|
"Projects" : [
|
||||||
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
|
{
|
||||||
{
|
"Commissions": [
|
||||||
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) >
|
||||||
<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
|
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
|
||||||
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
|
|
||||||
<#else>
|
|
||||||
"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
|
|
||||||
</#if>
|
|
||||||
"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}",
|
|
||||||
"PartnerAppID": "${partnerApplicationRP}",
|
|
||||||
"OrganisationID": "${organisationRP}"
|
|
||||||
}<#sep>,</#sep>
|
|
||||||
</#list>
|
|
||||||
],
|
|
||||||
"ProjectID" : "${projectRP}"
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
<#else>
|
|
||||||
<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
|
|
||||||
"Unloading" :
|
|
||||||
{
|
|
||||||
"Projects" : [{
|
|
||||||
"Commissions": [
|
|
||||||
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
|
|
||||||
{
|
|
||||||
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
|
||||||
<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
|
|
||||||
"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
|
|
||||||
<#else>
|
|
||||||
"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
|
|
||||||
</#if>
|
|
||||||
"ProjectID": "${projectRP}",
|
|
||||||
"PartnerAppID": "${partnerApplicationRP}",
|
|
||||||
"OrganisationID": "${organisationRP}"
|
|
||||||
}<#sep>,</#sep>
|
|
||||||
</#list>
|
|
||||||
],
|
|
||||||
"ProjectID" : "${projectRP}"
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
<#else>
|
|
||||||
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
|
|
||||||
"Unloading" :
|
|
||||||
<#else>
|
|
||||||
"Loading" :
|
|
||||||
</#if>
|
|
||||||
{
|
{
|
||||||
"Projects" : [{
|
<#assign AddComma = true />
|
||||||
"Commissions": [{
|
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
||||||
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
|
||||||
"ProjectID": "${projectRP}",
|
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
|
||||||
"PartnerAppID": "${partnerApplicationRP}",
|
|
||||||
"OrganisationID": "${organisationRP}"
|
|
||||||
}],
|
|
||||||
"ProjectID" : "${projectRP}"
|
|
||||||
}]
|
|
||||||
},
|
|
||||||
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
|
||||||
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
|
|
||||||
<#else>
|
|
||||||
<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
|
|
||||||
"Reason": "${carrier_apt.appointment_designation?json_string}",
|
|
||||||
<#else>
|
|
||||||
<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
|
|
||||||
"Reason": "${carrier_apt.appointment_reference?json_string}",
|
|
||||||
<#else>
|
<#else>
|
||||||
"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
|
"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
|
||||||
</#if>
|
</#if>
|
||||||
|
"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}",
|
||||||
|
"PartnerAppID": "${partnerApplicationRP}",
|
||||||
|
"OrganisationID": "${organisationRP}"
|
||||||
|
}<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
|
</#if>
|
||||||
|
<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) >
|
||||||
|
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
|
||||||
|
<#if AddComma == true>
|
||||||
|
,
|
||||||
</#if>
|
</#if>
|
||||||
|
{
|
||||||
|
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
||||||
|
<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
|
||||||
|
"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
|
||||||
|
<#else>
|
||||||
|
"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
|
||||||
|
</#if>
|
||||||
|
"ProjectID": "${projectRP}",
|
||||||
|
"PartnerAppID": "${partnerApplicationRP}",
|
||||||
|
"OrganisationID": "${organisationRP}"
|
||||||
|
}<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
|
</#if>
|
||||||
|
],
|
||||||
|
"ProjectID" : "${projectRP}"
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
<#else>
|
||||||
|
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
|
||||||
|
"Unloading" :
|
||||||
|
<#else>
|
||||||
|
"Loading" :
|
||||||
|
</#if>
|
||||||
|
{
|
||||||
|
"Projects" : [
|
||||||
|
{
|
||||||
|
"Commissions": [
|
||||||
|
{
|
||||||
|
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
||||||
|
"ProjectID": "${projectRP}",
|
||||||
|
"PartnerAppID": "${partnerApplicationRP}",
|
||||||
|
"OrganisationID": "${organisationRP}"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"ProjectID" : "${projectRP}"
|
||||||
|
}]
|
||||||
|
},
|
||||||
|
|
||||||
|
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
|
||||||
|
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
|
||||||
|
<#else>
|
||||||
|
<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!="">
|
||||||
|
"Reason": "${carrier_apt.appointment_designation?json_string}",
|
||||||
|
<#else>
|
||||||
|
<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
|
||||||
|
"Reason": "${carrier_apt.appointment_reference?json_string}",
|
||||||
|
<#else>
|
||||||
|
"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}",
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
|
</#if>
|
||||||
"Slot": {
|
"Slot": {
|
||||||
<#-- calcul de de la durée en fonction des start et end time-->
|
<#-- calcul de de la durée en fonction des start et end time-->
|
||||||
"DurationInSeconds": "${duration}",
|
"DurationInSeconds": "${duration}",
|
||||||
|
|||||||
@@ -90,6 +90,7 @@
|
|||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
"TimeZone":"${time_zone_rfx}",
|
"TimeZone":"${time_zone_rfx}",
|
||||||
|
|
||||||
<#if ( (carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
|
<#if ( (carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)) || (carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0))) >
|
||||||
<#assign AddComma = false />
|
<#assign AddComma = false />
|
||||||
"Unloading" :
|
"Unloading" :
|
||||||
@@ -97,39 +98,41 @@
|
|||||||
"Projects" : [
|
"Projects" : [
|
||||||
{
|
{
|
||||||
"Commissions": [
|
"Commissions": [
|
||||||
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
|
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) >
|
||||||
{
|
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
|
||||||
<#assign AddComma = true />
|
{
|
||||||
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
<#assign AddComma = true />
|
||||||
<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
|
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
||||||
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
|
<#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
|
||||||
<#else>
|
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
|
||||||
"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
|
<#else>
|
||||||
</#if>
|
"OrderID": "R${carrier_apt.physical_depot?json_string}${physical_receipt.receipt_activity?json_string}${physical_receipt.originator_code?json_string}${physical_receipt.receipt_year}${physical_receipt.receipt_number}",
|
||||||
"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}",
|
</#if>
|
||||||
"ProjectID": "${projectRP}",
|
"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}",
|
||||||
"PartnerAppID": "${partnerApplicationRP}",
|
"ProjectID": "${projectRP}",
|
||||||
"OrganisationID": "${organisationRP}"
|
"PartnerAppID": "${partnerApplicationRP}",
|
||||||
}<#sep>,</#sep>
|
"OrganisationID": "${organisationRP}"
|
||||||
</#list>
|
}<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
|
|
||||||
<#if AddComma == true>
|
|
||||||
,
|
|
||||||
</#if>
|
</#if>
|
||||||
{
|
<#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) >
|
||||||
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
<#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
|
||||||
<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
|
<#if AddComma == true>
|
||||||
"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
|
,
|
||||||
<#else>
|
|
||||||
"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
|
|
||||||
</#if>
|
</#if>
|
||||||
"ProjectID": "${projectRP}",
|
{
|
||||||
"PartnerAppID": "${partnerApplicationRP}",
|
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
|
||||||
"OrganisationID": "${organisationRP}"
|
<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
|
||||||
}<#sep>,</#sep>
|
"OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
|
||||||
</#list>
|
<#else>
|
||||||
|
"OrderID": "AR${carrier_apt.physical_depot?json_string}${anticipated_receipt.activity?json_string}${anticipated_receipt.originator_code?json_string}${anticipated_receipt.anticipated_receipt_year}${anticipated_receipt.anticipated_receipt_number}",
|
||||||
|
</#if>
|
||||||
|
"ProjectID": "${projectRP}",
|
||||||
|
"PartnerAppID": "${partnerApplicationRP}",
|
||||||
|
"OrganisationID": "${organisationRP}"
|
||||||
|
}<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
|
</#if>
|
||||||
],
|
],
|
||||||
"ProjectID" : "${projectRP}"
|
"ProjectID" : "${projectRP}"
|
||||||
}]
|
}]
|
||||||
|
|||||||
Reference in New Issue
Block a user