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

SCPN1-10882

Browse Source
This commit is contained in:
Laurie Montant
2026-06-11 15:16:17 +02:00
parent 06e48d4476
commit 9c446ffdcc
3 changed files with 107 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
View File

@@ -131,32 +131,56 @@
}] }]
}, },
<#else> <#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING> <#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
"Unloading" : "Unloading" :
<#else>
"Loading" :
</#if>
{ {
"Projects" : [{ "Projects" : [{
"Commissions": [{ "Commissions": [
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", <#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
"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!="">
}], "OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
"ProjectID" : "${projectRP}" <#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}"
}] }]
}, },
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
<#else> <#else>
<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
"Reason": "${carrier_apt.appointment_designation?json_string}", "Unloading" :
<#else> <#else>
<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> "Loading" :
"Reason": "${carrier_apt.appointment_reference?json_string}", </#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> <#else>
"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#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>

104
RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
View File

@@ -114,53 +114,77 @@
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]
}, },
"Reason": "", "Reason": "",
<#else> <#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> <#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0)>
"Loading" :
{
"Projects" : [
{
"Commissions": [
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}"
}
],
"ProjectID" : "${projectRP}"
}]
},
<#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
"Unloading" : "Unloading" :
{ {
"Projects" : [ "Projects" : [{
{ "Commissions": [
"Commissions": [ <#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
{ {
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}", <#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
"PartnerAppID": "${partnerApplicationRP}", "OrderID": "${anticipated_receipt.anticipated_receipt_reference?json_string}",
"OrganisationID": "${organisationRP}" <#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}" "ProjectID" : "${projectRP}"
}] }]
}, },
</#if>
</#if>
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
<#else> <#else>
<#if carrier_apt.appointment_designation?? && carrier_apt.appointment_designation!=""> <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
"Reason": "${carrier_apt.appointment_designation?json_string}", "Loading" :
{
"Projects" : [
{
"Commissions": [
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}"
}
],
"ProjectID" : "${projectRP}"
}]
},
<#else> <#else>
<#if carrier_apt.appointment_reference?? && carrier_apt.appointment_reference!=""> <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
"Reason": "${carrier_apt.appointment_reference?json_string}", "Unloading" :
{
"Projects" : [
{
"Commissions": [
{
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
"ProjectID": "${projectRP}",
"PartnerAppID": "${partnerApplicationRP}",
"OrganisationID": "${organisationRP}"
}
],
"ProjectID" : "${projectRP}"
}]
},
</#if>
</#if>
<#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> <#else>
"Reason": "${carrier_apt.year_number}-${carrier_apt.appointment_number}", <#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>

2
RPtoRFX_CarrierAppointmentCreated.ftl
View File

@@ -39,7 +39,7 @@
<#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? && <#if appointment.Unloading?? && appointment.Unloading.Projects?? && appointment.Unloading.Projects[0]?? &&
appointment.Unloading.Projects[0].Commissions?? && appointment.Unloading.Projects[0].Commissions?? &&
appointment.Unloading.Projects[0].Commissions[0]?? && appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!="" appointment.Unloading.Projects[0].Commissions[0]?? && appointment.Unloading.Projects[0].Commissions[0].OrderID?? && appointment.Unloading.Projects[0].Commissions[0].OrderID!=""
&& appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID=="" > && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID?? && appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID == "" >
"anticipated_receipt_list": [ "anticipated_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.OrderID?? && l.OrderID !="") as commission> <#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.OrderID?? && l.OrderID !="") as commission>
<#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom> <#list eventRP.orderCustomFields.entrySet()?filter(l ->l.key == commission.OrderID && l.value?? && l.value?has_content) as custom>