diff --git a/README.md b/README.md index d20fd83..6606269 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Reflex Platform Core FTLs - + These FTL core files aim to translate data flow from Reflex WMS into Reflex platform API. - -You can find more info about those files in the Reflex platform documentation center : https://docs.viz.reflex-platform.com/connectivity/howto/reflex-wms-connector/ - +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_HsaCarrier.ftl b/RFXtoRP_HsaCarrier.ftl index 6b47034..9029020 100644 --- a/RFXtoRP_HsaCarrier.ftl +++ b/RFXtoRP_HsaCarrier.ftl @@ -17,7 +17,7 @@ <#assign carrier = JsonUtil.jsonToMap(dataRfx)> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaCarrier_ActorCreated.ftl"> diff --git a/RFXtoRP_HsaCarrier_ActorCreated.ftl b/RFXtoRP_HsaCarrier_ActorCreated.ftl index 8ac9722..0d1b77f 100644 --- a/RFXtoRP_HsaCarrier_ActorCreated.ftl +++ b/RFXtoRP_HsaCarrier_ActorCreated.ftl @@ -11,11 +11,7 @@ }, "Payload": { "Name": "${carrier.carrier_designation?json_string}", - "ManagedStock": false, "IsCarrier": true, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> - <#include "RFXtoRP_HsaCarrier_ActorCreated_Metadata.ftl">, @@ -37,7 +33,6 @@ "ProvinceCode": "${carrier.carrier_structured_address.territorial_div_code?json_string}", "State": "${carrier.carrier_structured_address.country_designation?json_string}" - <#-- if Reflex WMS address is not structured --> <#else> <#if carrier.address??> diff --git a/RFXtoRP_HsaCons.ftl b/RFXtoRP_HsaCons.ftl index 8932eb4..a824f33 100644 --- a/RFXtoRP_HsaCons.ftl +++ b/RFXtoRP_HsaCons.ftl @@ -2,6 +2,9 @@ <#-- input : message RFX --> <#-- project : projectId in ReflexPlatform --> <#-- organisation : organisationtId in ReflexPlatform --> +<#include "ReflexUtils.ftl"> +<#include "HfRpConfig.ftl"> +<#include "ActorPrefix.ftl"> <#assign cloudEventMsg = JsonUtil.jsonToMap(input)> <#assign projectRP = project> @@ -15,9 +18,9 @@ <#-- *********************************************** Action = CREATE or UPDATE ******************** --> <#assign dataRfx = JsonUtil.decodeBase64(cloudEventMsg.data) /> <#assign actor = JsonUtil.jsonToMap(dataRfx)> - [ + [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaCons_ActorCreated.ftl"> diff --git a/RFXtoRP_HsaCons_ActorCreated.ftl b/RFXtoRP_HsaCons_ActorCreated.ftl index 84df17a..7dd3f3e 100644 --- a/RFXtoRP_HsaCons_ActorCreated.ftl +++ b/RFXtoRP_HsaCons_ActorCreated.ftl @@ -11,18 +11,12 @@ }, "Payload": { "Name": "${actor.designation?json_string}", - "ManagedStock": false, "IsCarrier": false, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> - <#include "RFXtoRP_HsaCons_ActorCreated_Metadata.ftl">, - "Address": { - <#-- if Reflex WMS is structured --> <#if actor.consignee_structured_address??> diff --git a/RFXtoRP_HsaDispute.ftl b/RFXtoRP_HsaDispute.ftl index 18ea1ec..2f01db4 100644 --- a/RFXtoRP_HsaDispute.ftl +++ b/RFXtoRP_HsaDispute.ftl @@ -17,20 +17,27 @@ <#assign dispute = JsonUtil.jsonToMap(dataRfx)> [ <#if dispute.dispute_closed == true > + <#if ((dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070") && dispute.dispute_reception?? && dispute.dispute_reception.reception_reference!="") || (dispute.dispute_type_code=="050" && dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string!="")> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimCreated> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaDispute_Created.ftl"> - }, + } + <#if TableReasonCode[dispute.dispute_reason_code]??> + , { <#assign apiReflexPlatformID = ApiReflexPlatformID.ClaimMessageSent> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaDispute_MessageSent.ftl"> } + <#else> + <#stop> + <#else> - <#stop> + <#stop "Reference is empty"> + ] <#break> diff --git a/RFXtoRP_HsaDispute_Created.ftl b/RFXtoRP_HsaDispute_Created.ftl index 4d6ebb5..d5cf476 100644 --- a/RFXtoRP_HsaDispute_Created.ftl +++ b/RFXtoRP_HsaDispute_Created.ftl @@ -8,7 +8,7 @@ }, "ID": { <#if dispute.dispute_preparation??> - <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> + <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> "RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_activity_code?replace(" ","")?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}" <#else> <#stop "preparation order list is empty" > @@ -21,7 +21,7 @@ }, "Payload": { <#if dispute.dispute_reference?? && dispute.dispute_reference!=""> - "Title":"${dispute.dispute_reference?trim?json_string}", + "Title":"${dispute.dispute_reference?json_string}", <#else> "Title":"", @@ -40,28 +40,33 @@ "Value": "${dispute.dispute_amount}" }, <#if dispute.dispute_type_code=="050" > - <#if dispute.dispute_preparation.preparation_order_list?? && dispute.dispute_preparation.preparation_order_list?size != 0> - "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", - <#else> - <#stop "preparation order list is empty" > - + "EntityID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_physical_depot_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_activity_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?trim?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", + "DisplayID":"${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_reference?trim?json_string}", <#else> - <#if dispute.dispute_type_code=="070" || dispute.dispute_type_code=="030" > - "EntityID":"${dispute.dispute_reception.reception_reference?trim?json_string}", - <#else> - <#stop "Type not supported" > + <#if dispute.dispute_type_code=="030" || dispute.dispute_type_code=="070" > + <#if dispute.dispute_reception.reception_type_code=="030"> + "EntityID":"${dispute.dispute_reception.reception_supplier.supplier_transfer_physical_depot?json_string}${dispute.dispute_reception.reception_supplier.supplier_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#if dispute.dispute_reception.reception_type_code=="010" || dispute.dispute_reception.reception_type_code=="020" > + "EntityID":"${dispute.dispute_reception.reception_physical_depot_code?json_string}${dispute.dispute_reception.reception_activity_code?json_string}${dispute.dispute_reception.reception_contractor_code?json_string}${dispute.dispute_reception.reception_reference?json_string}", + "DisplayID":"${dispute.dispute_reception.reception_reference?json_string}", + <#else> + <#stop "WMS type code not supported"> + + - <#-- To configure --> - <#include "RFXtoRP_HsaDispute_TableReasonCodeToClaimTypeID.ftl"> <#if TableReasonCode[dispute.dispute_reason_code]??> - "ClaimTypeID":"${TableReasonCode[dispute.dispute_reason_code]}" + "ClaimTypeID":"CLAIMTYPE_${projectRP}_EXECUTIONFLOW_${TableReasonCode[dispute.dispute_reason_code]}" <#else> <#stop "Claim reason code not supported" > - - } } ] + + + + diff --git a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl index 8ab1721..66509ac 100644 --- a/RFXtoRP_HsaIpgMove_GoodsReceived.ftl +++ b/RFXtoRP_HsaIpgMove_GoodsReceived.ftl @@ -21,7 +21,7 @@ "Goods": { "ItemID": "${reflexMvtStockInterface.item_code?trim?json_string}", "LVBranchID": "${reflexMvtStockInterface.lv_code?json_string}", - <#if (reflexMvtStockInterface.ipg_priority_date!="") && (reflexMvtStockInterface.ipg_priority_date?starts_with("00")== false) > + <#if (priority_date!="") && (priority_date?starts_with("00")== false) > "PriorityDate": "${priority_date}", <#else> "PriorityDate": "1970-01-01T00:00:00Z", @@ -32,9 +32,11 @@ }, <#if reflexMvtStockInterface.receipt_reference!=""> - "ExecutionflowID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", + "ExecutionflowID": "${reflexMvtStockInterface.original_receipt_physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.originator_code}${reflexMvtStockInterface.receipt_reference?trim?json_string}", + "OrderID": "${reflexMvtStockInterface.receipt_reference?trim?json_string}", <#else> "ExecutionflowID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", + "OrderID": "${reflexMvtStockInterface.physical_depot_code}${reflexMvtStockInterface.activity_code}${reflexMvtStockInterface.ipg_move_year_number}${reflexMvtStockInterface.extended_ipg_move_number}", "LineID": "${reflexMvtStockInterface.receipt_line_number}", "ActorID": "${RFXtoRPprefixDepot(reflexMvtStockInterface.physical_depot_code?trim?json_string)}", diff --git a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl index db1899a..aad3d9f 100644 --- a/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsaProStatus_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_PreparationCompleted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationExpected.ftl b/RFXtoRP_HsaProStatus_PreparationExpected.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_PreparationExpected.ftl +++ b/RFXtoRP_HsaProStatus_PreparationExpected.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_PreparationStarted.ftl b/RFXtoRP_HsaProStatus_PreparationStarted.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_PreparationStarted.ftl +++ b/RFXtoRP_HsaProStatus_PreparationStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaProStatus_TransportStarted.ftl b/RFXtoRP_HsaProStatus_TransportStarted.ftl index 04c48ae..b9d23cb 100644 --- a/RFXtoRP_HsaProStatus_TransportStarted.ftl +++ b/RFXtoRP_HsaProStatus_TransportStarted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", + "RefID": "${preparationStatusInterface.physical_depot_code?trim?json_string}${preparationStatusInterface.activity_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_code?trim?json_string}${preparationStatusInterface.preparation_order_originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsaSup.ftl b/RFXtoRP_HsaSup.ftl index 7250b4e..d071d4c 100644 --- a/RFXtoRP_HsaSup.ftl +++ b/RFXtoRP_HsaSup.ftl @@ -17,7 +17,7 @@ <#assign actor = JsonUtil.jsonToMap(dataRfx)> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsaSup_ActorCreated.ftl"> diff --git a/RFXtoRP_HsaSup_ActorCreated.ftl b/RFXtoRP_HsaSup_ActorCreated.ftl index 23a560c..9c019f1 100644 --- a/RFXtoRP_HsaSup_ActorCreated.ftl +++ b/RFXtoRP_HsaSup_ActorCreated.ftl @@ -11,10 +11,7 @@ }, "Payload": { "Name": "${actor.designation?json_string}", - "ManagedStock": false, "IsCarrier": false, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> <#include "RFXtoRP_HsaSup_ActorCreated_Metadata.ftl">, @@ -22,7 +19,6 @@ { <#-- if Reflex WMS address is structured --> <#if actor.supplier_structured_address?? > - "Name": "${actor.supplier_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${actor.supplier_structured_address.street_and_PO?json_string}", "StreetAddressTwo" : "${actor.supplier_structured_address.additionnal_data?json_string}", @@ -36,7 +32,6 @@ "ProvinceCode": "${actor.supplier_structured_address.territorial_div_code?json_string}", "State": "${actor.supplier_structured_address.country_designation?json_string}" - <#-- if Reflex WMS address is not structured --> <#else> <#if actor.optional_attributes?? > @@ -47,7 +42,6 @@ "CountryCode" : "" - }, <#if actor.optional_attributes?? > "Phones": ["${actor.optional_attributes.telephone?json_string}", diff --git a/RFXtoRP_HsrDepot.ftl b/RFXtoRP_HsrDepot.ftl index cd822b3..7e3a522 100644 --- a/RFXtoRP_HsrDepot.ftl +++ b/RFXtoRP_HsrDepot.ftl @@ -17,7 +17,7 @@ <#assign depot = JsonUtil.jsonToMap(dataRfx)> [ { - <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreated> + <#assign apiReflexPlatformID = ApiReflexPlatformID.ActorCreatedv2> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrDepot_ActorCreated.ftl"> diff --git a/RFXtoRP_HsrDepot_ActorCreated.ftl b/RFXtoRP_HsrDepot_ActorCreated.ftl index e64bb6b..2c2478c 100644 --- a/RFXtoRP_HsrDepot_ActorCreated.ftl +++ b/RFXtoRP_HsrDepot_ActorCreated.ftl @@ -11,20 +11,12 @@ }, "Payload": { "Name": "${depot.physical_depot_designation?json_string}", - "ManagedStock": true, "IsCarrier": false, - <#-- ***Partner ID could be added here *** --> - <#-- "PartnerID": "${}", --> - - <#include "RFXtoRP_HsrDepot_ActorCreated_Metadata.ftl">, - - "Address": { <#-- if Reflex WMS address is structured --> <#if depot.physical_depot_structured_address?? > - "Name": "${depot.physical_depot_structured_address.name_or_company?json_string}", "StreetAddressOne" : "${depot.physical_depot_structured_address.street_and_PO?json_string}", "StreetAddressTwo" : "${depot.physical_depot_structured_address.additionnal_data?json_string}", @@ -38,7 +30,6 @@ "ProvinceCode": "${depot.physical_depot_structured_address.territorial_div_code?json_string}", "State": "${depot.physical_depot_structured_address.country_designation?json_string}" - <#-- if Reflex WMS address is not structured --> <#else> <#if depot.physical_depot_address??> @@ -55,7 +46,7 @@ "${depot.physical_depot_address.other_number?json_string}" ], - "Typology": "TYPOLOGY_UNKNOWN" + "Typology": "TYPOLOGY_WAREHOUSE" } } ] diff --git a/RFXtoRP_HsrPrepa.ftl b/RFXtoRP_HsrPrepa.ftl index cda3dab..da7950c 100644 --- a/RFXtoRP_HsrPrepa.ftl +++ b/RFXtoRP_HsrPrepa.ftl @@ -39,12 +39,6 @@ "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrPrepa_CarrierUpdated.ftl"> - }, - { - <#assign apiReflexPlatformID = ApiReflexPlatformID.OrderCarrierUpdated> - "apiReflexPlatformID" : "${apiReflexPlatformID}", - "datas" : - <#include "RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl"> } @@ -78,7 +72,7 @@ "datas" : <#include "RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl"> } - <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]??> + <#if !hd_numberHmapHUadded[despatched_ipg.hd_number]?? && (trackingNumberSource==2 || trackingNumberSource==3 )> <#assign hd_numberHmapHUadded += {despatched_ipg.hd_number,despatched_ipg.hd_number}> , { diff --git a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl index 112037e..cc3b1dc 100644 --- a/RFXtoRP_HsrPrepa_CarrierUpdated.ftl +++ b/RFXtoRP_HsrPrepa_CarrierUpdated.ftl @@ -15,7 +15,7 @@ "ProjectID": "${projectRP}" }, "ID":{ - "RefID": "${OrderOriginReference}" + "RefID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}" }, "Payload":{ "Carrier": { diff --git a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl index 4b7da84..c15dc98 100644 --- a/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HUsAdded_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched3_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list??) as preparation_line3> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0) as preparation_line3> <#list preparation_line3.despatched_ipg_list?filter(j ->j.carton_number!="000000000000000000") as despatched_ipg3> <#if !refIDHmap[despatched_ipg3.carton_number]?? > <#if refIDHmap?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl index 7a6abd1..5fe5ad8 100644 --- a/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl +++ b/RFXtoRP_HsrPrepa_HandlingUnitDispatched.ftl @@ -3,7 +3,7 @@ [ <#assign dispatched_datetime = RfxDateTimetoUTCWithTimezone(preparationOrder.stock_despatch_at_preparation_datetime,time_zone_rfx) /> <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#if !refIDHmap_local[despatched_ipg.hd_number]?? > <#if refIDHmap_local?size != 0 > diff --git a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl index 8aed82c..99511e5 100644 --- a/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl +++ b/RFXtoRP_HsrPrepa_HandlingunitGoodsPrepared.ftl @@ -2,7 +2,7 @@ <#include "HfRpConfig.ftl"> <#include "ActorPrefix.ftl"> [ - <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.preparation_order_originator_reference!="") as preparation_line> + <#list preparationOrder.preparation_line_lst?filter(l ->l.despatched_ipg_list?? && l.despatched_ipg_list?size != 0 && l.preparation_order_originator_reference!="") as preparation_line> <#list preparation_line.despatched_ipg_list as despatched_ipg> <#assign packing_datetime = RfxDateTimetoUTCWithTimezone(preparation_line.confirmation_datetime,time_zone_rfx) /> { @@ -77,19 +77,19 @@ "ItemID": "${preparation_line.item_code?trim?json_string}", "LVBranchID": "${preparation_line.item_lv_code?json_string}", - <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)> - <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${priority_date}", - <#else> - <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)> - <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc /> + <#if (despatched_ipg.ipg_use_by_date?length != 0) && (despatched_ipg.ipg_use_by_date?starts_with("00")== false)> + <#assign priority_date = despatched_ipg.ipg_use_by_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${priority_date}", + <#else> + <#if (despatched_ipg.ipg_best_before_date?length != 0) && (despatched_ipg.ipg_best_before_date?starts_with("00")== false)> + <#assign priority_date = despatched_ipg.ipg_best_before_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${priority_date}", + <#else> + <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)> + <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", - <#else> - <#if (despatched_ipg.ipg_sell_by_date?length != 0) && (despatched_ipg.ipg_sell_by_date?starts_with("00")== false)> - <#assign priority_date = despatched_ipg.ipg_sell_by_date?datetime(rfx_date_format_default)?iso_utc /> - "PriorityDate": "${priority_date}", - <#else> - <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> + <#else> + <#if (despatched_ipg.ipg_manufacture_date?length != 0) && (despatched_ipg.ipg_manufacture_date?starts_with("00") == false)> <#assign priority_date = despatched_ipg.ipg_manufacture_date?datetime(rfx_date_format_default)?iso_utc /> "PriorityDate": "${priority_date}", <#else> @@ -112,7 +112,8 @@ <#-- Segmentation Keys inclusion --> <#include "RFXtoRP_HsrPrepa_GoodsPrepared_SegmentationKeys.ftl"> }, - "ExecutionflowID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", + "OrderID": "${preparation_line.preparation_order_originator_reference?trim?json_string}", + "ExecutionflowID": "${preparation_line.pro_physical_depot_code?trim?json_string}${preparationOrder.activity_code?trim?json_string}${preparation_line.pro_originator_code?trim?json_string}${preparation_line.preparation_order_originator_reference?trim?json_string}", <#if (preparation_line.pro_originator_reference_line_number!0) != 0> "LineID": "${preparation_line.pro_originator_reference_line_number}", <#else> diff --git a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl b/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl deleted file mode 100644 index 96a5905..0000000 --- a/RFXtoRP_HsrPrepa_OrderCarrierUpdated.ftl +++ /dev/null @@ -1,29 +0,0 @@ -<#include "HfRpConfig.ftl"> -<#include "ReflexUtils.ftl"> -<#include "ActorPrefix.ftl"> -[ - <#assign refIDHmap_local ={}> - <#list preparationOrder.preparation_line_lst?filter(l ->l.preparation_order_originator_reference!="") as preparation_line> - <#assign OrderOriginReference = preparation_line.preparation_order_originator_reference?trim?json_string> - <#if !refIDHmap_local[OrderOriginReference]?? > - <#if refIDHmap_local?size != 0 > - , - - <#assign refIDHmap_local +={OrderOriginReference,OrderOriginReference}> - { - "Header": { - "ProjectID": "${projectRP}" - }, - "ID":{ - "RefID": "${OrderOriginReference}" - }, - "Payload":{ - "Carrier": { - "ActorID": "${RFXtoRPprefixCarrier(preparationOrder.load_data.carrier_code?trim?json_string)}" - } - } - } - - - <#assign refIDHmap_local ={}> -] \ No newline at end of file diff --git a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl index b518fa7..6bf75d8 100644 --- a/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowCancelled.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?trim?json_string}", + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${preparation_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl index ee97306..8144675 100644 --- a/RFXtoRP_HsrPro_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrPro_ExecutionflowDetected.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${preparation_order.originator_reference?trim?json_string}", + "RefID": "${preparation_order.physical_depot_code?trim?json_string}${preparation_order.activity_code?trim?json_string}${preparation_order.originator_code?trim?json_string}${preparation_order.originator_reference?trim?json_string}", "RefDate": { "DateTime": "${pro_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -31,54 +31,43 @@ }, "ShipFromAcked": true, "ShipTo": { - <#if - <#-- preparation_order.address.type_code == "" && - preparation_order.address.title_code == "" && - preparation_order.address.first_name == "" && - preparation_order.address.last_name == "" && - preparation_order.address.mail_address == "" && - preparation_order.address.contact_type_code == "" && - preparation_order.address.mobile_phone_number == "" && - preparation_order.address.land_line_phone_number == "" && - preparation_order.address.fax_number == "" && --> - preparation_order.address.address_type_code == "" && - preparation_order.address.name_or_company_name == "" && - preparation_order.address.additional_address_data_1 == "" && - preparation_order.address.additional_address_data_2 == "" && - preparation_order.address.post_code_area_name == "" && - preparation_order.address.territorial_division_code == "" && - preparation_order.address.postal_code == "" && - preparation_order.address.iso_country_code == ""> - "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!=""> + "ActorID": "${RFXtoRPprefixDepot(preparation_order.intermediate_consignee_code?json_string)}" <#else> - "Actor": - { - "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", - "Address" : - { - "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", - <#assign isCountryCode = JsonUtil.isCountryCode(preparation_order.address.iso_country_code?upper_case) /> - <#if isCountryCode> - "CountryCode" : "${(preparation_order.address.iso_country_code!"")?json_string}", - <#else> - "CountryCode" : "", - - "PostalCode" : "${(preparation_order.address.postal_code!"")?json_string}", - "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", - "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", - "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" - } - }, - "Contact" : - { - "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", - "LastName" : "${(preparation_order.address.last_name!"")?json_string}", - "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, - "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] - } + <#if preparation_order.address.address_type_code == "" && + preparation_order.address.name_or_company_name == "" && + preparation_order.address.additional_address_data_1 == "" && + preparation_order.address.additional_address_data_2 == "" && + preparation_order.address.post_code_area_name == "" && + preparation_order.address.territorial_division_code == "" && + preparation_order.address.postal_code == "" && + preparation_order.address.iso_country_code == ""> + "ActorID": "${RFXtoRPprefixConsignee(preparation_order.end_consignee_code?json_string)}" + <#else> + "Actor": + { + "Name" : "${(preparation_order.address.name_or_company_name!"")?json_string}", + "Address" : + { + "City" : "${(preparation_order.address.post_code_area_name!"")?json_string}", + "CountryCode" : "${preparation_order.address.iso_country_code!""}", + "PostalCode" : "${preparation_order.address.postal_code!""}", + "StreetAddressOne" : "${(preparation_order.address.street_and_number_and_po_box!"")?json_string}", + "StreetAddressTwo" : "${(preparation_order.address.additional_address_data_1!"")?json_string}", + "StreetAddressThree" : "${(preparation_order.address.additional_address_data_2!"")?json_string}" + } + }, + "Contact" : + { + "FirstName" : "${(preparation_order.address.first_name!"")?json_string}", + "LastName" : "${(preparation_order.address.last_name!"")?json_string}", + "Emails" : ${splitEmailsIntoArray((preparation_order.address.mail_address!"")?json_string)}, + "Phones" : ["${(preparation_order.address.mobile_phone_number!"")?json_string}","${(preparation_order.address.land_line_phone_number!"")?json_string}", "${(preparation_order.address.fax_number!"")?json_string}" ] + } + }, - + "OrderID":"${preparation_order.originator_reference?trim?json_string}", <#if preparation_order.line_list??> "Lines" : [ <#list preparation_order.line_list as preparation_order_line > @@ -117,8 +106,14 @@ { "RequestedDeliveryDateTime" : { + <#if preparation_order.intermediate_consignee_code?? && preparation_order.intermediate_consignee_code!="" && preparation_order.intermediate_delivery_start_datetime?? && preparation_order.intermediate_delivery_start_datetime!="0000-00-00T00:00:00"> + <#assign intermediate_delivery_start_datetime = RfxDateTimetoUTCWithTimezone(preparation_order.intermediate_delivery_start_datetime,time_zone_rfx) /> + "DateTime": "${intermediate_delivery_start_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + <#else> "DateTime": "${planned_final_delivery_start_datetime}", - "AuthorTimeZone": "${time_zone_rfx}" + "AuthorTimeZone": "${time_zone_rfx}" + } } } diff --git a/RFXtoRP_HsrReceiptList.ftl b/RFXtoRP_HsrReceiptList.ftl index 18279c7..872af00 100644 --- a/RFXtoRP_HsrReceiptList.ftl +++ b/RFXtoRP_HsrReceiptList.ftl @@ -17,7 +17,22 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> <#if receipt.receipt_reference ?? && receipt.receipt_reference!=""> <#if receipt.receipt_type = "030"> - <#stop "ignored message because receipt type = transfert"> + [ + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl"> + + }, + { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptExpected> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl"> + + } + ] <#else> [ { @@ -46,16 +61,21 @@ <#assign receipt = JsonUtil.jsonToMap(dataRfx)> [ <#if receipt.receipt_reference?? && receipt.receipt_reference!=""> - <#if receipt.receipt_confirmed == "true" > + <#if receipt.receipt_type = "030" && receipt.receipt_confirmed == "true" > { + <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> + "apiReflexPlatformID" : "${apiReflexPlatformID}", + "datas" : + <#include "RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl"> + } + <#else> + <#if receipt.receipt_confirmed == "true"> + { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowReceiptCompleted> "apiReflexPlatformID" : "${apiReflexPlatformID}", "datas" : <#include "RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl"> } - <#else> - <#if receipt.receipt_type = "030"> - <#stop "ignored message because receipt type = transfert"> <#else> { <#assign apiReflexPlatformID = ApiReflexPlatformID.ExecutionflowDetected> diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl index e262117..3483c30 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowCancelled.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl index be2fc6a..8374b42 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowDetected.ftl @@ -9,7 +9,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}", "AuthorTimeZone": "${time_zone_rfx}" @@ -33,6 +33,7 @@ "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" }, "ShipToAcked": true, + "OrderID":"${receipt.receipt_reference?trim?json_string}", <#if receipt.carrier_informations.carrier_code != ""> "Carrier": diff --git a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl index 91390fb..33e2a0f 100644 --- a/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl +++ b/RFXtoRP_HsrReceiptList_ExecutionflowReceiptCompleted.ftl @@ -7,7 +7,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl index 23cf130..8490938 100644 --- a/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl +++ b/RFXtoRP_HsrReceiptList_ReceiptExpected.ftl @@ -8,7 +8,7 @@ "ProjectID": "${projectRP}" }, "ID": { - "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefID": "${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", "RefDate": { "DateTime": "${receipt_status_datetime}", "AuthorTimeZone": "${time_zone_rfx}" diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl new file mode 100644 index 0000000..e262117 --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowCancelled.ftl @@ -0,0 +1,20 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.modification_datetime,time_zone_rfx) /> + +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } +] diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl new file mode 100644 index 0000000..e908b8e --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -0,0 +1,94 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#include "ActorPrefix.ftl"> +[ + { + <#assign receipt_datetime = RfxDateTimetoUTCWithTimezone(receipt.receipt_datetime,time_zone_rfx) /> + <#assign receipt_creation_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + "CreationDateTime": { + "DateTime": "${receipt_creation_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + }, + "OrderID":"${receipt.receipt_reference?trim?json_string}", + <#-- Header Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_HeaderMetadata.ftl">, + + "ShipFrom": + { + "ActorID": "${RFXtoRPprefixSupplier(receipt.original_code?trim?json_string)}" + }, + "ShipTo" : + { + "ActorID": "${RFXtoRPprefixDepot(receipt.physical_depot_code?trim?json_string)}" + }, + "ShipToAcked": true, + + <#if receipt.carrier_informations.carrier_code != ""> + "Carrier": + { + "ActorID":"${RFXtoRPprefixCarrier(receipt.carrier_informations.carrier_code?trim?json_string)}" + }, + + + <#if receipt.line_list??> + "Lines" : [ + <#list receipt.line_list as line> + { + "LineID": "${line.receipt_line_number}", + <#-- Line Metadata inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_LineMetadata.ftl">, + "RequestedContent": + { + "Goods": + { + "ItemID": "${line.item_code?trim?json_string!"0"}", + "LVBranchID": "${line.item_lv_code?json_string!"0"}", + <#if (line.line_without_detail?? && line.line_without_detail.priority_date?length != 0) && (line.line_without_detail.priority_date?starts_with("00") == false)> + <#assign line_without_detail_priority_date = line.line_without_detail.priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_without_detail_priority_date}", + <#else> + <#if (line.line_detail?? && line.line_detail?size == 1 && line.line_detail[0].priority_date?length != 0) && (line.line_detail[0].priority_date?starts_with("00") == false)> + <#assign line_detail_priority_date = line.line_detail[0].priority_date?datetime(rfx_date_format_default)?iso_utc /> + "PriorityDate": "${line_detail_priority_date}", + <#else> + "PriorityDate": "1970-01-01T00:00:00Z", + + + <#-- Segmentation Keys inclusion --> + <#include "RFXtoRP_HsrReceiptList_ExecutionflowDetected_SegmentationKeys.ftl"> + }, + "Quantity" : + { + "LVID": "${quantity_in_base_lv_RP_Cst}", + "Value": "${line.order_quantity_in_lv!0}" + } + } + + } + <#sep>, + + ], + + + "RequestedMilestones" : + { + "RequestedDeliveryDateTime" : + { + "DateTime": "${receipt_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + } + } + } +] diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl new file mode 100644 index 0000000..2335174 --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowReceiptCompleted.ftl @@ -0,0 +1,19 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.confirmation_datetime,time_zone_rfx) /> +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + "Payload": { + } + } +] diff --git a/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl new file mode 100644 index 0000000..ad59e3c --- /dev/null +++ b/RFXtoRP_HsrReceiptList_TransfertReceiptExpected.ftl @@ -0,0 +1,21 @@ +<#include "HfRpConfig.ftl"> +<#include "ReflexUtils.ftl"> +<#assign receipt_status_datetime = RfxDateTimetoUTCWithTimezone(receipt.creation_datetime,time_zone_rfx) /> + +[ + { + "Header": { + "ProjectID": "${projectRP}" + }, + "ID": { + "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_reference?trim?json_string}", + "RefDate": { + "DateTime": "${receipt_status_datetime}", + "AuthorTimeZone": "${time_zone_rfx}" + } + }, + + "Payload": {} + + } +] diff --git a/RPtoRFX_PrepOrder.ftl b/RPtoRFX_PrepOrder.ftl index 0debca9..c80da8c 100644 --- a/RPtoRFX_PrepOrder.ftl +++ b/RPtoRFX_PrepOrder.ftl @@ -17,7 +17,7 @@ { - "id" : {"refid" : "${executionflow.OrderID?json_string}"}, + "id" : {"refid" : "${eventRP.refid?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/preparation_orders", "method" : "POST", "uri_substitutions": { diff --git a/RPtoRFX_Receipt.ftl b/RPtoRFX_Receipt.ftl index 763cf12..cd271c9 100644 --- a/RPtoRFX_Receipt.ftl +++ b/RPtoRFX_Receipt.ftl @@ -3,7 +3,7 @@ <#include "HfRpConfig.ftl"> { - "id" : {"refid" : "${executionflow.OrderID?json_string}"}, + "id" : {"refid" : "${eventRP.refid?json_string}"}, "route" : "rest/public/v1/activities/{activity_code}/physical_depots/{physical_depot_code}/originators/{originator_code}/receipts", "method" : "POST", "uri_substitutions": { @@ -52,7 +52,6 @@ "batch_1": "${batch_1?json_string!""}", "optional_attributes": { <#--"held_for_check": "false", - "held _for_repacking": "false", "hold_code": "false", --> "hold_for_specific_code": "false" } diff --git a/VERSION b/VERSION index 6f0f778..5de072f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.37+2 +2.0.1+1 \ No newline at end of file