From cf65d0a608b21f07dc50a98b864dfe47def4f86b Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 17:12:37 +0800
Subject: [PATCH] fix:1.产品删除 2.原材料展示 3.菜单优化 4.区分角色编辑删除
---
src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
index 110a257..fa16914 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
@@ -43,7 +43,7 @@
update consumables_inventory
<set>
<if test="ew.netWeight != null">
- qualitity = qualitity - #{ew.netWeight},
+ qualitity = qualitity - #{ew.qualitity},
</if>
<if test="ew.version != null">
version = version + 1,
@@ -60,8 +60,8 @@
select
si.id,
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
- (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
- si.qualitity,
+ (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as qualitity,
+ si.purchaser,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
si.create_time,
@@ -84,7 +84,7 @@
left join (
select
product_model_id,
- sum(net_weight) as total_net_weight
+ sum(stock_in_num) as total_net_weight
from consumables_in_record
group by product_model_id
) sir on si.product_model_id = sir.product_model_id
@@ -92,7 +92,7 @@
left join (
select
product_model_id,
- sum(net_weight) as total_net_weight
+ sum(stock_out_num) as total_net_weight
from consumables_out_record
group by product_model_id
) sor on si.product_model_id = sor.product_model_id
@@ -210,7 +210,8 @@
p.product_name,
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
+ SUM(CASE WHEN record_type = 'out' THEN amount ELSE 0 END) as total_stock_out,
+ (COALESCE(in_weight.total_net_weight, 0) - COALESCE(out_weight.total_net_weight, 0)) AS current_weight
FROM (
SELECT
product_model_id,
@@ -258,6 +259,40 @@
</where>
GROUP BY product_model_id
) combined_data
+ -- 宸﹁繛鎺ュ叆搴撳噣閲嶅悎璁�
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(net_weight) AS total_net_weight
+ FROM consumables_in_record
+ <where>
+ type = 0
+ <if test="ew.startMonth != null">
+ and create_time >= #{ew.startMonth}
+ </if>
+ <if test="ew.endMonth != null">
+ and create_time <= #{ew.endMonth}
+ </if>
+ </where>
+ GROUP BY product_model_id
+ ) in_weight ON combined_data.product_model_id = in_weight.product_model_id
+ -- 宸﹁繛鎺ュ嚭搴撳噣閲嶅悎璁�
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(net_weight) AS total_net_weight
+ FROM consumables_out_record
+ <where>
+ type = 0
+ <if test="ew.startMonth != null">
+ and create_time >= #{ew.startMonth}
+ </if>
+ <if test="ew.endMonth != null">
+ and create_time <= #{ew.endMonth}
+ </if>
+ </where>
+ GROUP BY product_model_id
+ ) out_weight ON combined_data.product_model_id = out_weight.product_model_id
LEFT JOIN product_model pm ON pm.id = combined_data.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
<where>
--
Gitblit v1.9.3