From 199232be5746cce94a02709b2b2754d48c6393c2 Mon Sep 17 00:00:00 2001
From: liyongde <1419499670@qq.com>
Date: Wed, 8 Jan 2025 16:40:36 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E9=98=B6=E6=A2=AF=E7=AE=A1?=
=?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
index 642717f47..183ac501b 100644
--- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
+++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/util/SlitterTaskUtil.java
@@ -28,7 +28,7 @@ public class SlitterTaskUtil {
* 组成纸管信息
* @param plan 对应的分切计划数组
* @return 组成的纸管信息
- * 纸制筒管|纸管|6英寸|1300 or 纸制筒管|纸管|3英寸|12|650
+ *
纸制筒管|纸管|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];
}
}