modifs
This commit is contained in:
parent
65601133f1
commit
153df99ed1
@ -8,7 +8,7 @@
|
|||||||
"ProjectID": "${projectRP}"
|
"ProjectID": "${projectRP}"
|
||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
"ActorID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
|
"RefID": "${RFXtoRPprefixDepot(stock.physical_depot_code)}"
|
||||||
},
|
},
|
||||||
"Payload": {
|
"Payload": {
|
||||||
<#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
|
<#assign generation_date = RfxDateTimetoUTC(stock.generation_date,time_zone_offset_rfx) />
|
||||||
|
|||||||
@ -8,15 +8,14 @@
|
|||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
<#if dispute.dispute_preparation??>
|
<#if dispute.dispute_preparation??>
|
||||||
"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}"
|
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
<#else>
|
<#else>
|
||||||
<#if dispute.dispute_reception??>
|
<#if dispute.dispute_reception??>
|
||||||
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
|
"RefID": "${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_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
},
|
},
|
||||||
"Payload": {
|
"Payload": {
|
||||||
|
|
||||||
<#if dispute.dispute_reference?? && dispute.dispute_reference!="">
|
<#if dispute.dispute_reference?? && dispute.dispute_reference!="">
|
||||||
"Title":"${dispute.dispute_reference?trim?json_string}",
|
"Title":"${dispute.dispute_reference?trim?json_string}",
|
||||||
<#else>
|
<#else>
|
||||||
@ -27,6 +26,8 @@
|
|||||||
<#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) />
|
<#assign isCurrencyCode = JsonUtil.isCurrencyCode(dispute.dispute_amount_unit?upper_case) />
|
||||||
<#if isCurrencyCode>
|
<#if isCurrencyCode>
|
||||||
"Currency" : "${dispute.dispute_amount_unit?upper_case?json_string}",
|
"Currency" : "${dispute.dispute_amount_unit?upper_case?json_string}",
|
||||||
|
<#--<#elseif isCurrencyCode!>
|
||||||
|
"Currency" : "${TableAmount[dispute.dispute_amount_unit?json_string]}",-->
|
||||||
<#else>
|
<#else>
|
||||||
"Currency" : "XXX",
|
"Currency" : "XXX",
|
||||||
</#if>
|
</#if>
|
||||||
@ -53,4 +54,7 @@
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -6,11 +6,11 @@
|
|||||||
"ProjectID": "${projectRP}"
|
"ProjectID": "${projectRP}"
|
||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
<#if dispute.dispute_preparation??>
|
<#if dispute.dispute_preparation??>
|
||||||
"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}"
|
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
<#else>
|
<#else>
|
||||||
<#if dispute.dispute_reception??>
|
<#if dispute.dispute_reception??>
|
||||||
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
|
"RefID": "${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_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
},
|
},
|
||||||
|
|||||||
@ -6,18 +6,21 @@
|
|||||||
"ProjectID": "${projectRP}"
|
"ProjectID": "${projectRP}"
|
||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
<#if dispute.dispute_preparation??>
|
<#if dispute.dispute_preparation??>
|
||||||
"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}"
|
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
<#else>
|
<#else>
|
||||||
<#if dispute.dispute_reception??>
|
<#if dispute.dispute_reception??>
|
||||||
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
|
"RefID": "${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_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
},
|
},
|
||||||
"Payload": {
|
"Payload": {
|
||||||
|
|
||||||
"Message": "Item : ${dispute.dispute_item.item_code?trim?json_string} - Quantity : ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
|
<#if dispute.dispute_quantity!=0>
|
||||||
|
"Message": "Item : ${dispute.dispute_item.item_code?trim?json_string} - Quantity : ${dispute.dispute_quantity}${dispute.dispute_quantity_unit}"
|
||||||
|
<#else>
|
||||||
|
"Message": "Item : ${dispute.dispute_item.item_code?trim?json_string}"
|
||||||
|
</#if>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -6,11 +6,11 @@
|
|||||||
"ProjectID": "${projectRP}"
|
"ProjectID": "${projectRP}"
|
||||||
},
|
},
|
||||||
"ID": {
|
"ID": {
|
||||||
<#if dispute.dispute_preparation??>
|
<#if dispute.dispute_preparation??>
|
||||||
"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}"
|
"RefID": "${dispute.dispute_preparation.preparation_physical_depot_code?json_string}${dispute.dispute_preparation.preparation_activity_code?json_string}${dispute.dispute_preparation.preparation_order_list[0].preparation_order_contractor_code?json_string}${dispute.dispute_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
<#else>
|
<#else>
|
||||||
<#if dispute.dispute_reception??>
|
<#if dispute.dispute_reception??>
|
||||||
"RefID": "${dispute.dispute_reception.reception_physical_depot_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_activity_code?replace(" ","")?json_string}${dispute.dispute_reception.reception_contractor_code?replace(" ","")?json_string}${dispute.dispute_year_number?replace(" ","")?json_string}${dispute.dispute_number?replace(" ","")?json_string}"
|
"RefID": "${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_year_number?json_string}${dispute.dispute_number?json_string}"
|
||||||
</#if>
|
</#if>
|
||||||
</#if>
|
</#if>
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user