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 |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 4820533..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,
@@ -208,6 +208,12 @@
             </if>
             <if test="ew.topParentProductId != null and ew.topParentProductId > 0">
                 and combined.product_id in (select id from product_tree)
+            </if>
+            <if test="ew.model != null and ew.model !=''">
+                and combined.model like concat('%',#{ew.model},'%')
+            </if>
+            <if test="ew.batchNo != null and ew.batchNo !=''">
+                and combined.batch_no like concat('%',#{ew.batchNo},'%')
             </if>
         </where>
         group by
@@ -337,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,
@@ -350,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,8 +517,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
@@ -524,7 +536,10 @@
                     )
                     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>
 
     <select id="getBatchNoQty" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -657,6 +672,7 @@
         unit,
         product_name,
         product_id
+        having SUM(qualifiedQuantity) >= 0
         order by
         batch_no
     </select>

--
Gitblit v1.9.3