weizhiqiang1995/erp-pro
1
1
Fork 0
mirror of https://github.com/weizhiqiang1995/erp-pro.git synced 2024-09-20 15:06:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

进货统计修改

Browse source
This commit is contained in:
weizhiqiang 2019-10-22 14:53:01 +08:00
parent aa56845cc5
commit 1b0e5adaaa
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
erp-modular/src/main/resources/dbmapper/erp/StatisticsMapper.xml
View file

@ -94,16 +94,8 @@
b.`name` materialName,
b.model,
IFNULL(c.`name`, b.unit_name) unitName,
IFNULL(SUM(m.oper_number * (CASE m.sub_type
WHEN 12 THEN (CASE m.m_type WHEN 1 THEN 0 ELSE 1 END)
WHEN 13 THEN (CASE m.m_type WHEN 1 THEN 1 ELSE 0 END)
ELSE CASE m.type WHEN 2 THEN 1 ELSE 0 END
END)), 0) currentTock,
FORMAT(IFNULL(SUM(m.total_price * (CASE m.sub_type
WHEN 12 THEN (CASE m.m_type WHEN 1 THEN 0 ELSE 1 END)
WHEN 13 THEN (CASE m.m_type WHEN 1 THEN 1 ELSE 0 END)
ELSE CASE m.type WHEN 2 THEN 1 ELSE 0 END
END)), 0), 2) currentTockMoney,
IFNULL(SUM(m.oper_number), 0) currentTock,
FORMAT(IFNULL(SUM(m.total_price), 0), 2) currentTockMoney,
IFNULL(SUM(m.oper_number * (CASE m.sub_type
WHEN 2 THEN 1
WHEN 3 THEN 1
@ -132,7 +124,7 @@
q.header_id = p.id
AND q.delete_flag = '0'
AND p.delete_flag = '0'
AND (p.type = '2' OR (p.type = '3' AND p.sub_type IN('12', '13')))
AND p.type = '2'
AND p.tenant_id = #{userId}
AND p.sub_type != '10'
AND DATE_FORMAT(p.oper_time, '%Y-%m') = #{operTime}

3
erp-modular/src/main/resources/template/tpl/erpstatistics/incomingstatistics.html
View file

@ -29,6 +29,9 @@
<div class="winui-toolbar">
<div class="winui-tool">
<button id="reloadTable" class="winui-toolbtn"><i class="fa fa-refresh" aria-hidden="true"></i>刷新数据</button>
<div style="width: calc(100% - 120px); float: right; padding: 8px 10px;">
<div class="layui-form-mid layui-word-aux" style="color: red !important;">注：数量和金额统计不包含拆分单和组装单。</div>
</div>
</div>
</div>
<div style="margin:auto 10px;">