diff --git a/agreement.cfm b/agreement.cfm index a6a62c9..aac3ae6 100644 --- a/agreement.cfm +++ b/agreement.cfm @@ -168,62 +168,87 @@ - + select - i.agreement_item_uid - ,s.svc_id - ,s.svc - ,s.code - ,(select count(*) from agreement_item_version siv where siv.agreement_item_uid=i.agreement_item_uid) as item_version_count - from agreement_item i - left outer join svc s on (i.svc_id=s.svc_id) - where i.agreement_id= + i.specification_item_uid + i.agreement_version /*лучше читается, когда все берется из резалтсета*/ + ,i.svc_id + ,svc.svc + ,svc.code + ,iv.specification_item_version /*it is printable name not number*/ + ,iv.quantity + ,iv.price + ,iv.dt_from + ,iv.dt_to + ,i.specification_id + ,s.specification + ,s.contract_id + ,d.contract + ,d.dt_contract + ,d.contragent_id + ,k.contragent + from specification_item_version iv + join specification_item i on (iv.specification_item_uid=i.specification_item_uid) + join specification s on (i.specification_id=s.specification_id) + join contract d on (s.contract_id=d.contract_id) + join contragent k on (d.contragent_id=k.contragent_id) + left outer join svc on (i.svc_id=svc.svc_id) + where s.contract_id= + AND iv.agreement_version= order by 1

- Строки спецификации (#qItem.recordCount#) - - - - - - + Строки спецификаций (#qItem.recordCount#)

- + - - + + + + + + + + - + - + + + + + + + +
Ключ строкиСтабильный ключ строки Услуга Код услугиВерсийИмя для печатиДата сДата поКол-воЦенаСпецификацияДоговорКонтрагент
- + "edit""view"> #agreement_item_uid##specification_item_uid# #svc# #code##item_version_count##specification_item_version##dateFormat(dt_from,'DD.MM.YYYY')##dateFormat(dt_to,'DD.MM.YYYY')##quantity##price##specification##contract# #dateFormat(dt_contract,'DD.MM.YYYY')##contragent# - + + +
-
---> + diff --git a/etc/db/spec.sql b/etc/db/spec.sql index 5aa8049..5ac8d2b 100644 --- a/etc/db/spec.sql +++ b/etc/db/spec.sql @@ -102,6 +102,7 @@ insert into specification (specification,contract_id) values ('first spec',1); -- -- , - , - , , +-- , drop table if exists specification_version CASCADE; create table specification_version ( specification_id int