From be241f4251668ba0dd1d3d6d1176bc3bbe8d7ff6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 14:00:45 +0800
Subject: [PATCH] 修改可入库数量的计算

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 723541b..23bd168 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}
@@ -195,6 +198,7 @@
         from stock_uninventory su
         left join product_model pm on su.product_model_id = pm.id
         left join product p on pm.product_id = p.id
+        where COALESCE(su.type, 'unqualified') != 'waste'
         ) as combined
         <where>
             <if test="ew.productName != null and ew.productName !=''">
@@ -328,6 +332,7 @@
             from stock_uninventory su
             left join product_model pm on su.product_model_id = pm.id
             left join product p on pm.product_id = p.id
+            where COALESCE(su.type, 'unqualified') != 'waste'
         ) as combined
         <where>
             <if test="ew.productName != null and ew.productName !=''">

--
Gitblit v1.9.3