From 7706e5b97ebbdd767a237d5a79d18da6e1269a1d Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期五, 23 一月 2026 16:13:31 +0800
Subject: [PATCH] feat(stock): 添加库存出入库记录导出功能

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 52a855a..1f729f2 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -16,24 +16,32 @@
     <update id="updateAddStockInventory">
         update stock_inventory
         <set>
-            <if test="qualitity != null">
+            <if test="ew.qualitity != null">
                 qualitity = qualitity + #{ew.qualitity},
             </if>
-           <if test="version != null">
+           <if test="ew.version != null">
                version = version + 1,
             </if>
+            <if test="ew.remark != null and ew.remark !=''">
+                remark = #{ew.remark},
+            </if>
+            update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
     </update>
     <update id="updateSubtractStockInventory">
         update stock_inventory
         <set>
-            <if test="qualitity != null">
+            <if test="ew.qualitity != null">
                 qualitity = qualitity - #{ew.qualitity},
             </if>
-            <if test="version != null">
+            <if test="ew.version != null">
                 version = version + 1,
             </if>
+            <if test="ew.remark != null and ew.remark !=''">
+                remark = #{ew.remark},
+            </if>
+            update_time = now()
         </set>
         where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
     </update>
@@ -46,6 +54,24 @@
                  left join product_model pm on si.product_model_id = pm.id
                  left join product p on pm.product_id = p.id
         where 1 = 1
+        <if test="ew.productName != null and ew.productName !=''">
+            and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+    </select>
+    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
+        select si.qualitity,
+        pm.model,
+        pm.unit,
+        p.product_name,
+        si.remark,
+        si.update_time
+        from stock_inventory si
+        left join product_model pm on si.product_model_id = pm.id
+        left join product p on pm.product_id = p.id
+        where 1 = 1
+        <if test="ew.productName != null and ew.productName !=''">
+            and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
     </select>
 
 </mapper>

--
Gitblit v1.9.3