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

Merge branch 'release/2.0' into 'main-2.0'

Browse Source 
SCPN1-11090

See merge request r-d-technique/tiers/reflex-wms-connector!309
This commit is contained in:
Nathan SOULIER
2026-07-29 13:03:13 +00:00
parent 5a870a605c 3230207b81
commit 2de7737828
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RFXtoRP_RestResponse.ftl
View File

@@ -358,7 +358,7 @@
] ]
</#switch> </#switch>
<#break> <#break>
<#-- *********************************************** ApiRestID = canceled ******************** --> <#-- *********************************************** ApiRestID = status ******************** -->
<#case "status_appointment_put_update_by_ref"> <#case "status_appointment_put_update_by_ref">
<#case "status_appointment_put_update_by_number"> <#case "status_appointment_put_update_by_number">
<#switch restResponsetMsg.status!no_status> <#switch restResponsetMsg.status!no_status>

23
RPtoRFX_CarrierAppointmentCreated.ftl
View File

@@ -37,10 +37,14 @@
<#include "RPtoRFX_CarrierAppointmentDefaultData.ftl"> <#include "RPtoRFX_CarrierAppointmentDefaultData.ftl">
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING > <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_UNLOADING >
<#if appointment.Unloading?? && appointment.Unloading.Projects?? && <#if appointment.Unloading?? && appointment.Unloading.Projects?? &&
appointment.Unloading.Projects[0]?? && appointment.Unloading.Projects[0]?? &&
appointment.Unloading.Projects[0].Commissions??> appointment.Unloading.Projects[0].Commissions?? >
"physical_receipt_list": [ <#if (appointment.Unloading.Projects[0].Commissions[0].ExecutionflowID!"") == "" &&
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission> (appointment.Unloading.Projects[0].Commissions[0].OrderID!"") == "">
"appointment_designation":"${(appointment.Reason!"")!?json_string}",
<#else>
"physical_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l ->l.ExecutionflowID?? && l.ExecutionflowID !="") as commission>
<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom> <#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.key == commission.ExecutionflowID && l.value?? && l.value?has_content) as custom>
{ {
"receipt_activity": "${custom.value.activity_code?json_string}", "receipt_activity": "${custom.value.activity_code?json_string}",
@@ -53,9 +57,9 @@
</#list> </#list>
<#sep>,</#sep> <#sep>,</#sep>
</#list> </#list>
], ],
"anticipated_receipt_list": [ "anticipated_receipt_list": [
<#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (l.OrderID?? && l.OrderID !="")) as commission> <#list appointment.Unloading.Projects[0].Commissions?filter(l -> (!(l.ExecutionflowID??) || l.ExecutionflowID =="") && (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>
{ {
"activity": "${custom.value.activity_code?json_string}", "activity": "${custom.value.activity_code?json_string}",
@@ -69,9 +73,8 @@
</#list> </#list>
<#sep>,</#sep> <#sep>,</#sep>
</#list> </#list>
], ],
<#else> </#if>
"appointment_designation":"${(appointment.Reason!"")!?json_string}",
</#if> </#if>
<#else> <#else>
<#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING> <#if appointment.AppointmentType == AppointmentType.APPOINTMENT_TYPE_LOADING>

2
VERSION
View File

@@ -1 +1 @@
2.0.25+3 2.0.25+4