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

Merge branch 'develop' into Release-2.0-V14

Browse Source 
# Conflicts:
#	ActorPrefix.ftl
#	InternalSettings.ftl
#	RFXtoRP_HsrLoadInfo.ftl
#	RFXtoRP_PlatformLogCreate.ftl
#	RFXtoRP_RestResponse.ftl
This commit is contained in:
Francis REAT
2026-06-22 13:34:29 +02:00
parent 3f525a1039 55ae6b5b88
commit 8634360261
27 changed files with 732 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RFXtoRP_RestResponse.ftl
View File

@@ -63,6 +63,8 @@
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
<#if DeleteEF_Creation>
<<<<<<< HEAD
=======
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
@@ -72,6 +74,17 @@
}
]
<#else>
>>>>>>> develop
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_ExecutionflowDeleted.ftl">
}
]
<<<<<<< HEAD
<#else>
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
@@ -80,6 +93,8 @@
<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
}
]
=======
>>>>>>> develop
</#if>
<#else>
[
@@ -441,6 +456,8 @@
<#case "appointment_post_physical_receipt_associations_by_number">
<#case "appointment_post_physical_receipt_dissociations_by_ref">
<#case "appointment_post_physical_receipt_dissociations_by_number">
<#case "appointment_post_anticipated_receipt_associations_by_ref">
<#case "appointment_post_anticipated_receipt_dissociations_by_number">
<#switch restResponsetMsg.status!no_status>
<#case no_status>
[