From c7cf4606c748e3ef2a4df1811b60e0ef000ff9e8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 24 四月 2026 13:43:45 +0800
Subject: [PATCH] fix: 库存导入导出缺失厚度
---
src/main/resources/mapper/stock/StockInventoryMapper.xml | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 6428e9c..b3b3767 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -107,6 +107,7 @@
MAX(warn_num) as warn_num,
MAX(version) as version,
model,
+ thickness,
MAX(remark) as remark,
unit,
product_name,
@@ -128,6 +129,7 @@
si.version,
(si.qualitity - COALESCE(si.locked_quantity, 0)) as un_locked_quantity,
pm.model,
+ pm.thickness,
si.remark,
pm.unit,
p.product_name,
@@ -153,6 +155,7 @@
su.version,
(su.qualitity - COALESCE(su.locked_quantity, 0)) as un_locked_quantity,
pm.model,
+ pm.thickness,
su.remark,
pm.unit,
p.product_name,
@@ -172,7 +175,7 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by product_model_id, model, unit, product_name, product_id
+ group by product_model_id, model, thickness, unit, product_name, product_id
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockInventoryExportData">
WITH RECURSIVE product_tree AS (
@@ -192,6 +195,7 @@
SUM(qualifiedLockedQuantity) as qualifiedLockedQuantity,
SUM(unQualifiedLockedQuantity) as unQualifiedLockedQuantity,
model,
+ thickness,
unit,
product_name,
MAX(warn_num) as warn_num,
@@ -209,6 +213,7 @@
COALESCE(si.warn_num, 0) as warn_num,
si.remark,
pm.model,
+ pm.thickness,
pm.unit,
p.product_name,
p.id as product_id
@@ -229,6 +234,7 @@
0 as warn_num,
su.remark,
pm.model,
+ pm.thickness,
pm.unit,
p.product_name,
p.id as product_id
@@ -247,8 +253,9 @@
and combined.product_id in (select id from product_tree)
</if>
</where>
- group by product_model_id, model, unit, product_name
+ group by product_model_id, model, thickness, unit, product_name
</select>
+
<select id="stockInventoryPage" resultType="com.ruoyi.stock.dto.StockInRecordDto">
select sir.*,si.qualitity as current_stock,
pm.model,
--
Gitblit v1.9.3