From e164cdc0e3e565d5bcf408baae74f9262d6af924 Mon Sep 17 00:00:00 2001 From: zhouz <> Date: Sat, 10 Aug 2024 08:51:34 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BC=98=E5=8C=96=E5=88=86=E5=88=87BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sch/tasks/slitter/service/impl/SlitterServiceImpl.java | 4 ++-- 1 file changed, 2 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 6b0be5ff2..217ff9ae7 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 @@ -514,7 +514,7 @@ public class SlitterServiceImpl implements SlitterService { getPointLocationInCutDevice(getNumberByResourceCode(demoPlan.getResource_name()), area)); if (emptyPoints.size() == 0) { log.error("分切机【" + device.getExt_code() + "】找不到对应的对接位!"); - throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位!😊"); + throw new BadRequestException("分切机【" + device.getExt_code() + "】找不到对应的对接位!"); } // 枷锁 BstIvtCutpointivt emptyPoint = emptyPoints.get(0); @@ -1005,7 +1005,7 @@ public class SlitterServiceImpl implements SlitterService { // 如果是没货 throw new BadRequestException("点位：" + point.getPoint_code() + "检测空气胀轴，请确保下卷任务是否完毕后触发！"); } - if (ObjectUtil.isEmpty(point.getQzz_no1()) || ObjectUtil.isEmpty(point.getQzz_no2())) { + if (ObjectUtil.isEmpty(point.getQzz_no1()) && ObjectUtil.isEmpty(point.getQzz_no2())) { throw new BadRequestException("点位：" + point.getPoint_code() + " 的气胀轴编码为空！"); } List areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1",