This commit is contained in:
2026-06-22 13:44:44 +02:00
parent 8634360261
commit 2358ba0a9d

View File

@@ -63,8 +63,6 @@
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
<#if DeleteEF_Creation>
<<<<<<< HEAD
=======
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
@@ -74,7 +72,6 @@
}
]
<#else>
>>>>>>> develop
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
@@ -83,18 +80,6 @@
<#include "RFXtoRP_ExecutionflowDeleted.ftl">
}
]
<<<<<<< HEAD
<#else>
[
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
}
]
=======
>>>>>>> develop
</#if>
<#else>
[