From 0200b4092214d065adea7c7b9fef0c04b31be255 Mon Sep 17 00:00:00 2001
From: zhang_nuo <zhang_12370@163.com>
Date: 星期二, 22 九月 2026 02:10:18 +0800
Subject: [PATCH] fix(sales&stock): 修复销售台账与库存查询的多处业务问题
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 45bfd21..12d4e47 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -344,11 +344,12 @@
group by batch_no, product_model_id, model, unit, product_name, product_id
</select>
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
- select sir.*,si.qualitity as current_stock,
- pm.model,
- pm.unit,
- p.product_name,
- su.nick_name as create_by
+ select sir.*,
+ ROUND(COALESCE(si.qualitity, 0), 6) as current_stock,
+ pm.model,
+ pm.unit,
+ p.product_name,
+ su.nick_name as create_by
from
stock_in_record sir
left join stock_inventory si on sir.batch_no = si.batch_no
@@ -375,9 +376,9 @@
pm.model,
pm.unit,
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
+ ROUND(MAX(current_inventory), 6) as current_stock,
+ ROUND(SUM(CASE WHEN record_type = 'in' THEN amount ELSE 0 END), 6) as total_stock_in,
+ ROUND(SUM(CASE WHEN record_type = 'out' THEN amount ELSE 0 END), 6) as total_stock_out
FROM (
SELECT
product_model_id,
--
Gitblit v1.9.3