reflex/reflex-wms-connector
0
Fork 0
Code Pull Requests Projects Releases Wiki Activity

SCPN1-10408

Browse Source
This commit is contained in:
Laurie MONTANT
2026-03-10 10:43:35 +01:00
parent 68a39fab3d
commit c04e562c46
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
View File

@@ -8,7 +8,7 @@
"RefDate": { "RefDate": {
"DateTime": "${creation_datetime}", "DateTime": "${creation_datetime}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
}, },
<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
@@ -85,8 +85,7 @@
<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
</#if> </#if>
<#else> <#else>
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#stop "Appointment type not supported" >
<#assign duration = 0 />
</#if> </#if>
</#if> </#if>
</#if> </#if>
@@ -98,7 +97,7 @@
<#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.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0)>
"Unloading" : "Unloading" :
{ {
"Projects" : [{ "Projects" : [{
"Commissions": [ "Commissions": [
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt> <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
@@ -123,13 +122,13 @@
}, },
<#else> <#else>
"Loading" : "Loading" :
{ {
"Projects" : [{ "Projects" : [{
"Commissions": [{ "Commissions": [{
"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}"
}], }],
"ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}" "ProjectID" : "${projectRP}:${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}"
}] }]

9
RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
View File

@@ -9,7 +9,7 @@
"RefDate": { "RefDate": {
"DateTime": "${update_datetime}", "DateTime": "${update_datetime}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
}, },
<#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true"> <#if carrier_apt.constant_appointment?? && carrier_apt.constant_appointment== "true">
<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> <#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!="">
"RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}", "RefID": "${carrier_apt.appointment_reference?json_string}-${carrier_apt.year_number}-${carrier_apt.appointment_number}",
@@ -85,17 +85,16 @@
<#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" > <#stop "planned_unloading_start_datetime or planned_load_end_datetime field of appointmend are not valid" >
</#if> </#if>
<#else> <#else>
<#assign appointmentType = AppointmentType.APPOINTMENT_TYPE_UNKNOWN> <#stop "Appointment type not supported" >
<#assign duration = 0 />
</#if> </#if>
</#if> </#if>
</#if> </#if>
"TimeZone":"${time_zone_rfx}", "TimeZone":"${time_zone_rfx}",
<#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))> <#if carrier_apt.physical_receipt_list?? && (carrier_apt.physical_receipt_list?filter(l ->l??)?size != 0) && ((carrier_apt.unloading_appointment =="true" && carrier_apt.load_appointment =="false") || (carrier_apt.unloading_appointment =="false" && carrier_apt.load_appointment =="true"))>
"Unloading" : "Unloading" :
{ {
"Projects" : [ "Projects" : [
{ {
"Commissions": [ "Commissions": [
<#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt> <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
{ {