fix:阶梯管信息修改
This commit is contained in:
@@ -28,7 +28,7 @@ public class SlitterTaskUtil {
|
||||
* 组成纸管信息
|
||||
* @param plan 对应的分切计划数组
|
||||
* @return 组成的纸管信息
|
||||
* <p>纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650
|
||||
* <p>纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650 or 玻璃纤维及其制品|FRP管|6英寸|15-20|1700|阶梯
|
||||
* 长度:1300mm
|
||||
* 外径:6*25.4mm+15*2mm=182.4mm
|
||||
* 内径:6英寸(25.4mm/英寸)
|
||||
@@ -69,6 +69,7 @@ public class SlitterTaskUtil {
|
||||
if (ObjectUtil.isEmpty(tubeDescription)) {
|
||||
return "";
|
||||
}
|
||||
tubeDescription = tubeDescription.replaceAll("\\|阶梯$", "");
|
||||
// 解析描述数组
|
||||
String[] tubeArray = tubeDescription.split("\\|");
|
||||
// 定义尺寸与长度
|
||||
@@ -76,6 +77,9 @@ public class SlitterTaskUtil {
|
||||
|
||||
// 假设壁厚默认值为15,如果描述数组长度为4,则重新赋值
|
||||
String th = tubeArray.length == 5 ? tubeArray[3] : "15";
|
||||
if (tubeArray[3].contains("-")) {
|
||||
th = tubeArray[3].split("-")[1];
|
||||
}
|
||||
|
||||
// 计算外径和内径
|
||||
double externalDiameter = dia * 25.4 + Double.parseDouble(th) * 2;
|
||||
@@ -301,7 +305,7 @@ public class SlitterTaskUtil {
|
||||
} else {
|
||||
paperStr = plan.getFRP_model();
|
||||
}
|
||||
String[] split = paperStr.split("\\|");
|
||||
String[] split = paperStr.replaceAll("\\|阶梯$", "").split("\\|");
|
||||
return split[split.length - 1];
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user