Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 21:52:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

禅道bug#1721修复

Browse Source
This commit is contained in:
gaoqr
2026-06-24 16:06:06 +08:00
parent 69adb2e7da
commit b623567217
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportAsyncFactory.java
+10 -5
View File
@@ -1743,12 +1743,17 @@ public class WebCadOrderImportAsyncFactory {
private String getPartsSpec(String value) { private String getPartsSpec(String value) {
value = StringUtils.defaultString(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, return StringUtils.defaultIfEmpty(value, EMPTY_STRING);
EMPTY_STRING
);
} }
/** /**
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+10 -5
View File
@@ -1930,12 +1930,17 @@ public class WebCadOrderImportFactory {
private String getPartsSpec(String value) { private String getPartsSpec(String value) {
value = StringUtils.defaultString(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, return StringUtils.defaultIfEmpty(value, EMPTY_STRING);
EMPTY_STRING
);
} }
/** /**