From 189fe18f9aaabc39cc4bb4cc00f531bc43fe152e Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期二, 09 六月 2026 16:20:30 +0800
Subject: [PATCH] 新增台账时增加库存类型

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

diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 4820533..d92fecf 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -195,6 +195,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 !=''">
@@ -209,6 +210,12 @@
             <if test="ew.topParentProductId != null and ew.topParentProductId > 0">
                 and combined.product_id in (select id from product_tree)
             </if>
+            <if test="ew.model != null and ew.model !=''">
+                and combined.model like concat('%',#{ew.model},'%')
+            </if>
+            <if test="ew.batchNo != null and ew.batchNo !=''">
+                and combined.batch_no like concat('%',#{ew.batchNo},'%')
+            </if>
         </where>
         group by
         product_model_id,
@@ -216,6 +223,7 @@
         unit,
         product_name,
         product_id
+        order by combined.create_time desc
     </select>
 
     <select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
@@ -321,6 +329,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 !=''">
@@ -361,6 +370,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,8 +516,9 @@
           and (si.qualitity - ifnull(si.locked_quantity, 0)) > 0
         order by si.product_model_id, si.batch_no
     </select>
-    <select id="getByModelId" resultType="com.ruoyi.stock.pojo.StockInventory">
-        select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity
+    <select id="getByModelId" resultType="com.ruoyi.stock.dto.StockInventoryDto">
+        select si.id, si.batch_no, si.locked_quantity, (si.qualitity - IFNULL(sd.qualitity, 0)) as qualitity,
+               p.product_name, pm.model, pm.unit
         from stock_inventory si
                  left join (
                     select spd.stock_inventory_id, sum(spd.quantity) as qualitity
@@ -524,7 +535,10 @@
                     )
                     group by spd.stock_inventory_id
                  ) as sd on sd.stock_inventory_id = si.id
+                 left join product_model pm on si.product_model_id = pm.id
+                 left join product p on pm.product_id = p.id
         where si.product_model_id = #{productModelId}
+        and si.qualitity > IFNULL(sd.qualitity, 0)
     </select>
 
     <select id="getBatchNoQty" resultType="com.ruoyi.stock.dto.StockInventoryDto">
@@ -550,6 +564,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,
@@ -575,6 +593,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,
@@ -598,6 +620,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
 
@@ -617,6 +640,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,
@@ -640,6 +667,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">
@@ -656,7 +684,9 @@
         model,
         unit,
         product_name,
-        product_id
+        product_id,
+        manufacturer_id,
+        manufacturer_name
         order by
         batch_no
     </select>

--
Gitblit v1.9.3