From 8583ef6e38046ee4274110877cab9c0a2a72f471 Mon Sep 17 00:00:00 2001 From: liyongde <1419499670@qq.com> Date: Mon, 10 Aug 2026 14:02:57 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix:=20=E6=97=A0=E9=9C=80=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E5=88=A4=E6=96=AD"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 86b5e8a1cc3f6f77695dc77ff714a7123a650cf3. --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java index 8a57084e0..9b717d0bd 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/tasks/slitter/service/impl/SlitterServiceImpl.java @@ -3955,8 +3955,10 @@ public class SlitterServiceImpl implements SlitterService { throw new BadRequestException("两个管芯相加长度超出轴长度,请检查!"); } // 判断两边选择尺寸是否一致 - if (!StrUtil.equals(upLeftQzzSize, upRightQzzSize)) { - throw new BadRequestException("同一根轴的管芯尺寸必须一致!"); + if (ObjectUtil.isNotEmpty(upLeftSizeV) && ObjectUtil.isNotEmpty(upRightSizeV)) { + if (!StrUtil.equals(upLeftQzzSize, upRightQzzSize)) { + throw new BadRequestException("同一根轴的管芯尺寸必须一致!"); + } } } // 判断是单管还是双管