From be241f4251668ba0dd1d3d6d1176bc3bbe8d7ff6 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 15 六月 2026 14:00:45 +0800
Subject: [PATCH] 修改可入库数量的计算

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 6ca5bf7..23bd168 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -31,6 +31,9 @@
             <if test="ew.lockedQuantity != null and ew.lockedQuantity !=''">
                 locked_quantity = locked_quantity + #{ew.lockedQuantity},
             </if>
+            <if test="ew.source != null and ew.source != ''">
+                source = #{ew.source},
+            </if>
             update_time = now()
         </set>
         where product_model_id = #{ew.productModelId}
@@ -195,6 +198,7 @@
         from stock_uninventory su
         left join product_model pm on su.product_model_id = pm.id
         left join product p on pm.product_id = p.id
+        where COALESCE(su.type, 'unqualified') != 'waste'
         ) as combined
         <where>
             <if test="ew.productName != null and ew.productName !=''">
@@ -222,6 +226,7 @@
         unit,
         product_name,
         product_id
+        order by combined.create_time desc
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -327,6 +332,7 @@
             from stock_uninventory su
             left join product_model pm on su.product_model_id = pm.id
             left join product p on pm.product_id = p.id
+            where COALESCE(su.type, 'unqualified') != 'waste'
         ) as combined
         <where>
             <if test="ew.productName != null and ew.productName !=''">
@@ -367,6 +373,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">
@@ -560,6 +567,10 @@
         unit,
         product_name,
         product_id,
+        MAX(manufacturer_id) as manufacturer_id,
+        MAX(manufacturer_name) as manufacturerName,
+        MAX(qualifiedSource) as qualifiedSource,
+        MAX(unQualifiedSource) as unQualifiedSource,
 
         MAX(create_time) as create_time,
         MAX(update_time) as update_time,
@@ -585,6 +596,10 @@
         pm.unit,
         p.product_name,
         p.id as product_id,
+        si.manufacturer_id,
+        m.name as manufacturer_name,
+        si.source as qualifiedSource,
+        null as unQualifiedSource,
 
         si.create_time,
         si.update_time,
@@ -608,6 +623,7 @@
         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
+        left join manufacturer m on si.manufacturer_id = m.id
 
         union all
 
@@ -627,6 +643,10 @@
         pm.unit,
         p.product_name,
         p.id as product_id,
+        su.manufacturer_id,
+        m.name as manufacturer_name,
+        null as qualifiedSource,
+        su.source as unQualifiedSource,
 
         su.create_time,
         su.update_time,
@@ -650,6 +670,7 @@
         from stock_uninventory su
         left join product_model pm on su.product_model_id = pm.id
         left join product p on pm.product_id = p.id
+        left join manufacturer m on su.manufacturer_id = m.id
         ) as combined
         <where>
             <if test="ew.productModelId != null and ew.productModelId > 0">
@@ -666,7 +687,9 @@
         model,
         unit,
         product_name,
-        product_id
+        product_id,
+        manufacturer_id,
+        manufacturer_name
         order by
         batch_no
     </select>

--
Gitblit v1.9.3