From a77decc3df26449414639082293e2ee6722e643c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 06 五月 2026 15:30:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

---
 src/main/resources/mapper/stock/StockInventoryMapper.xml |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index d1eecb5..60fc90e 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -452,5 +452,13 @@
           and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
         order by si.product_model_id, si.batch_no
     </select>
+    <select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
+        select spd.id, spd.batch_no, spd.locked_quantity, (spd.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
+        from stock_inventory spd
+                 left join (select stock_inventory_id, sum(quantity) as qualitity
+                            from shipping_product_detail
+                            group by stock_inventory_id) as sd on sd.stock_inventory_id = spd.id
+        where product_model_id = #{productModelId}
+    </select>
 
 </mapper>

--
Gitblit v1.9.3