From 441dfbd1908affc1accc52006a2fe81a5067052d Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 22 六月 2026 09:28:09 +0800
Subject: [PATCH] 废品库存的批号如果有多个，则需要展示多个
---
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 1d3f3e9..0af20f6 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -150,7 +150,22 @@
<select id="pageWasteQuery" resultType="com.ruoyi.stock.dto.StockUninventoryDto">
<include refid="WasteQueryRecursiveTree" />
select
- <include refid="WastePageColumns" />
+ max(su.id) as id,
+ sum(su.qualitity) as qualitity,
+ su.type,
+ sum(COALESCE(su.locked_quantity, 0)) as locked_quantity,
+ su.product_model_id,
+ p.id as product_id,
+ GROUP_CONCAT(DISTINCT su.batch_no ORDER BY su.batch_no SEPARATOR ',') as batch_no,
+ min(su.create_time) as create_time,
+ max(su.update_time) as update_time,
+ max(su.version) as version,
+ (sum(su.qualitity) - sum(COALESCE(su.locked_quantity, 0))) as un_locked_quantity,
+ pm.model,
+ pm.unit,
+ p.product_name,
+ m.name as manufacturer_name,
+ su.source
<include refid="BaseWasteFromClause" />
<where>
and su.type = 'waste'
@@ -167,8 +182,8 @@
and p.id in (select id from product_tree)
</if>
</where>
-
- order by su.update_time desc, su.id desc
+ group by su.product_model_id
+ order by max(su.update_time) desc, su.product_model_id desc
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
@@ -192,12 +207,18 @@
<select id="listWasteQueryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
<include refid="WasteQueryRecursiveTree" />
select
- su.*,
pm.model,
pm.unit,
p.product_name,
m.name as manufacturer_name,
- (su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity
+ su.source,
+ su.type,
+ GROUP_CONCAT(DISTINCT su.batch_no ORDER BY su.batch_no SEPARATOR ',') as batch_no,
+ sum(su.qualitity) as qualitity,
+ sum(COALESCE(su.locked_quantity, 0)) as locked_quantity,
+ (sum(su.qualitity) - sum(COALESCE(su.locked_quantity, 0))) as un_locked_quantity,
+ GROUP_CONCAT(DISTINCT su.remark ORDER BY su.batch_no SEPARATOR '锛�') as remark,
+ max(su.update_time) as update_time
<include refid="BaseWasteFromClause" />
<where>
and su.type = 'waste'
@@ -214,7 +235,8 @@
and p.id in (select id from product_tree)
</if>
</where>
- order by su.update_time desc, su.id desc
+ group by su.product_model_id, su.type, pm.model, pm.unit, p.id, p.product_name, m.name, su.source
+ order by max(su.update_time) desc, su.product_model_id desc
</select>
<select id="getWasteBatchNoQty" resultType="com.ruoyi.stock.dto.StockUninventoryDto">
--
Gitblit v1.9.3