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/StockOutRecordMapper.xml | 1 +
src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java | 5 +++++
src/main/resources/mapper/stock/StockInventoryMapper.xml | 6 +++++-
src/main/resources/mapper/stock/StockUninventoryMapper.xml | 1 +
src/main/resources/mapper/stock/StockInRecordMapper.xml | 1 +
src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java | 5 +++++
6 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
index d705110..0324203 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockInRecordExportData.java
@@ -5,6 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@@ -16,6 +17,10 @@
private String productName;
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+
+ @Excel(name = "鍘氬害(mm)")
+ private BigDecimal thickness;
+
@Excel(name = "鍗曚綅")
private String unit;
@Excel(name = "鍏ュ簱鏉ユ簮")
diff --git a/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java b/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java
index f120817..0191da7 100644
--- a/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java
+++ b/src/main/java/com/ruoyi/stock/execl/StockOutRecordExportData.java
@@ -5,6 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@@ -15,6 +16,10 @@
private String productName;
@Excel(name = "瑙勬牸鍨嬪彿")
private String model;
+
+ @Excel(name = "鍘氬害(mm)")
+ private BigDecimal thickness;
+
@Excel(name = "鍗曚綅")
private String unit;
@Excel(name = "鍑哄簱鏉ユ簮")
diff --git a/src/main/resources/mapper/stock/StockInRecordMapper.xml b/src/main/resources/mapper/stock/StockInRecordMapper.xml
index f9c2b44..c9ada77 100644
--- a/src/main/resources/mapper/stock/StockInRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockInRecordMapper.xml
@@ -55,6 +55,7 @@
sir.*,
p.product_name as product_name,
pm.model,
+ pm.thickness,
pm.unit,
u.nick_name as createBy,
CASE
diff --git a/src/main/resources/mapper/stock/StockInventoryMapper.xml b/src/main/resources/mapper/stock/StockInventoryMapper.xml
index 3fd669c..b3b3767 100644
--- a/src/main/resources/mapper/stock/StockInventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockInventoryMapper.xml
@@ -195,6 +195,7 @@
SUM(qualifiedLockedQuantity) as qualifiedLockedQuantity,
SUM(unQualifiedLockedQuantity) as unQualifiedLockedQuantity,
model,
+ thickness,
unit,
product_name,
MAX(warn_num) as warn_num,
@@ -212,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
@@ -232,6 +234,7 @@
0 as warn_num,
su.remark,
pm.model,
+ pm.thickness,
pm.unit,
p.product_name,
p.id as product_id
@@ -250,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,
diff --git a/src/main/resources/mapper/stock/StockOutRecordMapper.xml b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
index 3e72c71..e5fc445 100644
--- a/src/main/resources/mapper/stock/StockOutRecordMapper.xml
+++ b/src/main/resources/mapper/stock/StockOutRecordMapper.xml
@@ -65,6 +65,7 @@
SELECT
sor.*,
p.product_name as productName,
+ pm.thickness,
pm.model,
pm.unit,
u.nick_name as createBy,
diff --git a/src/main/resources/mapper/stock/StockUninventoryMapper.xml b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
index 8f2a215..bb8182a 100644
--- a/src/main/resources/mapper/stock/StockUninventoryMapper.xml
+++ b/src/main/resources/mapper/stock/StockUninventoryMapper.xml
@@ -74,6 +74,7 @@
</select>
<select id="listStockInventoryExportData" resultType="com.ruoyi.stock.execl.StockUnInventoryExportData">
select su.*,
+ pm.thickness,
pm.model,
pm.unit,
p.product_name
--
Gitblit v1.9.3