From b62356721785cf44f461713fb410b91b0053a4d9 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 24 Jun 2026 16:06:06 +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

---
 .../factory/WebCadOrderImportAsyncFactory.java    | 15 ++++++++++-----
 .../factory/WebCadOrderImportFactory.java         | 15 ++++++++++-----
 2 files changed, 20 insertions(+), 10 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 7a855240e..22d668c97 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
@@ -1743,12 +1743,17 @@ public class WebCadOrderImportAsyncFactory {
     private String getPartsSpec(String value) {
         value = StringUtils.defaultString(value);
 
-        int idx = value.indexOf('|');
+        // 特殊规格：规格|材质|颜色
+        if (StringUtils.countMatches(value, "|") >= 2) {
+            int idx = value.indexOf('|');
+            return StringUtils.defaultIfEmpty(
+                    value.substring(0, idx),
+                    EMPTY_STRING
+            );
+        }
 
-        return StringUtils.defaultIfEmpty(
-                idx >= 0 ? value.substring(0, idx) : value,
-                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 a69e330fb..d5b04d379 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
@@ -1930,12 +1930,17 @@ public class WebCadOrderImportFactory {
     private String getPartsSpec(String value) {
         value = StringUtils.defaultString(value);
 
-        int idx = value.indexOf('|');
+        // 特殊规格：规格|材质|颜色
+        if (StringUtils.countMatches(value, "|") >= 2) {
+            int idx = value.indexOf('|');
+            return StringUtils.defaultIfEmpty(
+                    value.substring(0, idx),
+                    EMPTY_STRING
+            );
+        }
 
-        return StringUtils.defaultIfEmpty(
-                idx >= 0 ? value.substring(0, idx) : value,
-                EMPTY_STRING
-        );
+        // 普通规格直接返回
+        return StringUtils.defaultIfEmpty(value, EMPTY_STRING);
     }
 
     /**