diff --git a/README.md b/README.md index 6606269..c90e0d1 100644 --- a/README.md +++ b/README.md @@ -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/ - diff --git a/RFXtoRP_HsaItm.ftl b/RFXtoRP_HsaItm.ftl index 66effc7..533a2b7 100644 --- a/RFXtoRP_HsaItm.ftl +++ b/RFXtoRP_HsaItm.ftl @@ -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" : diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 18279c7..394713c 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -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"> + } + <#else> diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 0debca9..59b6690 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -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 @@ <#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!""}", diff --git a/RPtoRFX_PrepOrder_HeaderMetadata.ftl b/RPtoRFX_PrepOrder_HeaderMetadata.ftl new file mode 100644 index 0000000..62c7f33 --- /dev/null +++ b/RPtoRFX_PrepOrder_HeaderMetadata.ftl @@ -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}" + } + ] + , +--> \ No newline at end of file diff --git a/RPtoRFX_PrepOrder_LineMetadata.ftl b/RPtoRFX_PrepOrder_LineMetadata.ftl new file mode 100644 index 0000000..62c7f33 --- /dev/null +++ b/RPtoRFX_PrepOrder_LineMetadata.ftl @@ -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}" + } + ] + , +--> \ No newline at end of file diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 905c3bb..a0c50cf 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -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 @@ <#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!""}", diff --git a/RPtoRFX_Receipt_HeaderMetadata.ftl b/RPtoRFX_Receipt_HeaderMetadata.ftl new file mode 100644 index 0000000..62c7f33 --- /dev/null +++ b/RPtoRFX_Receipt_HeaderMetadata.ftl @@ -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}" + } + ] + , +--> \ No newline at end of file diff --git a/RPtoRFX_Receipt_LineMetadata.ftl b/RPtoRFX_Receipt_LineMetadata.ftl new file mode 100644 index 0000000..62c7f33 --- /dev/null +++ b/RPtoRFX_Receipt_LineMetadata.ftl @@ -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}" + } + ] + , +--> \ No newline at end of file diff --git a/VERSION b/VERSION index 5bfa8a3..fd13e59 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.39+1 +1.2.39+2