From 5cbfd0b2270edf6390cc1bb7c683956dbe93d66f Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 23 三月 2026 11:08:28 +0800
Subject: [PATCH] feat:耗材物料更改（字段变动）
---
src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml | 116 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 86 insertions(+), 30 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
index 2940d56..ebc0712 100644
--- a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
+++ b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
@@ -14,8 +14,11 @@
<result column="warn_num" property="warnNum"/>
</resultMap>
<update id="updateAddConsumablesInventory">
- update Consumables_inventory
+ update consumables_inventory
<set>
+ <if test="ew.productId != null">
+ product_id = #{ew.productId},
+ </if>
<if test="ew.qualitity != null">
qualitity = qualitity + #{ew.qualitity},
</if>
@@ -37,10 +40,10 @@
where product_model_id = #{ew.productModelId}
</update>
<update id="updateSubtractConsumablesInventory">
- update Consumables_inventory
+ 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,
@@ -59,6 +62,7 @@
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
(COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
si.qualitity,
+ si.purchaser,
COALESCE(si.locked_quantity, 0) as locked_quantity,
si.product_model_id,
si.create_time,
@@ -71,9 +75,9 @@
pm.unit,
p.product_name,
p1.product_name as parent_name,
- p1.id as parent_id
-
- from Consumables_inventory si
+ p1.id as parent_id,
+ si.product_id as productId
+ 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 product p1 on p.parent_id = p1.id
@@ -82,7 +86,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
-- 鍑哄簱鍑�閲�
@@ -90,7 +94,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
@@ -107,6 +111,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,
@@ -114,19 +120,34 @@
coalesce(si.locked_quantity, 0) as locked_quantity,
si.remark,
si.update_time
- from Consumables_inventory si
+ 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},'%')
</if>
</select>
- <select id="ConsumablesInventoryPage" resultType="com.ruoyi.consumables.dto.ConsumablesInRecordDto">
+ <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,
@@ -135,9 +156,9 @@
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
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
+ left join consumables_inventory si
on sir.product_model_id = si.product_model_id
left join product_model pm
@@ -154,7 +175,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
@@ -164,7 +185,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
@@ -183,21 +204,22 @@
</where>
</select>
- <select id="ConsumablesInAndOutRecord" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
+ <select id="consumablesInAndOutRecord" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
SELECT
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,
+ (COALESCE(in_weight.total_net_weight, 0) - COALESCE(out_weight.total_net_weight, 0)) AS current_weight
FROM (
SELECT
product_model_id,
SUM(qualitity) as current_inventory,
0 as amount,
'' as record_type
- FROM Consumables_inventory
+ FROM consumables_inventory
GROUP BY product_model_id
UNION ALL
@@ -205,16 +227,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
@@ -224,20 +246,54 @@
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
) 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>
@@ -280,7 +336,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
@@ -293,7 +349,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