Revert "SCPN1-9640"
This reverts commit 894031cc496634f5f5d2a63d043f4cc7a72b0613.
This commit is contained in:
parent
bf365ba170
commit
a151a0b655
@ -15,8 +15,6 @@
|
|||||||
"ProjectID": "${projectRP}"
|
"ProjectID": "${projectRP}"
|
||||||
},
|
},
|
||||||
"ActorID": "${carrier_apt.physical_depot}",
|
"ActorID": "${carrier_apt.physical_depot}",
|
||||||
"AppointmentID": "${carrier_apt.appointment_reference}",
|
|
||||||
"TimeZone":"${time_zone_rfx}",
|
|
||||||
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
|
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "false">
|
||||||
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
|
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_RECEPTION>
|
||||||
<#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime,time_zone_rfx) />
|
<#assign duration = RfxDurationBetweenTwoDateTimetoInSeconds(carrier_apt.planned_unloading_start_datetime,carrier_apt.planned_unloading_end_datetime,time_zone_rfx) />
|
||||||
@ -34,32 +32,12 @@
|
|||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
"AppointmentType": "${appointmentType}",
|
"ProjectID": "${projectRP}",
|
||||||
"Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer -->
|
"Emails": ["francis.reat@hardis-group.com"], <#-- à confirmer -->
|
||||||
|
"Reason": "no commission", <#-- à confirmer -->
|
||||||
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?size == carrier_apt.physical_receipt_list?filter(l ->l??)?size)>
|
"CarrierName": "${carrier_apt.planned_carrier}",
|
||||||
"Commissions": [
|
"AppointmentType": "${appointmentType}",
|
||||||
<#list carrier_apt.physical_receipt_list as physical_receipt>
|
"AppointmentID": "${carrier_apt.appointment_reference}",
|
||||||
{
|
|
||||||
"ActorID": "${carrier_apt.physical_depot}",
|
|
||||||
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
|
|
||||||
"ProjectID": "${projectRP}",
|
|
||||||
"Quantities": [
|
|
||||||
{
|
|
||||||
"UnitID": "PAL", <#-- à changer -->
|
|
||||||
"Value": 1 <#-- à changer -->
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}<#sep>,</#sep>
|
|
||||||
</#list>
|
|
||||||
]
|
|
||||||
<#else>
|
|
||||||
"ProjectID": "${projectRP}",
|
|
||||||
"Reason": "no commission", <#-- à confirmer -->
|
|
||||||
</#if>
|
|
||||||
<#if carrier_apt.planned_carrier?? && carrier_apt.planned_carrier!="">
|
|
||||||
"CarrierName": "${carrier_apt.planned_carrier}",
|
|
||||||
</#if>
|
|
||||||
"Slots": [{
|
"Slots": [{
|
||||||
<#-- 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}",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user