From 4087c2162aee1dbeb9da44bc0b716a8c4e7caa26 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 24 Jun 2026 16:35:17 +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        | 29 +++----------------
 .../factory/WebCadOrderImportFactory.java     | 29 +++----------------
 2 files changed, 8 insertions(+), 50 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 22d668c97..7f08af2da 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
@@ -1686,9 +1686,10 @@ public class WebCadOrderImportAsyncFactory {
                 sealEdgeWidthMatch(part);
                 // 规格可能修改，再获取一次
                 spec = part.getSpec();
-            } else if (PART_CATEGORY_THREE.equals(partType)) {
-                color = getFieldFromSpec(part.getSpec(), 2);
+            } else {
+                spec = getFieldFromSpec(part.getSpec(), 0);
                 material = getFieldFromSpec(part.getSpec(), 1);
+                color = getFieldFromSpec(part.getSpec(), 2);
             }
 
             String type = changePartType(partType, part.getIsComposite());
@@ -1707,7 +1708,7 @@ public class WebCadOrderImportAsyncFactory {
                     .name(part.getName())
                     .material(getEmpty(material))
                     .model(getEmpty(model))
-                    .spec(getPartsSpec(spec))
+                    .spec(getEmpty(spec))
                     .brand(getEmpty(brand))
                     .factory(getEmpty(factory))
                     .unit(part.getUnit())
@@ -1734,28 +1735,6 @@ public class WebCadOrderImportAsyncFactory {
         }
     }
 
-    /**
-     * 获取配件规格，cad格式为a|b|c，只取第一段
-     *
-     * @param value
-     * @return
-     */
-    private String getPartsSpec(String value) {
-        value = StringUtils.defaultString(value);
-
-        // 特殊规格：规格|材质|颜色
-        if (StringUtils.countMatches(value, "|") >= 2) {
-            int idx = value.indexOf('|');
-            return StringUtils.defaultIfEmpty(
-                    value.substring(0, idx),
-                    EMPTY_STRING
-            );
-        }
-
-        // 普通规格直接返回
-        return StringUtils.defaultIfEmpty(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 d5b04d379..88ffa539d 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
@@ -1873,9 +1873,10 @@ public class WebCadOrderImportFactory {
                 sealEdgeWidthMatch(part);
                 // 规格可能修改，再获取一次
                 spec = part.getSpec();
-            } else if (PART_CATEGORY_THREE.equals(partType)) {
-                color = getFieldFromSpec(part.getSpec(), 2);
+            } else {
+                spec = getFieldFromSpec(part.getSpec(), 0);
                 material = getFieldFromSpec(part.getSpec(), 1);
+                color = getFieldFromSpec(part.getSpec(), 2);
             }
 
             String type = changePartType(partType, part.getIsComposite());
@@ -1894,7 +1895,7 @@ public class WebCadOrderImportFactory {
                     .name(part.getName())
                     .material(getEmpty(material))
                     .model(getEmpty(model))
-                    .spec(getPartsSpec(spec))
+                    .spec(getEmpty(spec))
                     .brand(getEmpty(brand))
                     .factory(getEmpty(factory))
                     .unit(part.getUnit())
@@ -1921,28 +1922,6 @@ public class WebCadOrderImportFactory {
         }
     }
 
-    /**
-     * 获取配件规格，cad格式为a|b|c，只取第一段
-     *
-     * @param value
-     * @return
-     */
-    private String getPartsSpec(String value) {
-        value = StringUtils.defaultString(value);
-
-        // 特殊规格：规格|材质|颜色
-        if (StringUtils.countMatches(value, "|") >= 2) {
-            int idx = value.indexOf('|');
-            return StringUtils.defaultIfEmpty(
-                    value.substring(0, idx),
-                    EMPTY_STRING
-            );
-        }
-
-        // 普通规格直接返回
-        return StringUtils.defaultIfEmpty(value, EMPTY_STRING);
-    }
-
     /**
      * 保留三位小数展示
      *