From 286581ef6495f7bb18135bb66affcb2f51488ecd Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 08 六月 2026 10:37:05 +0800
Subject: [PATCH] 修改采购台账审批

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 15d08b3..723541b 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -222,6 +222,7 @@
         unit,
         product_name,
         product_id
+        order by combined.create_time desc
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -367,6 +368,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 +508,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 +562,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 +591,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 +618,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 +638,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 +665,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 +682,9 @@
         model,
         unit,
         product_name,
-        product_id
+        product_id,
+        manufacturer_id,
+        manufacturer_name
         order by
         batch_no
     </select>

--
Gitblit v1.9.3