RDV
This commit is contained in:
parent
e7c3154c56
commit
b1c46cd0f1
@ -43,7 +43,7 @@
|
|||||||
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
|
<#include "RPtoRFX_CarrierAppointmentPhysicalReceiptAssociationByRef.ftl">
|
||||||
}
|
}
|
||||||
</#if>
|
</#if>
|
||||||
<#else>
|
</#if>
|
||||||
<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
|
<#if eventRP.removedCommissions?? && eventRP.removedCommissions!="">
|
||||||
<#if eventRP.appointmentCustomFields?has_content>
|
<#if eventRP.appointmentCustomFields?has_content>
|
||||||
{
|
{
|
||||||
@ -61,7 +61,6 @@
|
|||||||
}
|
}
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
|
||||||
<#else>
|
<#else>
|
||||||
<#stop "Unsupported Appointment Type for Commissions Update">
|
<#stop "Unsupported Appointment Type for Commissions Update">
|
||||||
</#if>
|
</#if>
|
||||||
|
|||||||
@ -11,8 +11,7 @@
|
|||||||
{
|
{
|
||||||
<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
|
<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
|
||||||
"physical_receipt_list": [
|
"physical_receipt_list": [
|
||||||
<#list addedCommissions as addedCommission>
|
<#list eventRP.addedCommissions as addedCommission>
|
||||||
|
|
||||||
{
|
{
|
||||||
"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
|
"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
|
||||||
"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
|
"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
|
||||||
@ -23,6 +22,5 @@
|
|||||||
<#sep>,</#sep>
|
<#sep>,</#sep>
|
||||||
</#list>
|
</#list>
|
||||||
]
|
]
|
||||||
</#if>
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,16 +8,18 @@
|
|||||||
},
|
},
|
||||||
"payload" :
|
"payload" :
|
||||||
{
|
{
|
||||||
<#list eventRP.addedCommissions as addedCommission>
|
<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
|
||||||
<#list eventRP.executionflowCustomFields.entrySet()?filter(l ->l.value?? && l.value?has_content) as CustomFields>
|
|
||||||
"physical_receipt_list": [
|
"physical_receipt_list": [
|
||||||
|
<#list eventRP.addedCommissions as addedCommission>
|
||||||
{
|
{
|
||||||
"receipt_activity": "${commission.value.activity_code?json_string}",
|
"receipt_activity": "${executionflowCustomFields[addedCommission.ExecutionflowID].activity_code?json_string}",
|
||||||
"originator_code": "${commission.value.originator_code?json_string}",
|
"originator_code": "${executionflowCustomFields[addedCommission.ExecutionflowID].originator_code?json_string}",
|
||||||
"physical_receipt_reference": "${commission.value.reference?json_string}",
|
"physical_receipt_reference": "${executionflowCustomFields[addedCommission.ExecutionflowID].reference?json_string}",
|
||||||
"receipt_year": "${commission.value.order_year?json_string}",
|
"receipt_year": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_year?json_string}",
|
||||||
"receipt_number": "${commission.value.order_number?json_string}"
|
"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
|
||||||
}
|
}
|
||||||
|
<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -9,22 +9,18 @@
|
|||||||
},
|
},
|
||||||
"payload" :
|
"payload" :
|
||||||
{
|
{
|
||||||
<#if appointment.Commissions??>
|
<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
|
||||||
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
|
|
||||||
"physical_receipt_list": [
|
"physical_receipt_list": [
|
||||||
|
<#list eventRP.removedCommissions as removedCommission>
|
||||||
{
|
{
|
||||||
"receipt_activity": "${commission.value.activity_code?json_string}",
|
"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
|
||||||
"originator_code": "${commission.value.originator_code?json_string}",
|
"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
|
||||||
"physical_receipt_reference": "${commission.value.reference?json_string}",
|
"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
|
||||||
"receipt_year": "${commission.value.order_year?json_string}",
|
"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
|
||||||
"receipt_number": "${commission.value.order_number?json_string}"
|
"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
|
||||||
}
|
}
|
||||||
|
<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
]
|
]
|
||||||
<#else>
|
|
||||||
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
|
|
||||||
"appointment_designation":"${appointment.Reason!""?json_string}"
|
|
||||||
</#if>
|
|
||||||
</#if>
|
|
||||||
</#if>
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -8,22 +8,18 @@
|
|||||||
},
|
},
|
||||||
"payload" :
|
"payload" :
|
||||||
{
|
{
|
||||||
<#if appointment.Commissions??>
|
<#assign executionflowCustomFields = eventRP.executionflowCustomFields >
|
||||||
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_UNLOADING">
|
|
||||||
"physical_receipt_list": [
|
"physical_receipt_list": [
|
||||||
|
<#list eventRP.removedCommissions as removedCommission>
|
||||||
{
|
{
|
||||||
"receipt_activity": "${commission.value.activity_code?json_string}",
|
"receipt_activity": "${executionflowCustomFields[removedCommission.ExecutionflowID].activity_code?json_string}",
|
||||||
"originator_code": "${commission.value.originator_code?json_string}",
|
"originator_code": "${executionflowCustomFields[removedCommission.ExecutionflowID].originator_code?json_string}",
|
||||||
"physical_receipt_reference": "${commission.value.reference?json_string}",
|
"physical_receipt_reference": "${executionflowCustomFields[removedCommission.ExecutionflowID].reference?json_string}",
|
||||||
"receipt_year": "${commission.value.order_year?json_string}",
|
"receipt_year": "${executionflowCustomFields[removedCommission.ExecutionflowID].order_year?json_string}",
|
||||||
"receipt_number": "${commission.value.order_number?json_string}"
|
"receipt_number": "${executionflowCustomFields[addedCommission.ExecutionflowID].order_number?json_string}"
|
||||||
}
|
}
|
||||||
|
<#sep>,</#sep>
|
||||||
|
</#list>
|
||||||
]
|
]
|
||||||
<#else>
|
|
||||||
<#if appointment.AppointmentType == "APPOINTMENT_TYPE_LOADING">
|
|
||||||
"appointment_designation":"${appointment.Reason!""?json_string}"
|
|
||||||
</#if>
|
|
||||||
</#if>
|
|
||||||
</#if>
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user