diff --git a/Application.cfc b/Application.cfc index 2de12f3..cf0f543 100644 --- a/Application.cfc +++ b/Application.cfc @@ -69,12 +69,12 @@ - + - + 182 000,00 diff --git a/agreement_ls.cfm b/agreement_ls.cfm index 43d514e..f853914 100644 --- a/agreement_ls.cfm +++ b/agreement_ls.cfm @@ -27,6 +27,7 @@ a.probability_perc a.agreement a.dt_agreement + a.is_actual a.descr d.contract d.dt_contract @@ -114,6 +115,7 @@ select count(*) as cnt from agreement where 1=1 + diff --git a/specification_item_ls.cfm b/specification_item_ls.cfm index 3b86d4e..1ae617d 100644 --- a/specification_item_ls.cfm +++ b/specification_item_ls.cfm @@ -50,7 +50,7 @@ ver.price*ver.quantity as cost_prev ver.agreement_version as version_prev COALESCE(siv.price*siv.quantity,0) - COALESCE(ver.price*ver.quantity,0) as cost_diff - (COALESCE(siv.price*siv.quantity,0) - COALESCE(ver.price*ver.quantity,0))*a.probability_perc/100 as cost_diff_prob + (COALESCE(siv.price*siv.quantity*a.probability_perc/100,0) - COALESCE(ver.price*ver.quantity*ver.probability_perc/100,0)) as cost_diff_prob from specification_item_version siv join specification_item si on (siv.specification_item_uid=si.specification_item_uid) @@ -67,6 +67,7 @@ ,a1.contract_id ,a1.dt_agreement ,a1.is_actual + ,a1.probability_perc ,siv1.specification_item_version ,siv1.quantity ,siv1.price @@ -95,8 +96,8 @@ where iiv.specification_item_uid=si.specification_item_uid AND ia.is_actual ) - + + order by @@ -223,9 +224,9 @@ select count(*) as cnt from specification_item where 1=1 #gridFooter# - Расчета по дням тут нет. - Дата по на самом деле нигде не используется. - Важное допущение: вероятность прошлой сделки принимается за 100% (то есть изменения имеют смысл только к действующему договору) + diff --git a/specification_version.cfm b/specification_version.cfm index 7096478..d00f509 100644 --- a/specification_version.cfm +++ b/specification_version.cfm @@ -142,8 +142,9 @@