From 69adb2e7da8546bd2bbd43fbe5ad366cdbd17ef1 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 24 Jun 2026 16:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A6=85=E9=81=93bug#1721=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WebCadOrderImportAsyncFactory.java        | 19 ++++++++++++++++++-
 .../factory/WebCadOrderImportFactory.java     | 19 ++++++++++++++++++-
 2 files changed, 36 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 12355bb0a..7a855240e 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
@@ -1707,7 +1707,7 @@ public class WebCadOrderImportAsyncFactory {
                     .name(part.getName())
                     .material(getEmpty(material))
                     .model(getEmpty(model))
-                    .spec(getEmpty(spec))
+                    .spec(getPartsSpec(spec))
                     .brand(getEmpty(brand))
                     .factory(getEmpty(factory))
                     .unit(part.getUnit())
@@ -1734,6 +1734,23 @@ public class WebCadOrderImportAsyncFactory {
         }
     }
 
+    /**
+     * 获取配件规格，cad格式为a|b|c，只取第一段
+     *
+     * @param value
+     * @return
+     */
+    private String getPartsSpec(String value) {
+        value = StringUtils.defaultString(value);
+
+        int idx = value.indexOf('|');
+
+        return StringUtils.defaultIfEmpty(
+                idx >= 0 ? value.substring(0, idx) : value,
+                EMPTY_STRING
+        );
+    }
+
     /**
      * 保留三位小数展示
      *
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 dec448de7..a69e330fb 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
@@ -1894,7 +1894,7 @@ public class WebCadOrderImportFactory {
                     .name(part.getName())
                     .material(getEmpty(material))
                     .model(getEmpty(model))
-                    .spec(getEmpty(spec))
+                    .spec(getPartsSpec(spec))
                     .brand(getEmpty(brand))
                     .factory(getEmpty(factory))
                     .unit(part.getUnit())
@@ -1921,6 +1921,23 @@ public class WebCadOrderImportFactory {
         }
     }
 
+    /**
+     * 获取配件规格，cad格式为a|b|c，只取第一段
+     *
+     * @param value
+     * @return
+     */
+    private String getPartsSpec(String value) {
+        value = StringUtils.defaultString(value);
+
+        int idx = value.indexOf('|');
+
+        return StringUtils.defaultIfEmpty(
+                idx >= 0 ? value.substring(0, idx) : value,
+                EMPTY_STRING
+        );
+    }
+
     /**
      * 保留三位小数展示
      *