From 47806d9e390ee00e1d29ad1da8c1aa908882a758 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 11 八月 2026 14:43:59 +0800
Subject: [PATCH] 用河南鹤壁代码覆盖山西长治
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index ac9c49b..7322898 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -113,7 +113,7 @@
product_model_id,
MAX(create_time) as create_time,
MAX(update_time) as update_time,
- MAX(warn_num) as warn_num,
+ SUM(warn_num) as warn_num,
MAX(version) as version,
model,
MAX(remark) as remark,
@@ -222,7 +222,6 @@
unit,
product_name,
product_id
- order by combined.create_time desc
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -352,11 +351,7 @@
su.nick_name as create_by
from
stock_in_record sir
- left join (
- select product_model_id, sum(qualitity) as qualitity
- from stock_inventory
- group by product_model_id
- ) si on sir.product_model_id = si.product_model_id
+ left join stock_inventory si on sir.batch_no = si.batch_no
left join product_model pm on sir.product_model_id = pm.id
left join product p on pm.product_id = p.id
left join sys_user su on sir.create_user = su.user_id
@@ -372,7 +367,7 @@
and sir.create_time <= #{ew.endMonth}
</if>
</where>
- order by sir.id desc
+ order by sir.create_time desc
</select>
<select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
--
Gitblit v1.9.3