You've already forked reflex-wms-connector
V14
This commit is contained in:
@@ -63,8 +63,6 @@
|
|||||||
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
|
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
|
||||||
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
|
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
|
||||||
<#if DeleteEF_Creation>
|
<#if DeleteEF_Creation>
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
||||||
@@ -74,7 +72,6 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
<#else>
|
<#else>
|
||||||
>>>>>>> develop
|
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
||||||
@@ -83,18 +80,6 @@
|
|||||||
<#include "RFXtoRP_ExecutionflowDeleted.ftl">
|
<#include "RFXtoRP_ExecutionflowDeleted.ftl">
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
<<<<<<< HEAD
|
|
||||||
<#else>
|
|
||||||
[
|
|
||||||
{
|
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
|
|
||||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
|
||||||
"datas" :
|
|
||||||
<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
|
|
||||||
}
|
|
||||||
]
|
|
||||||
=======
|
|
||||||
>>>>>>> develop
|
|
||||||
</#if>
|
</#if>
|
||||||
<#else>
|
<#else>
|
||||||
[
|
[
|
||||||
|
|||||||
Reference in New Issue
Block a user