From af0d846271c00b4f6b8a1606ee21a13ceb0578c7 Mon Sep 17 00:00:00 2001 From: Laurie Montant Date: Fri, 7 Feb 2025 10:50:35 +0100 Subject: [PATCH] HU --- RFXtoRP_HsaIpgMove_StockMoved.ftl | 2 +- RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl | 47 ++++++++++++++++++++----- 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/RFXtoRP_HsaIpgMove_StockMoved.ftl b/RFXtoRP_HsaIpgMove_StockMoved.ftl index d9d0fd7..883abee 100644 --- a/RFXtoRP_HsaIpgMove_StockMoved.ftl +++ b/RFXtoRP_HsaIpgMove_StockMoved.ftl @@ -54,7 +54,7 @@ "ExternalMoveRef" : "${reflexMvtStockInterface.ipg_move_year_number} - ${reflexMvtStockInterface.ipg_move_number}", "Type": "${MoveType_KV[reflexMvtStockInterface.ipg_move_type]!reflexMvtStockInterface.ipg_move_type}", <#if reflexMvtStockInterface.ipg_move_type == "520" > - "Reason": " Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}", + "Reason": " Direct Transfert ${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)} to ${RFXtoRPprefixDepot(reflexMvtStockInterface.transfer_consignee_physical_depot_code?trim?json_string)}", <#else> "Reason": "${reflexMvtStockInterface.miscellaneous_receipts_despatches_code?json_string}", diff --git a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl index de29490..d6fc12d 100644 --- a/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl +++ b/RFXtoRP_HsrPrepa_TrackingHuLabelled.ftl @@ -8,15 +8,44 @@ "ProjectID": "${projectRP}" }, "ID": { - <#if despatched_ipg.consignment_unit_id!=""> - "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", - <#else> - <#if despatched_ipg.carton_number != "000000000000000000"> - "RefID":"${despatched_ipg.carton_number}", - <#else> - "RefID":"${despatched_ipg.hd_number}", - - + <#switch supplyOfTheTrackingNumber> + <#case 0> + "RefID":"", + <#break> + <#case 1> + <#if despatched_ipg.consignment_unit_id!=""> + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", + + <#break> + <#case 2> + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID":"${despatched_ipg.carton_number}", + <#else> + "RefID":"${despatched_ipg.hd_number}", + + <#break> + <#case 3> + <#if despatched_ipg.consignment_unit_id!=""> + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", + <#else> + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID":"${despatched_ipg.carton_number}", + <#else> + "RefID":"${despatched_ipg.hd_number}", + + + <#break> + <#default> + <#if despatched_ipg.consignment_unit_id!=""> + "RefID": "${despatched_ipg.consignment_unit_id?trim?json_string}", + <#else> + <#if despatched_ipg.carton_number != "000000000000000000"> + "RefID":"${despatched_ipg.carton_number}", + <#else> + "RefID":"${despatched_ipg.hd_number}", + + + "RefDate": { "DateTime": "${dispatched_datetime4}",