You've already forked reflex-wms-connector
SCPN1-10586
This commit is contained in:
@@ -8,20 +8,13 @@
|
|||||||
<#assign projectRP = project>
|
<#assign projectRP = project>
|
||||||
<#assign organisationRP = organisation>
|
<#assign organisationRP = organisation>
|
||||||
|
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
=======
|
|
||||||
>>>>>>> develop
|
|
||||||
<#assign aDateTime = .now>
|
<#assign aDateTime = .now>
|
||||||
<#assign no_apiRestReflexID = "no apiRestReflexID">
|
<#assign no_apiRestReflexID = "no apiRestReflexID">
|
||||||
<#assign no_status = -99999>
|
<#assign no_status = -99999>
|
||||||
<#assign event = "UNKNOW_EVENT" >
|
<#assign event = "UNKNOW_EVENT" >
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
<#-- DeleteEF_False a définir dans ce fichier -->
|
<#-- DeleteEF_False a définir dans ce fichier -->
|
||||||
<#-- DeleteEF_False to be defined in this file.-->
|
<#-- DeleteEF_False to be defined in this file.-->
|
||||||
<#include "InternalSettings.ftl">
|
<#include "InternalSettings.ftl">
|
||||||
>>>>>>> develop
|
|
||||||
|
|
||||||
<#switch id.apiRestReflexID!no_apiRestReflexID>
|
<#switch id.apiRestReflexID!no_apiRestReflexID>
|
||||||
<#case no_apiRestReflexID>
|
<#case no_apiRestReflexID>
|
||||||
@@ -68,22 +61,8 @@
|
|||||||
<#case 201>
|
<#case 201>
|
||||||
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
||||||
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
|
<#assign preparationOrderPostResponse = JsonUtil.jsonToMap(restResponseBody)>
|
||||||
<<<<<<< HEAD
|
|
||||||
<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "SUCCESS" >
|
|
||||||
[
|
|
||||||
{
|
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
|
|
||||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
|
||||||
"datas" :
|
|
||||||
<#include "RFXtoRP_PrepOrder_ShipFromAcked.ftl">
|
|
||||||
}
|
|
||||||
]
|
|
||||||
<#else>
|
|
||||||
<#if preparationOrderPostResponse.status?? && preparationOrderPostResponse.status == "WARN">
|
|
||||||
=======
|
|
||||||
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
|
<#if preparationOrderPostResponse.status?? && (preparationOrderPostResponse.status == "SUCCESS" || preparationOrderPostResponse.status == "WARN") >
|
||||||
<#if DeleteEF_False>
|
<#if DeleteEF_False>
|
||||||
>>>>>>> develop
|
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
|
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowShipFromAcked>
|
||||||
@@ -95,23 +74,6 @@
|
|||||||
<#else>
|
<#else>
|
||||||
[
|
[
|
||||||
{
|
{
|
||||||
<<<<<<< HEAD
|
|
||||||
<#assign restResponseBody = JsonUtil.decodeBase64(restResponsetMsg.body) />
|
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.PlatformLogCreate>
|
|
||||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
|
||||||
"datas" :
|
|
||||||
<#assign event = "RP_EXECUTIONFLOW_EVENT">
|
|
||||||
<#include "RFXtoRP_PlatformLogCreate.ftl">
|
|
||||||
},
|
|
||||||
{
|
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowAllocationError>
|
|
||||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
|
||||||
"datas" :
|
|
||||||
<#include "RFXtoRP_RestResponseAllocationError.ftl">
|
|
||||||
}
|
|
||||||
]
|
|
||||||
</#if>
|
|
||||||
=======
|
|
||||||
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDeleted>
|
||||||
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
"apiReflexPlatformID" : "${apiReflexPlatformID}",
|
||||||
"datas" :
|
"datas" :
|
||||||
@@ -136,7 +98,6 @@
|
|||||||
<#include "RFXtoRP_RestResponseAllocationError.ftl">
|
<#include "RFXtoRP_RestResponseAllocationError.ftl">
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
>>>>>>> develop
|
|
||||||
</#if>
|
</#if>
|
||||||
<#break>
|
<#break>
|
||||||
<#default>
|
<#default>
|
||||||
|
|||||||
Reference in New Issue
Block a user