diff --git a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl index e972642..0c40edb 100644 --- a/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl +++ b/RFXtoRP_HsrReceiptList_TransfertExecutionflowDetected.ftl @@ -37,7 +37,18 @@ { "Key": "order_number", "Value": "${receipt.receipt_number}" + }, + <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 > + { + "Key": "anticipated", + "Value": "true" } + <#else> + { + "Key": "anticipated", + "Value": "false" + } + ], <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!="" && receipt.receipt_reference?? && receipt.receipt_reference!=""> "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}", @@ -140,6 +151,47 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "Value": "${receipt.origin_order_line_depot?trim?json_string}" + <#else> + "Value": "${receipt.physical_depot_code?trim?json_string}" + + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + }, + <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 > + { + "Key": "anticipated", + "Value": "true" + } + <#else> + { + "Key": "anticipated", + "Value": "false" + } + + ], <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> "RefID": "${receipt.origin_order_line_depot?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt_line.origin_order_line_reference?trim?json_string}", <#else> @@ -226,6 +278,47 @@ { "Header": {"ProjectID": "${projectRP}"}, "ID": { + "CustomFields": [ + { + "Key": "depot_code", + <#if receipt.origin_order_line_depot?? && receipt.origin_order_line_depot!=""> + "Value": "${receipt.origin_order_line_depot?trim?json_string}" + <#else> + "Value": "${receipt.physical_depot_code?trim?json_string}" + + }, + { + "Key": "activity_code", + "Value": "${receipt.activity_code?trim?json_string}" + }, + { + "Key": "originator_code", + "Value": "${receipt.originator_code?trim?json_string}" + }, + { + "Key": "reference", + "Value": "${receipt.receipt_reference?trim?json_string}" + }, + { + "Key": "order_year", + "Value": "${receipt.receipt_year}" + }, + { + "Key": "order_number", + "Value": "${receipt.receipt_number}" + }, + <#if receipt.line_list[0]?? && receipt.line_list[0].line_anticipated?? && receipt.line_list[0].line_anticipated.anticipated_receipt_year!=0 && receipt.line_list[0].line_anticipated.anticipated_receipt_number!=0 > + { + "Key": "anticipated", + "Value": "true" + } + <#else> + { + "Key": "anticipated", + "Value": "false" + } + + ], "RefID": "R${receipt.physical_depot_code?trim?json_string}${receipt.activity_code?trim?json_string}${receipt.originator_code?trim?json_string}${receipt.receipt_year?trim?json_string}${receipt.receipt_number?trim?json_string}", "RefDate": { "DateTime": "${receipt_creation_datetime}",