From 6f0df10fdd0e55e5ed3e31b1720efd25e2bf02fb Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 16 九月 2026 18:51:12 +0800
Subject: [PATCH] fix: 添加条件过滤以确保查询结果中合格数量大于零

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 428e8da..4f3fce4 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,
@@ -197,6 +197,7 @@
         left join product p on pm.product_id = p.id
         ) as combined
         <where>
+            combined.qualifiedQuantity <![CDATA[ > ]]> 0
             <if test="ew.productName != null and ew.productName !=''">
                 and combined.product_name in (
                 select distinct p.product_name
@@ -351,7 +352,7 @@
         su.nick_name as create_by
         from
         stock_in_record sir
-        left join stock_inventory si on sir.product_model_id = si.product_model_id
+        left join stock_inventory si on sir.batch_no = si.batch_no
         left join product_model pm on sir.product_model_id = pm.id
         left join product p on pm.product_id = p.id
         left join sys_user su on sir.create_user = su.user_id
@@ -367,6 +368,7 @@
                 and sir.create_time &lt;= #{ew.endMonth}
             </if>
         </where>
+        order by sir.create_time desc
     </select>
 
     <select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -512,8 +514,9 @@
           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 si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
+    <select id="getByModelId" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity,
+               p.product_name, pm.model, pm.unit
         from stock_inventory si
                  left join (
                     select spd.stock_inventory_id, sum(spd.quantity) as qualitity
@@ -530,6 +533,8 @@
                     )
                     group by spd.stock_inventory_id
                  ) as sd on sd.stock_inventory_id = si.id
+                 left join product_model pm on si.product_model_id = pm.id
+                 left join product p on pm.product_id = p.id
         where si.product_model_id = #{productModelId}
         and si.qualitity > IFNULL(sd.qualitity, 0)
     </select>

--
Gitblit v1.9.3