From 10b88a7ff17caf92f3d4e8a550c1085a70c2517a Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期四, 28 五月 2026 17:43:26 +0800
Subject: [PATCH] Merge dev_New_pro into dev_山西_晋和园_pro
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..0469a93 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,6 +222,7 @@
unit,
product_name,
product_id
+ order by combined.create_time desc
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -367,6 +368,7 @@
and sir.create_time <= #{ew.endMonth}
</if>
</where>
+ order by sir.id desc
</select>
<select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -506,7 +508,7 @@
where si.product_model_id in
<foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
#{productModelId}
- </foreach>c
+ </foreach>
and si.batch_no is not null
and si.batch_no != ''
and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
--
Gitblit v1.9.3