From 60b269cf549b235e2ff97874104ff6ad8b5d0f67 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Thu, 2 Apr 2026 14:31:11 +0800
Subject: [PATCH] =?UTF-8?q?cad=E6=8B=86=E5=8D=95=E9=85=8D=E4=BB=B6?=
 =?UTF-8?q?=E6=B1=87=E6=80=BB=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=95=BF=E5=AE=BD?=
 =?UTF-8?q?=E9=AB=98=E5=8F=AA=E5=AF=B9=E6=AF=94=E5=B0=8F=E6=95=B0=E5=90=8E?=
 =?UTF-8?q?=E4=B8=89=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebCadOrderImportAsyncFactory.java        | 20 +++++++++++++++++-
 .../factory/WebCadOrderImportFactory.java     | 21 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
index 9efd8d1ee..e0d8e3ed9 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
@@ -75,6 +75,7 @@ import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.sql.PreparedStatement;
@@ -1719,7 +1720,7 @@ public class WebCadOrderImportAsyncFactory {
         String brand = part.getBrand();
 
         // 分类配件的键组合
-        String groupKey = composite + partType + factory + model + spec + height + width + thickness + unit + brand;
+        String groupKey = composite + partType + factory + model + spec + scale3(height) + scale3(width) + scale3(thickness) + unit + brand;
 
         Long orderPartId = orderPartMap.get(groupKey);
         if (ObjectUtil.isNull(orderPartId)) {
@@ -1783,6 +1784,23 @@ public class WebCadOrderImportAsyncFactory {
         }
     }
 
+    /**
+     * 保留三位小数展示
+     *
+     * @param value
+     * @return
+     */
+    private String scale3(String value) {
+        if (StringUtils.isNotEmpty(value)) return value;
+        try {
+            BigDecimal bd = new BigDecimal(value);
+            bd = bd.setScale(3, RoundingMode.HALF_UP);
+            return bd.toPlainString();
+        } catch (NumberFormatException e) {
+            // 不是数字就原样返回
+            return value;
+        }
+    }
 
     /**
      * 处理cad部件数据
diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
index 578bbf7c4..f79102ed2 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
@@ -66,6 +66,7 @@ import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 import org.springframework.jdbc.core.JdbcTemplate;
 
 import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
 import java.sql.Timestamp;
@@ -1648,7 +1649,7 @@ public class WebCadOrderImportFactory {
         String brand = part.getBrand();
 
         // 分类配件的键组合
-        String groupKey = composite + partType + factory + model + spec + height + width + thickness + unit + brand;
+        String groupKey = composite + partType + factory + model + spec + scale3(height) + scale3(width) + scale3(thickness) + unit + brand;
 
         Long orderPartId = orderPartMap.get(groupKey);
         if (ObjectUtil.isNull(orderPartId)) {
@@ -1712,6 +1713,24 @@ public class WebCadOrderImportFactory {
         }
     }
 
+    /**
+     * 保留三位小数展示
+     *
+     * @param value
+     * @return
+     */
+    private String scale3(String value) {
+        if (StringUtils.isNotEmpty(value)) return value;
+        try {
+            BigDecimal bd = new BigDecimal(value);
+            bd = bd.setScale(3, RoundingMode.HALF_UP);
+            return bd.toPlainString();
+        } catch (NumberFormatException e) {
+            // 不是数字就原样返回
+            return value;
+        }
+    }
+
     /**
      * 从规格中获取属性，例：material、color
      *