From 7782a7e1191a0e98ffb20bca8b59248e98c556a8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 24 四月 2026 14:38:13 +0800
Subject: [PATCH] feat(stock): 添加库存位置功能支持

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index a1f65b0..25fa872 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -12,6 +12,8 @@
         <result column="version" property="version"/>
         <result column="locked_quantity" property="lockedQuantity"/>
         <result column="warn_num" property="warnNum"/>
+        <result column="remark" property="remark"/>
+        <result column="stock_location" property="stockLocation"/>
     </resultMap>
     <update id="updateAddStockInventory">
         update stock_inventory
@@ -34,6 +36,7 @@
             update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
+          and stock_location = #{ew.stockLocation}
     </update>
     <update id="updateSubtractStockInventory">
         update stock_inventory
@@ -49,7 +52,9 @@
             </if>
             update_time = now()
         </set>
-        where product_model_id = #{ew.productModelId} and qualitity >= #{ew.qualitity}
+        where product_model_id = #{ew.productModelId}
+          and stock_location = #{ew.stockLocation}
+          and qualitity >= #{ew.qualitity}
     </update>
     <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
         select si.id,
@@ -63,6 +68,7 @@
         (si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
         pm.model,
         si.remark,
+        si.stock_location,
         pm.unit,
         p.product_name
         from stock_inventory si
@@ -75,6 +81,9 @@
         <if test="ew.productModelId != null">
             and pm.id = #{ew.productModelId}
         </if>
+        <if test="ew.stockLocation != null and ew.stockLocation != ''">
+            and si.stock_location = #{ew.stockLocation}
+        </if>
     </select>
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
         select si.qualitity,
@@ -84,6 +93,7 @@
         coalesce(si.warn_num, 0) as warn_num,
         coalesce(si.locked_quantity, 0) as locked_quantity,
         si.remark,
+        si.stock_location,
         si.update_time
         from stock_inventory si
         left join product_model pm on si.product_model_id = pm.id
@@ -91,6 +101,9 @@
         where 1 = 1
         <if test="ew.productName != null and ew.productName !=''">
             and p.product_name like concat('%',#{ew.productName},'%')
+        </if>
+        <if test="ew.stockLocation != null and ew.stockLocation != ''">
+            and si.stock_location = #{ew.stockLocation}
         </if>
     </select>
     <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
@@ -102,6 +115,7 @@
         from
         stock_in_record sir
         left join stock_inventory si on sir.product_model_id = si.product_model_id
+        and sir.stock_location = si.stock_location
         left join product_model pm on sir.product_model_id = pm.id
         left join product p on pm.product_id = p.id
         left join sys_user su on sir.create_user = su.user_id
@@ -116,6 +130,9 @@
             <if test="ew.endMonth != null">
                 and sir.create_time &lt;= #{ew.endMonth}
             </if>
+            <if test="ew.stockLocation != null and ew.stockLocation != ''">
+                and sir.stock_location = #{ew.stockLocation}
+            </if>
         </where>
     </select>
 

--
Gitblit v1.9.3