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); } /**