From 74a380329082eafc0c41943224e89bbb217a74ed Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 9 Jun 2026 09:41:14 +0800
Subject: [PATCH] =?UTF-8?q?refactor(WmsMaterialCoilService):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=90=86=E8=AE=BA=E5=8E=9A=E5=BA=A6=E5=92=8C=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E6=B2=BF=E7=94=A8=E8=80=81=E6=95=B0=E6=8D=AE=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=87=8D=E5=A4=8D=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 移除理论厚度为空的条件判断，统一实际长度不为空时进行计算
- 移除理论长度为空的条件判断，改为直接计算并设置理论长度
- 保持原有的体积、宽度和厚度计算公式不变
- 简化代码结构，减少不必要的条件分支
---
 .../com/klp/service/impl/WmsMaterialCoilServiceImpl.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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 e01000d7..1387e8fb 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
@@ -1119,17 +1119,15 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
 
             bo.setSpecThickness(thickness);
             // 计算理论厚度（需要实测长度）
-            if (bo.getTheoreticalThickness() == null && bo.getActualLength() != null) {
+            if (bo.getActualLength() != null) {
                 BigDecimal length = new BigDecimal(bo.getActualLength());
                 BigDecimal theoreticalThickness = volume.divide(length, 10, RoundingMode.HALF_UP).divide(width, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("1000"));
                 bo.setTheoreticalThickness(theoreticalThickness);
             }
 
             // 计算理论长度
-            if (bo.getTheoreticalLength() == null) {
-                BigDecimal theoreticalLength = volume.divide(thickness, 10, RoundingMode.HALF_UP).divide(width, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("1000"));
-                bo.setTheoreticalLength(theoreticalLength);
-            }
+            BigDecimal theoreticalLength = volume.divide(thickness, 10, RoundingMode.HALF_UP).divide(width, 10, RoundingMode.HALF_UP).multiply(new BigDecimal("1000"));
+            bo.setTheoreticalLength(theoreticalLength);
         } catch (Exception e) {
             log.warn("计算理论厚度/长度失败", e);
         }