From 1fd7a7d67a5df84b57af4fbcc310aa66da3cd8ca Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 25 三月 2026 17:51:16 +0800
Subject: [PATCH] feat:1.出入库单位转换 2.仓储/耗材导出字段值优化 3.仓储/耗材库存为0不展示
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 124 ++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 39 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 8704a51..8842aa2 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -42,8 +42,8 @@
<update id="updateSubtractStockInventory">
update stock_inventory
<set>
- <if test="ew.netWeight != null">
- qualitity = qualitity - #{ew.netWeight},
+ <if test="ew.qualitity != null">
+ qualitity = qualitity - #{ew.qualitity},
</if>
<if test="ew.version != null">
version = version + 1,
@@ -57,59 +57,55 @@
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
- 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,
+ 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 stock_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
- product_model_id,
- sum(net_weight) as total_net_weight
- from stock_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 stock_out_record
- group by product_model_id
- ) sor on si.product_model_id = sor.product_model_id
-
+ p1.product_name AS parent_name,
+ p1.id AS parent_id,
+ si.product_id AS productId
+ FROM stock_inventory si
+ INNER JOIN product_model pm ON si.product_model_id = pm.id
+ INNER JOIN product p ON pm.product_id = p.id
+ INNER JOIN product p1 ON p.parent_id = p1.id AND p1.product_name != '鍗婃垚鍝�'
+ LEFT JOIN (
+ SELECT product_model_id, SUM(net_weight) AS total_net_weight
+ FROM stock_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 stock_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>
</where>
+ ) temp
+ WHERE qualitity != 0
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
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 +116,16 @@
from stock_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 stock_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 stock_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},'%')
@@ -173,6 +179,7 @@
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)
@@ -193,7 +200,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,
@@ -241,6 +249,42 @@
</where>
GROUP BY product_model_id
) combined_data
+
+ -- 宸﹁繛鎺ュ叆搴撳噣閲嶅悎璁�
+ LEFT JOIN (
+ SELECT
+ product_model_id,
+ SUM(net_weight) AS total_net_weight
+ FROM stock_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 stock_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>
@@ -254,7 +298,9 @@
GROUP BY
pm.model,
pm.unit,
- p.product_name
+ p.product_name,
+ in_weight.total_net_weight,
+ out_weight.total_net_weight
</select>
<select id="selectTotal" resultType="java.math.BigDecimal">
select ifnull(sum(qualitity), 0)
--
Gitblit v1.9.3