From a0878378fc2fbf212fc86dc5af4fd7f17814b59a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期日, 20 九月 2026 04:09:59 +0800
Subject: [PATCH] fix: bug+bug=work
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..2681163 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -222,6 +222,7 @@
unit,
product_name,
product_id
+ order by MAX(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
@@ -535,6 +537,7 @@
left join product p on pm.product_id = p.id
where si.product_model_id = #{productModelId}
and si.qualitity > IFNULL(sd.qualitity, 0)
+ order by si.create_time asc
</select>
<select id="getBatchNoQty" resultType="com.ruoyi.stock.dto.StockInventoryDto">
--
Gitblit v1.9.3