From 13afb7eafeffac6ecccc7c66d36974c54c5172d4 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 28 五月 2026 15:13:37 +0800
Subject: [PATCH] 库存管理增加库存类型，并返回相关数据显示
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index ed780a7..723541b 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -562,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,
@@ -587,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,
@@ -610,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
@@ -629,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,
@@ -652,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">
@@ -668,7 +682,9 @@
model,
unit,
product_name,
- product_id
+ product_id,
+ manufacturer_id,
+ manufacturer_name
order by
batch_no
</select>
--
Gitblit v1.9.3