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-16 17:08:55 +02:00
parent 80e470190c
commit e17468f659
2 changed files with 108 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
RFXtoRP_HsrCarrierApt_BookingForceBookAppointment.ftl
View File

@@ -107,13 +107,17 @@
<#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))) >
<#assign AddComma = false />
"Unloading" : "Unloading" :
{ {
"Projects" : [{ "Projects" : [
{
"Commissions": [ "Commissions": [
<#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> <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
{ {
<#assign AddComma = true />
"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!=""> <#if physical_receipt.physical_receipt_reference?? && physical_receipt.physical_receipt_reference!="">
"OrderID": "${physical_receipt.physical_receipt_reference?json_string}", "OrderID": "${physical_receipt.physical_receipt_reference?json_string}",
@@ -126,17 +130,12 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
], </#if>
"ProjectID" : "${projectRP}" <#if carrier_apt.anticipated_receipt_list?? && (carrier_apt.anticipated_receipt_list?filter(l ->l??)?size != 0) >
}]
},
<#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> <#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
<#if AddComma == true>
,
</#if>
{ {
"ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}", "ActorID": "${RFXtoRPprefixDepot(carrier_apt.physical_depot?json_string)}",
<#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!=""> <#if anticipated_receipt.anticipated_receipt_reference?? && anticipated_receipt.anticipated_receipt_reference!="">
@@ -149,6 +148,7 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
</#if>
], ],
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]
@@ -160,16 +160,20 @@
"Loading" : "Loading" :
</#if> </#if>
{ {
"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}" "ProjectID" : "${projectRP}"
}] }]
}, },
<#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true"> <#if carrier_apt.unloading_appointment == "true" && carrier_apt.load_appointment == "true">
"Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}", "Reason": "UNLOADING AND LOADING / ${carrier_apt.appointment_designation?json_string}",
<#else> <#else>
@@ -184,7 +188,6 @@
</#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}",

7
RFXtoRP_HsrCarrierApt_BookingWMSUpdateAppointment.ftl
View File

@@ -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,6 +98,7 @@
"Projects" : [ "Projects" : [
{ {
"Commissions": [ "Commissions": [
<#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> <#list carrier_apt.physical_receipt_list?filter(l ->l??) as physical_receipt>
{ {
<#assign AddComma = true /> <#assign AddComma = true />
@@ -112,7 +114,8 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#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> <#list carrier_apt.anticipated_receipt_list?filter(l ->l??) as anticipated_receipt>
<#if AddComma == true> <#if AddComma == true>
, ,
@@ -129,7 +132,7 @@
"OrganisationID": "${organisationRP}" "OrganisationID": "${organisationRP}"
}<#sep>,</#sep> }<#sep>,</#sep>
</#list> </#list>
</#if>
], ],
"ProjectID" : "${projectRP}" "ProjectID" : "${projectRP}"
}] }]