From b70456bfd425b107f68cfd60c6e6b25e143cea7c Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 20 三月 2026 09:20:41 +0800
Subject: [PATCH] fix:1.库存报表（耗材和仓库筛选优化） 2.耗材和仓储物流导出字段优化 3.入库导出优化
---
src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
index da58179..110a257 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
@@ -85,7 +85,7 @@
select
product_model_id,
sum(net_weight) as total_net_weight
- from Consumables_in_record
+ from consumables_in_record
group by product_model_id
) sir on si.product_model_id = sir.product_model_id
-- 鍑哄簱鍑�閲�
@@ -93,7 +93,7 @@
select
product_model_id,
sum(net_weight) as total_net_weight
- from Consumables_out_record
+ from consumables_out_record
group by product_model_id
) sor on si.product_model_id = sor.product_model_id
@@ -110,6 +110,8 @@
<select id="listConsumablesInventoryExportData" resultType="com.ruoyi.consumables.execl.ConsumablesInventoryExportData">
select si.qualitity,
+ -- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
+ (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
pm.model,
pm.unit,
p.product_name,
@@ -120,6 +122,21 @@
from consumables_inventory si
left join product_model pm on si.product_model_id = pm.id
left join product p on pm.product_id = p.id
+ left join (
+ select
+ product_model_id,
+ sum(net_weight) as total_net_weight
+ from consumables_in_record
+ group by product_model_id
+ ) sir on si.product_model_id = sir.product_model_id
+ -- 鍑哄簱鍑�閲�
+ left join (
+ select
+ product_model_id,
+ sum(net_weight) as total_net_weight
+ from consumables_out_record
+ group by product_model_id
+ ) sor on si.product_model_id = sor.product_model_id
where 1 = 1
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
@@ -129,7 +146,7 @@
<select id="consumablesInventoryPage" resultType="com.ruoyi.consumables.dto.ConsumablesInRecordDto">
select
sir.*,
- si.qualitity as current_consumables,
+ si.qualitity as current_stock,
pm.model,
pm.unit,
p.product_name,
@@ -138,7 +155,7 @@
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
IFNULL(inWeight.total_in_weight,0) - IFNULL(outWeight.total_out_weight,0) as current_weight
- from Consumables_in_record sir
+ from consumables_in_record sir
left join consumables_inventory si
on sir.product_model_id = si.product_model_id
@@ -157,7 +174,7 @@
select
product_model_id,
sum(net_weight) as total_in_weight
- from Consumables_in_record
+ from consumables_in_record
group by product_model_id
) inWeight
on sir.product_model_id = inWeight.product_model_id
@@ -167,7 +184,7 @@
select
product_model_id,
sum(net_weight) as total_out_weight
- from Consumables_out_record
+ from consumables_out_record
group by product_model_id
) outWeight
on sir.product_model_id = outWeight.product_model_id
@@ -191,9 +208,9 @@
pm.model,
pm.unit,
p.product_name,
- MAX(current_inventory) as current_consumables,
- SUM(CASE WHEN record_type = 'in' THEN amount ELSE 0 END) as total_Consumables_in,
- SUM(CASE WHEN record_type = 'out' THEN amount ELSE 0 END) as total_Consumables_out
+ MAX(current_inventory) as current_stock,
+ SUM(CASE WHEN record_type = 'in' THEN amount ELSE 0 END) as total_stock_in,
+ SUM(CASE WHEN record_type = 'out' THEN amount ELSE 0 END) as total_stock_out
FROM (
SELECT
product_model_id,
@@ -208,16 +225,16 @@
SELECT
product_model_id,
0 as current_inventory,
- SUM(Consumables_in_num) as amount,
+ SUM(stock_in_num) as amount,
'in' as record_type
- FROM Consumables_in_record
+ FROM consumables_in_record
<where>
type = 0
<if test="ew.startMonth != null">
- and Consumables_in_record.create_time >= #{ew.startMonth}
+ and consumables_in_record.create_time >= #{ew.startMonth}
</if>
<if test="ew.endMonth != null">
- and Consumables_in_record.create_time <= #{ew.endMonth}
+ and consumables_in_record.create_time <= #{ew.endMonth}
</if>
</where>
GROUP BY product_model_id
@@ -227,16 +244,16 @@
SELECT
product_model_id,
0 as current_inventory,
- SUM(Consumables_out_num) as amount,
+ SUM(stock_out_num) as amount,
'out' as record_type
- FROM Consumables_out_record
+ FROM consumables_out_record
<where>
type = 0
<if test="ew.startMonth != null">
- and Consumables_out_record.create_time >= #{ew.startMonth}
+ and consumables_out_record.create_time >= #{ew.startMonth}
</if>
<if test="ew.endMonth != null">
- and Consumables_out_record.create_time <= #{ew.endMonth}
+ and consumables_out_record.create_time <= #{ew.endMonth}
</if>
</where>
GROUP BY product_model_id
@@ -283,7 +300,7 @@
<select id="selectDailyConsumablesInCounts" resultType="java.util.Map">
SELECT DATE(sir.create_time) AS date,
- SUM(sir.Consumables_in_num) AS count
+ SUM(sir.stock_in_num) AS count
FROM consumables_in_record sir
JOIN product_model pm ON sir.product_model_id = pm.id
JOIN product p ON pm.product_id = p.id
@@ -296,7 +313,7 @@
<select id="selectDailyConsumablesOutCounts" resultType="java.util.Map">
SELECT DATE(sor.create_time) AS date,
- SUM(sor.Consumables_out_num) AS count
+ SUM(sor.stock_out_num) AS count
FROM consumables_out_record sor
JOIN product_model pm ON sor.product_model_id = pm.id
JOIN product p ON pm.product_id = p.id
--
Gitblit v1.9.3