From 230b18eee69285b5ccefdd853ed1072d0d3e7e16 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Fri, 26 Jun 2026 11:00:14 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E6=9D=90?=
 =?UTF-8?q?=E6=96=99=E5=8D=B7=E5=8E=9A=E5=BA=A6=E5=B7=AE=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在WmsMaterialCoilAllExportVo中新增厚度差字段
- 在导出列配置中添加厚度差映射
- 实现厚度差计算逻辑：理论厚度减去实际厚度
- 添加数字格式异常处理避免程序崩溃
- 支持厚度差数据的Excel导出功能
---
 .../com/klp/controller/WmsMaterialCoilController.java |  1 +
 .../com/klp/domain/vo/WmsMaterialCoilAllExportVo.java |  3 +++
 .../klp/service/impl/WmsMaterialCoilServiceImpl.java  | 11 +++++++++++
 3 files changed, 15 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
index 985f9e703..21f811fe2 100644
--- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
+++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
@@ -211,6 +211,7 @@ public class WmsMaterialCoilController extends BaseController {
         columns.put("theoreticalLength", "理论长度");
         columns.put("rawMaterialThickness", "原料厚度");
         columns.put("chromePlateCoilNo", "镀铬卷号");
+        columns.put("thicknessDifference", "厚度差");
         return R.ok(columns);
     }
 
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
index 228f75a0e..cc526a6ea 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilAllExportVo.java
@@ -245,4 +245,7 @@ public class WmsMaterialCoilAllExportVo {
 
     @ExcelProperty(value = "实测宽度")
     private String actualWidth;
+
+    @ExcelProperty(value = "厚度差")
+    private String thicknessDifference;
 }
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
index 962a57abb..889859d97 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
@@ -3807,6 +3807,17 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
                     String isRelatedText = vo.getIsRelatedToOrder() == 0 ? "否" : "是";
                     vo.setIsRelatedToOrderText(isRelatedText);
                 }
+
+                // 计算厚度差：理论厚度 - 实际厚度
+                if (vo.getTheoreticalThickness() != null && vo.getActualThickness() != null) {
+                    try {
+                        BigDecimal theory = new BigDecimal(vo.getTheoreticalThickness());
+                        BigDecimal actual = new BigDecimal(vo.getActualThickness());
+                        vo.setThicknessDifference(theory.subtract(actual).toString());
+                    } catch (NumberFormatException ignored) {
+                        // 解析失败则留空
+                    }
+                }
             }
         }