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

24
RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
View File

@@ -130,6 +130,29 @@
"ProjectID" : "${projectRP}" "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> <#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING> <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING>
"Unloading" : "Unloading" :
@@ -161,6 +184,7 @@
</#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}",

24
RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
View File

@@ -115,6 +115,29 @@
}] }]
}, },
"Reason": "", "Reason": "",
<#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> <#else>
<#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> <#if appointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>
"Loading" : "Loading" :
@@ -165,6 +188,7 @@
</#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}",

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>