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-12 12: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:35:17 +08:00
parent 22334591e1
commit 4087c2162a
2 changed files with 8 additions and 50 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
+4 -25
View File
@@ -1686,9 +1686,10 @@ public class WebCadOrderImportAsyncFactory {
sealEdgeWidthMatch(part); sealEdgeWidthMatch(part);
// 规格可能修改，再获取一次 // 规格可能修改，再获取一次
spec = part.getSpec(); spec = part.getSpec();
} else if (PART_CATEGORY_THREE.equals(partType)) { } else {
color = getFieldFromSpec(part.getSpec(), 2); spec = getFieldFromSpec(part.getSpec(), 0);
material = getFieldFromSpec(part.getSpec(), 1); material = getFieldFromSpec(part.getSpec(), 1);
color = getFieldFromSpec(part.getSpec(), 2);
} }
String type = changePartType(partType, part.getIsComposite()); String type = changePartType(partType, part.getIsComposite());
@@ -1707,7 +1708,7 @@ public class WebCadOrderImportAsyncFactory {
.name(part.getName()) .name(part.getName())
.material(getEmpty(material)) .material(getEmpty(material))
.model(getEmpty(model)) .model(getEmpty(model))
.spec(getPartsSpec(spec)) .spec(getEmpty(spec))
.brand(getEmpty(brand)) .brand(getEmpty(brand))
.factory(getEmpty(factory)) .factory(getEmpty(factory))
.unit(part.getUnit()) .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);
}
/** /**
* 保留三位小数展示 * 保留三位小数展示
* *
cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+4 -25
View File
@@ -1873,9 +1873,10 @@ public class WebCadOrderImportFactory {
sealEdgeWidthMatch(part); sealEdgeWidthMatch(part);
// 规格可能修改，再获取一次 // 规格可能修改，再获取一次
spec = part.getSpec(); spec = part.getSpec();
} else if (PART_CATEGORY_THREE.equals(partType)) { } else {
color = getFieldFromSpec(part.getSpec(), 2); spec = getFieldFromSpec(part.getSpec(), 0);
material = getFieldFromSpec(part.getSpec(), 1); material = getFieldFromSpec(part.getSpec(), 1);
color = getFieldFromSpec(part.getSpec(), 2);
} }
String type = changePartType(partType, part.getIsComposite()); String type = changePartType(partType, part.getIsComposite());
@@ -1894,7 +1895,7 @@ public class WebCadOrderImportFactory {
.name(part.getName()) .name(part.getName())
.material(getEmpty(material)) .material(getEmpty(material))
.model(getEmpty(model)) .model(getEmpty(model))
.spec(getPartsSpec(spec)) .spec(getEmpty(spec))
.brand(getEmpty(brand)) .brand(getEmpty(brand))
.factory(getEmpty(factory)) .factory(getEmpty(factory))
.unit(part.getUnit()) .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);
}
/** /**
* 保留三位小数展示 * 保留三位小数展示
* *