From e5cc807a611a078b1c152731ff7a07e765bbb9a5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 30 三月 2026 14:41:37 +0800
Subject: [PATCH] fix: 添加规格型号搜索
---
src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml | 142 ++++++++++++++++++++++++++++++----------------
1 files changed, 92 insertions(+), 50 deletions(-)
diff --git a/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml b/src/main/resources/mapper/consumables/ConsumablesInventoryMapper.xml
index 3f7f8d4..3b4e6d3 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,
@@ -57,55 +57,60 @@
</update>
<select id="pageConsumablesInventory" resultType="com.ruoyi.consumables.dto.ConsumablesInventoryDto">
- select
+ SELECT * FROM (
+ SELECT
si.id,
-- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
- (COALESCE(sir.total_net_weight,0) - COALESCE(sor.total_net_weight,0)) as net_weight,
- si.qualitity,
- COALESCE(si.locked_quantity, 0) as locked_quantity,
+ (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,
si.update_time,
- COALESCE(si.warn_num, 0) as warn_num,
+ COALESCE(si.warn_num, 0) AS warn_num,
si.version,
- (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
+ (si.qualitity - COALESCE(si.locked_quantity, 0)) AS un_locked_quantity,
pm.model,
si.remark,
pm.unit,
p.product_name,
- p1.product_name as parent_name,
- 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
+ p1.product_name AS parent_name,
+ 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
-- 鍏ュ簱鍑�閲�
- left join (
- select
+ 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
+ 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
-- 鍑哄簱鍑�閲�
- left join (
- select
+ 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
-
+ 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
<where>
1=1
- <if test="ew.parentId != null and ew.parentId !=''">
- and p.parent_id = #{ew.parentId}
+ <if test="ew.parentId != null and ew.parentId != ''">
+ AND p.parent_id = #{ew.parentId}
</if>
- <if test="ew.productName != null and ew.productName !=''">
- and p.product_name like concat('%',#{ew.productName},'%')
+ <if test="ew.productName != null and ew.productName != ''">
+ AND p.product_name LIKE CONCAT('%', #{ew.productName}, '%')
+ </if>
+ <if test="ew.model != null and ew.model != ''">
+ AND pm.model LIKE CONCAT('%', #{ew.model}, '%')
</if>
</where>
+ ) temp
+ WHERE qualitity != 0
</select>
<select id="listConsumablesInventoryExportData" resultType="com.ruoyi.consumables.execl.ConsumablesInventoryExportData">
@@ -126,7 +131,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
-- 鍑哄簱鍑�閲�
@@ -134,7 +139,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
where 1 = 1
@@ -146,7 +151,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,
@@ -155,7 +160,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
@@ -174,7 +179,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
@@ -184,12 +189,13 @@
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
<where>
+ 1=1
<if test="ew.reportDate != null">
and sir.create_time >= #{ew.reportDate}
and sir.create_time < DATE_ADD(#{ew.reportDate}, INTERVAL 1 DAY)
@@ -208,9 +214,10 @@
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,
@@ -225,16 +232,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
@@ -244,23 +251,58 @@
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>
+ 1=1
<if test="ew.productName != null and ew.productName !=''">
and p.product_name like concat('%',#{ew.productName},'%')
</if>
@@ -300,7 +342,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
@@ -313,7 +355,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