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 | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 06a42c4..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,9 +57,9 @@
</update>
<select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+ SELECT * FROM (
SELECT
si.id,
- -- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
(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,
@@ -90,6 +90,7 @@
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>
@@ -97,6 +98,8 @@
AND p.product_name LIKE CONCAT('%', #{ew.productName}, '%')
</if>
</where>
+ ) temp
+ WHERE qualitity != 0
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -176,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)
--
Gitblit v1.9.3