From b22ebe8fad1691b35adcf321fe2e136795b3f81d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 29 六月 2026 17:58:00 +0800
Subject: [PATCH] 库位

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..63cc1d6 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -31,6 +31,12 @@
             <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
                 locked_quantity = locked_quantity + #{ew.lockedQuantity},
             </if>
+            <if test="ew.warehouse != null and ew.warehouse !=''">
+                warehouse = #{ew.warehouse},
+            </if>
+            <if test="ew.warehouse == null or ew.warehouse ==''">
+                warehouse = null,
+            </if>
             update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
@@ -65,6 +71,7 @@
     </update>
     <select id="pagestockInventory" resultType="com.ruoyi.stock.dto.StockInventoryDto">
         select si.id,
+        si.warehouse,
         si.qualitity,
         COALESCE(si.locked_quantity, 0) as locked_quantity,
         si.product_model_id,
@@ -120,6 +127,7 @@
         unit,
         product_name,
         product_id,
+        MAX(warehouse) as warehouse,
         'combined' as stockType
         from (
         select
@@ -142,6 +150,7 @@
         pm.unit,
         p.product_name,
         p.id as product_id,
+        si.warehouse,
         (
         select IFNULL(SUM(sor.stock_out_num), 0)
         from stock_out_record sor
@@ -180,6 +189,7 @@
         pm.unit,
         p.product_name,
         p.id as product_id,
+        su.warehouse,
         0 as qualifiedPendingOut,
         (
         select IFNULL(SUM(sor.stock_out_num), 0)
@@ -221,7 +231,9 @@
         model,
         unit,
         product_name,
-        product_id
+        product_id,
+        warehouse
+        order by create_time desc
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -258,6 +270,7 @@
             unit,
             product_name,
             product_id,
+            MAX(warehouse) as warehouse,
             'combined' as stockType
         from (
             select
@@ -280,6 +293,7 @@
             pm.unit,
             p.product_name,
             p.id as product_id,
+            si.warehouse,
             (
                 select IFNULL(SUM(sor.stock_out_num), 0)
                 from stock_out_record sor
@@ -315,6 +329,7 @@
             pm.unit,
             p.product_name,
             p.id as product_id,
+            su.warehouse,
             0 as qualifiedPendingOut,
             (
                 select IFNULL(SUM(sor.stock_out_num), 0)
@@ -341,7 +356,7 @@
                 and combined.product_id in (select id from product_tree)
             </if>
         </where>
-        group by batch_no, product_model_id, model, unit, product_name, product_id
+        group by batch_no, product_model_id, model, unit, product_name, product_id, warehouse
     </select>
     <select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
         select sir.*,si.qualitity as current_stock,
@@ -367,6 +382,7 @@
                 and sir.create_time &lt;= #{ew.endMonth}
             </if>
         </where>
+        order by sir.id desc
     </select>
 
     <select id="stockInAndOutRecord" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -506,7 +522,7 @@
         where si.product_model_id in
         <foreach collection="productModelIds" item="productModelId" open="(" separator="," close=")">
             #{productModelId}
-        </foreach>c
+        </foreach>
           and si.batch_no is not null
           and si.batch_no != ''
           and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
@@ -560,6 +576,7 @@
         unit,
         product_name,
         product_id,
+        MAX(warehouse) as warehouse,
 
         MAX(create_time) as create_time,
         MAX(update_time) as update_time,
@@ -591,6 +608,7 @@
         COALESCE(si.warn_num, 0) as warn_num,
         si.version,
         si.remark,
+        si.warehouse,
 
         (
         select IFNULL(SUM(sor.stock_out_num), 0)
@@ -633,6 +651,7 @@
         0 as warn_num,
         su.version,
         su.remark,
+        su.warehouse,
 
         0 as qualifiedPendingOut,
 
@@ -666,7 +685,8 @@
         model,
         unit,
         product_name,
-        product_id
+        product_id,
+        warehouse
         order by
         batch_no
     </select>

--
Gitblit v1.9.3