From 522b9cd4cd7f38f88fe77cb9b9f2c5f7197eed29 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 03 四月 2026 10:06:09 +0800
Subject: [PATCH] 增加领用记录列表接口，维修后生成领用记录

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 4427ee6..b99a589 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -42,8 +42,8 @@
     <update id="updateSubtractStockInventory">
         update stock_inventory
         <set>
-            <if test="ew.netWeight != null">
-                qualitity = qualitity - #{ew.netWeight},
+            <if test="ew.qualitity != null">
+                qualitity = qualitity - #{ew.qualitity},
             </if>
             <if test="ew.version != null">
                 version = version + 1,
@@ -57,11 +57,10 @@
     </update>
 
     <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        SELECT * FROM (
         SELECT
         si.id,
-        -- 褰撳墠鍑�閲� = 鍏ュ簱鍑�閲� - 鍑哄簱鍑�閲�
-        (COALESCE(sir.total_net_weight, 0) - COALESCE(sor.total_net_weight, 0)) AS net_weight,
-        si.qualitity,
+        si.qualitity as qualitity,
         COALESCE(si.locked_quantity, 0) AS locked_quantity,
         si.product_model_id,
         si.create_time,
@@ -91,13 +90,19 @@
         GROUP BY product_model_id
         ) sor ON si.product_model_id = sor.product_model_id
         <where>
+            1=1
             <if test="ew.parentId != null and ew.parentId != ''">
                 AND p.parent_id = #{ew.parentId}
             </if>
             <if test="ew.productName != null and ew.productName != ''">
                 AND p.product_name LIKE CONCAT('%', #{ew.productName}, '%')
             </if>
+            <if test="ew.model != null and ew.model != ''">
+                AND pm.model LIKE CONCAT('%', #{ew.model}, '%')
+            </if>
         </where>
+        ) temp
+        WHERE qualitity != 0
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -177,6 +182,7 @@
         on sir.product_model_id = outWeight.product_model_id
 
         <where>
+            1=1
             <if test="ew.reportDate != null">
                 and sir.create_time >= #{ew.reportDate}
                 and sir.create_time &lt; DATE_ADD(#{ew.reportDate}, INTERVAL 1 DAY)

--
Gitblit v1.9.3