Merge branch 'release/1.2' into 'main-1.2'

Release/1.2 -> Main-1.2

See merge request r-d-technique/tiers/reflex-wms-connector!108
This commit is contained in:
Francis REAT 2025-05-13 12:53:12 +00:00
commit cd1cc00f78
10 changed files with 103 additions and 23 deletions

View File

@ -8,4 +8,3 @@ These FTL core files aim to translate data flow from Reflex WMS into Reflex plat
You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/partnerapp/reflex-wms-connector/

View File

@ -18,7 +18,7 @@
<#assign item = JsonUtil.jsonToMap(dataRfx)>
[
{
<#if item.logistical_variant_list?? >
<#if item.logistical_variant_list?? && (item.logistical_variant_list?size == item.logistical_variant_list?filter(l ->l??)?size)>
<#assign apiReflexPlatformID = ApiReflexPlatformID.ItemCreated>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :

View File

@ -16,7 +16,7 @@
<#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) />
<#assign receipt = JsonUtil.jsonToMap(dataRfx)>
<#if receipt.receipt_reference ?? && receipt.receipt_reference!="">
<#if receipt.receipt_type = "030">
<#if receipt.receipt_type == "030">
<#stop "ignored message because receipt type = transfert">
<#else>
[
@ -46,29 +46,38 @@
<#assign receipt = JsonUtil.jsonToMap(dataRfx)>
[
<#if receipt.receipt_reference?? && receipt.receipt_reference!="">
<#if receipt.receipt_confirmed == "true" >
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
}
<#if receipt.receipt_confirmed == "true" && receipt.confirmation_total_level_1==0 && receipt.confirmation_total_level_2==0 && receipt.confirmation_total_level_3==0>
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowCancelled>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl">
}
<#else>
<#if receipt.receipt_type = "030">
<#stop "ignored message because receipt type = transfert">
<#else>
<#if receipt.receipt_confirmed == "true" >
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
},
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
}
<#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl">
}
<#else>
<#if receipt.receipt_type == "030">
<#stop "ignored message because receipt type = transfert">
<#else>
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl">
},
{
<#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected>
"apiReflexPlatformID" : "${apiReflexPlatformID}",
"datas" :
<#include "RFXtoRP_HsrReceiptList_ReceiptExpected.ftl">
}
</#if>
</#if>
</#if>
<#else>

View File

@ -27,6 +27,7 @@
},
"payload" :
{
<#include "RPtoRFX_PrepOrder_HeaderMetadata.ftl">
"originator_reference": "${executionflow.OrderID?json_string}",
"preparation_type_code": "${preparation_type_code}",
"end_consignee_code": "${actorID}",
@ -88,6 +89,7 @@
</#if>
<#include "RPtoRFX_PrepOrder_DefaultLineData.ftl">
{
<#include "RPtoRFX_PrepOrder_LineMetadata.ftl">
"originator_reference_line_number": ${line.LineID?number},
"item_code": "${line.RequestedContent.Goods.ItemID!""}",
"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",

View File

@ -0,0 +1,17 @@
<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
<#-- It is possible to map metadata with additional information,comments... -->
<#--
<#if Header_MetaData_Map["Color"]??>
<#assign COLOR = Header_MetaData_Map["Color"].String/>
<#if COLOR??>
,
"additional_data_value_list":
[
{
"code": "Color",
"value": "${COLOR}"
}
]
</#if>,
-->

View File

@ -0,0 +1,17 @@
<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
<#-- It is possible to map metadata with additional information,comments... -->
<#--
<#if Header_MetaData_Map["Color"]??>
<#assign COLOR = Header_MetaData_Map["Color"].String/>
<#if COLOR??>
,
"additional_data_value_list":
[
{
"code": "Color",
"value": "${COLOR}"
}
]
</#if>,
-->

View File

@ -13,6 +13,7 @@
},
"payload" :
{
<#include "RPtoRFX_Receipt_HeaderMetadata.ftl">
"receipt_reference": "${executionflow.OrderID?json_string}",
"receipt_type": "${receipt_type}",
"receipt_reason_code": "${receipt_reason_code}",
@ -43,6 +44,7 @@
</#if>
<#include "RPtoRFX_Receipt_DefaultLineData.ftl">
{
<#include "RPtoRFX_Receipt_LineMetadata.ftl">
"receipt_reference_line_no": ${line.LineID?number},
"item_code": "${line.RequestedContent.Goods.ItemID!""}",
"item_lv_code": "${line.RequestedContent.Goods.LVBranchID!""}",

View File

@ -0,0 +1,17 @@
<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
<#-- It is possible to map metadata with additional information,comments... -->
<#--
<#if Header_MetaData_Map["Color"]??>
<#assign COLOR = Header_MetaData_Map["Color"].String/>
<#if COLOR??>
,
"additional_data_value_list":
[
{
"code": "Color",
"value": "${COLOR}"
}
]
</#if>,
-->

View File

@ -0,0 +1,17 @@
<#-- Il est possible de mapper les métadonnées avec des informations complémentaires, des commentaires... -->
<#-- It is possible to map metadata with additional information,comments... -->
<#--
<#if Header_MetaData_Map["Color"]??>
<#assign COLOR = Header_MetaData_Map["Color"].String/>
<#if COLOR??>
,
"additional_data_value_list":
[
{
"code": "Color",
"value": "${COLOR}"
}
]
</#if>,
-->

View File

@ -1 +1 @@
1.2.39+1
1.2.39+2