003 costs/ number clean

This commit is contained in:
msyu
2025-06-19 14:59:50 +03:00
parent a07522702c
commit 62de4c0de6
7 changed files with 29 additions and 7 deletions
+6 -2
View File
@@ -43,11 +43,13 @@
<d:field title="Дата по">siv.dt_to</d:field>
<d:field title="Кол-во">siv.quantity</d:field>
<d:field title="Цена">siv.price</d:field>
<d:field title="Стоимость">siv.price*siv.quantity as cost</d:field>
<d:field title="Кол-во прошлое">ver.quantity as quantity_prev</d:field>
<d:field title="Цена прошлая">ver.price as price_prev</d:field>
<d:field title="Цена прошлая">ver.price as price_prev</d:field>
<d:field title="Ст-ть прошлая">ver.price*ver.quantity as cost_prev</d:field>
<d:field title="Версия прошлая">ver.agreement_version as version_prev</d:field>
<d:field title="Изменение стоимости">COALESCE(siv.price*siv.quantity,0) - COALESCE(ver.price*ver.quantity,0) as cost_diff</d:field>
<d:field title="Изменение с вер.">(COALESCE(siv.price*siv.quantity,0) - COALESCE(ver.price*ver.quantity,0))*a.probability_perc/100 as cost_diff_prob</d:field>
<d:field title="Изм-е с верoят.">(COALESCE(siv.price*siv.quantity,0) - COALESCE(ver.price*ver.quantity,0))*a.probability_perc/100 as cost_diff_prob</d:field>
</d:field_set>
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
<c:column width="3%" field="agreement_version"><c:td class="c"/></c:column>
<c:column width="3%" field="quantity"><c:td class="r"/></c:column>
<c:column width="3%" field="price"><c:td class="r"/></c:column>
<c:column width="3%" field="cost"><c:td class="r"/></c:column>
<c:column width="3%" field="f_version_prev"><c:td class="c"/></c:column>
<c:column width="3%" field="quantity_prev"><c:td class="r"/></c:column>
<c:column width="3%" field="price_prev"><c:td class="r"/></c:column>
<c:column width="3%" field="cost_prev"><c:td class="r"/></c:column>
<c:column width="3%" field="cost_diff"><c:td class="r"/></c:column>
<c:column width="3%" field="cost_diff_prob"><c:td class="r"/></c:column>
<c:column width="1%" sortable="false">