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);