From f2b969fcbbf400dc3e6b9d9b30effa64b2c73a13 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Mon, 8 Jul 2024 13:42:17 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=A1=81=E6=9E=B6=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90=E5=8F=96=E7=A9=BA=E8=BD=BD=E5=85=B7?= =?UTF-8?q?=E4=B8=8D=E5=88=86=E9=85=8D=E7=82=B9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BstIvtPackageinfoivtServiceImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java index 0af0f9a29..f3b734ca1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/sch/point/service/impl/BstIvtPackageinfoivtServiceImpl.java @@ -298,12 +298,11 @@ public class BstIvtPackageinfoivtServiceImpl extends ServiceImpl输送线)") ))); - // if (CollectionUtils.isNotEmpty(taskList)) { - // //todo 桁架任务取空载具动作完成 - // if (!taskList.get(0).getRequest_param().equals(IOSEnum.IS_SEND.code("是"))) { - // throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位"); - // } - // } + if (CollectionUtils.isNotEmpty(taskList)) { + if (!taskList.get(0).getRequest_param().equals(IOSEnum.IS_SEND.code("是"))) { + throw new BadRequestException("请等待桁架任务取空载具动作执行完成，再分配空载具点位"); + } + } newPoint = checkIvtSBlock(); } else { newPoint = getBstIvtPackageinfoivt(actionType, taskPointType, baseTask);