From ad65726388fc99ff95db91b4a8a716362cccedd7 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期一, 25 五月 2026 04:32:19 +0800
Subject: [PATCH] feat: 操纵添加LOG注解记录日志

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..1c7428e 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,
@@ -343,8 +343,9 @@
         </where>
         group by batch_no, product_model_id, model, unit, product_name, product_id
     </select>
+
     <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
-        select sir.*,si.qualitity as current_stock,
+        select sir.*, si.qualitity as current_stock,
         pm.model,
         pm.unit,
         p.product_name,
@@ -356,6 +357,10 @@
         left join product p on pm.product_id = p.id
         left join sys_user su on sir.create_user = su.user_id
         <where>
+            and si.qualitity &gt;= 0
+
+            and sir.stock_in_num &gt;= 0
+
             <if test="ew.reportDate != null">
                 and sir.create_time >= #{ew.reportDate}
                 and sir.create_time &lt; DATE_ADD(#{ew.reportDate}, INTERVAL 1 DAY)
@@ -506,7 +511,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
@@ -667,6 +672,7 @@
         unit,
         product_name,
         product_id
+        having SUM(qualifiedQuantity) >= 0
         order by
         batch_no
     </select>

--
Gitblit v1.9.3