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

SCPN1-11065

Browse Source
This commit is contained in:
Laurie MONTANT
2026-07-20 16:35:24 +02:00
parent 5fd72ba87e
commit 8e39322c33
2 changed files with 41 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
RFXtoRP_HsrReceiptList.ftl
View File

@@ -102,18 +102,22 @@
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
} }
<#else> <#else>
{ <#if receipt.line_list ?? && receipt.line_list[0]??>
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> {
"apiReflexPlatformID" : "${apiReflexPlatformID}", <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
"datas" : "apiReflexPlatformID" : "${apiReflexPlatformID}",
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> "datas" :
}, <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl">
{ },
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> {
"apiReflexPlatformID" : "${apiReflexPlatformID}", <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
"datas" : "apiReflexPlatformID" : "${apiReflexPlatformID}",
<#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> "datas" :
} <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl">
}
<#else>
<#stop> <#-- No line -->
</#if>
</#if> </#if>
<#else> <#else>
<#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0> <#if receipt.receipt_confirmed?? && receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
@@ -138,6 +142,7 @@
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
} }
<#else> <#else>
<#if receipt.line_list ?? && receipt.line_list[0]??>
{ {
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
"apiReflexPlatformID" : "${apiReflexPlatformID}", "apiReflexPlatformID" : "${apiReflexPlatformID}",
@@ -150,10 +155,14 @@
"datas" : "datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
} }
<#else>
<#stop> <#-- No line -->
</#if>
</#if> </#if>
<#else> <#else>
<#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??> <#if receipt.receipt_type?? && receipt.receipt_type == "030" && receipt.receipt_confirmed == "false" && receipt.line_list?? && receipt.line_list[0]??>
<#if receipt.receipt_reference?? && receipt.receipt_reference!=""> <#if receipt.receipt_reference?? && receipt.receipt_reference!="">
<#if receipt.line_list ?? && receipt.line_list[0]??>
[ [
{ {
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
@@ -168,6 +177,9 @@
<#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl">
} }
] ]
<#else>
<#stop> <#-- No line -->
</#if>
<#else> <#else>
<#stop> <#-- Receipt reference for transfer is empty--> <#stop> <#-- Receipt reference for transfer is empty-->
</#if> </#if>
@@ -186,7 +198,7 @@
<#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl"> <#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
} }
<#else> <#else>
<#stop> <#stop> <#-- No line -->
</#if> </#if>
</#if> </#if>
</#if> </#if>

24
RFXtoRP_PlatformLogCreate.ftl
View File

@@ -1,7 +1,16 @@
<#include "HfRpConfig.ftl"> <#include "HfRpConfig.ftl">
[ [
<#assign UUID = UUID.randomUUID()> <#assign UUID = UUID.randomUUID()>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)> <#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")>
<#assign maxLen = 32000>
<#if strJsonBody?length gt maxLen>
<#assign strJsonBody = JsonUtil.espaceQuoteInJsonString(restResponseBody)?replace("\n", "")?replace("\r", "")?replace('"logical_key_list"\\s*:\\s*\\[[^\\]]*\\]', '"logical_key_list": []', 'r')>
</#if>
<#if strJsonBody?length gt maxLen>
<#assign safeJsonBody = "{\"truncated\": true, \"original_size\": " + strJsonBody?length + "}">
<#else>
<#assign safeJsonBody = strJsonBody>
</#if>
{ {
"Header": { "Header": {
"ProjectID": "${projectRP}" "ProjectID": "${projectRP}"
@@ -17,27 +26,26 @@
<#assign severity = SeverityLevel.ERROR> <#assign severity = SeverityLevel.ERROR>
"Severity": "${severity}", "Severity": "${severity}",
"Namespace": "ReflexIntegration", "Namespace": "ReflexIntegration",
"DateTime": { "DateTime": {
"DateTime": "${aDateTime?iso_utc}", "DateTime": "${aDateTime?iso_utc}",
"AuthorTimeZone": "${time_zone_rfx}" "AuthorTimeZone": "${time_zone_rfx}"
}, },
"TechMessage": { "TechMessage": {
"Code": "${restResponsetMsg.status!"no Code"}", "Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody?truncate(32000,'...')} "Label": "${safeJsonBody?json_string}"
}, },
"UserMessage": { "UserMessage": {
"Code": "${restResponsetMsg.status!"no Code"}", "Code": "${restResponsetMsg.status!"no Code"}",
"Label": ${strJsonBody?truncate(32000,'...')}, "Label": "${safeJsonBody?json_string}",
"Params": [] "Params": []
}, },
"DetailElements": [], "DetailElements": [],
"CorrelationID": "${id.correlationid!"no Correlationid"}", "CorrelationID": "${id.correlationid!"no Correlationid"}",
"ContextPayload": ${strJsonBody?truncate(32000,'...')}, "ContextPayload": "${safeJsonBody?json_string}",
"Type": "${event}", "Type": "${event}",
"Task": "${id.apiRestReflexID!"no Task"}", "Task": "${id.apiRestReflexID!"no Task"}",
"OriginalID": "${id.refid!"no OriginalID"?trim?json_string}", "OriginalID": "${id.refid!"no OriginalID"?trim?json_string}",
"StackTrace": "" "StackTrace": ""
} }
} }
] ]