From 62de4c0de6e9b699d276c707057932219d264dab Mon Sep 17 00:00:00 2001 From: msyu Date: Thu, 19 Jun 2025 14:59:50 +0300 Subject: [PATCH] 003 costs/ number clean --- Application.cfc | 2 +- agreement.cfm | 3 +++ specification.cfm | 8 +++++++- specification_item.cfm | 3 +++ specification_item_ls.cfm | 8 ++++++-- specification_item_version.cfm | 8 +++++++- svc.cfm | 4 ++-- 7 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Application.cfc b/Application.cfc index fdad95e..3509acb 100644 --- a/Application.cfc +++ b/Application.cfc @@ -69,7 +69,7 @@ - + diff --git a/agreement.cfm b/agreement.cfm index a49e43e..e6daf8f 100644 --- a/agreement.cfm +++ b/agreement.cfm @@ -204,6 +204,7 @@ ,iv.specification_item_version /*it is printable name not number*/ ,iv.quantity ,iv.price + ,iv.price*iv.quantity as cost ,iv.dt_from ,iv.dt_to ,i.specification_id @@ -282,6 +283,7 @@ Дата по Кол-во Цена + Стоимость   @@ -322,6 +324,7 @@ #dateFormat(dt_to,'DD.MM.YYYY')# #quantity# #price# + #cost# diff --git a/specification.cfm b/specification.cfm index 9c7a9a6..9eacf3d 100644 --- a/specification.cfm +++ b/specification.cfm @@ -183,7 +183,11 @@ ,(select siv.price from specification_item_version siv join agreement a on (siv.agreement_version=a.agreement_version AND a.contract_id=s.contract_id) where siv.specification_item_uid=i.specification_item_uid AND a.is_actual - order by siv.agreement_version desc limit 1) as price + order by siv.agreement_version desc limit 1) as price, + (select siv.price*siv.quantity from specification_item_version siv + join agreement a on (siv.agreement_version=a.agreement_version AND a.contract_id=s.contract_id) + where siv.specification_item_uid=i.specification_item_uid AND a.is_actual + order by siv.agreement_version desc limit 1) as cost ,(select siv.dt_from from specification_item_version siv join agreement a on (siv.agreement_version=a.agreement_version AND a.contract_id=s.contract_id) where siv.specification_item_uid=i.specification_item_uid AND a.is_actual @@ -232,6 +236,7 @@ Дата по Количество Цена + Стоимость Имя для печати @@ -257,6 +262,7 @@ #dateFormat(dt_to,'DD.MM.YYYY')# #quantity# #price# + #cost# #specification_item# diff --git a/specification_item.cfm b/specification_item.cfm index 41f680c..536cee1 100644 --- a/specification_item.cfm +++ b/specification_item.cfm @@ -183,6 +183,7 @@ select siv.price ,siv.quantity + ,siv.price*siv.quantity as cost ,siv.specification_item_version ,siv.agreement_version ,siv.dt_from @@ -226,6 +227,7 @@ Услуга (для печати) Кол-во Цена + Стоимость @@ -245,6 +247,7 @@ #specification_item_version# #quantity# #price# + #cost# diff --git a/specification_item_ls.cfm b/specification_item_ls.cfm index 5e5dfa7..2495e3a 100644 --- a/specification_item_ls.cfm +++ b/specification_item_ls.cfm @@ -43,11 +43,13 @@ siv.dt_to siv.quantity siv.price + siv.price*siv.quantity as cost ver.quantity as quantity_prev - ver.price as price_prev + ver.price as price_prev + 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,0) - COALESCE(ver.price*ver.quantity,0))*a.probability_perc/100 as cost_diff_prob from specification_item_version siv join specification_item si on (siv.specification_item_uid=si.specification_item_uid) @@ -199,9 +201,11 @@ select count(*) as cnt from specification_item where 1=1 + + diff --git a/specification_item_version.cfm b/specification_item_version.cfm index 4f264a0..969c62b 100644 --- a/specification_item_version.cfm +++ b/specification_item_version.cfm @@ -50,7 +50,7 @@ - + @@ -197,6 +197,12 @@ + + + Стоимость: #d.quantity*d.price# + + + diff --git a/svc.cfm b/svc.cfm index 393bc15..831b55c 100644 --- a/svc.cfm +++ b/svc.cfm @@ -20,10 +20,10 @@ - + - +