From 380da75880edf6746682fe79d330b618b1ca69b8 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期六, 25 四月 2026 14:22:53 +0800
Subject: [PATCH] 增加文件相关接口

---
 src/main/resources/mapper/stock/StockUninventoryMapper.xml |   21 +++++++++++++++++++--
 1 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 6c5d3be..70943e7 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -25,13 +25,24 @@
             </if>
             update_time = now()
         </set>
-        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
+        where
+        product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
+        <if test="ew.batchNo == null">
+            and batch_no is null
+        </if>
+        <if test="ew.batchNo != null">
+            and batch_no = #{ew.batchNo}
+        </if>
+
     </update>
     <update id="updateAddStockUnInventory">
         update stock_uninventory
         <set>
             <if test="ew.qualitity != null">
                 qualitity = qualitity + #{ew.qualitity},
+            </if>
+            <if test="ew.lockedQuantity != null">
+                locked_quantity = locked_quantity + #{ew.lockedQuantity},
             </if>
             <if test="ew.version != null">
                 version = version + 1,
@@ -42,6 +53,12 @@
             update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
+        <if test="ew.batchNo == null">
+            and batch_no is null
+        </if>
+        <if test="ew.batchNo != null">
+            and batch_no = #{ew.batchNo}
+        </if>
     </update>
     <select id="pageStockUninventory" resultType="com.ruoyi.stock.dto.StockUninventoryDto">
         select su.id,
@@ -64,7 +81,7 @@
             and p.product_name like concat('%',#{ew.productName},'%')
         </if>
     </select>
-    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
+    <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
         select su.*,
         pm.model,
         pm.unit,

--
Gitblit v1.9.3