From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个,则需要展示多个

---
 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 d92fecf..5d6657f 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -31,6 +31,9 @@
             <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
                 locked_quantity = locked_quantity + #{ew.lockedQuantity},
             </if>
+            <if test="ew.source != null and ew.source != ''">
+                source = #{ew.source},
+            </if>
             update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
@@ -223,7 +226,7 @@
         unit,
         product_name,
         product_id
-        order by combined.create_time desc
+        order by MAX(create_time) desc
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">

--
Gitblit v1.9.3