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 a1b53bfcb..8459c38d7 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 @@ -1049,7 +1049,12 @@ public class SlitterServiceImpl implements SlitterService { if (CollectionUtil.isNotEmpty(qzzNos)) { List plans = slittingproductionplanService.getByQzzNos(qzzNos); List collect = plans.stream().map(PdmBiSlittingproductionplan::getContainer_name).collect(Collectors.toList()); + if(collect.size()==0){ + throw new BadRequestException("操作失败,点位[" + pointCode + "]未查到子卷分切计划,请先绑定子卷库存!"); + } taskParam.put("containers", collect); + }else{ + throw new BadRequestException("操作失败,点位[" + pointCode + "]无气胀轴信息,请先绑定子卷库存!"); } // List areaEmptyNotTaskPoint = bcutpointivtService.getAreaNotTaskPointByStatus("1", // "1", "0", "2"); @@ -1194,6 +1199,11 @@ public class SlitterServiceImpl implements SlitterService { if (plans.size() == 0) { throw new BadRequestException("子卷号:[" + containerName + "] 的分切计划没找到,检查是否推送或者子卷号是否正确!"); } + // 校验是否存在任务 + List taskList = taskService.checkHaveStartTask(pointCode1); + if (taskList.size() > 0) { + throw new BadRequestException("操作失败,点位[" + pointCode1 + "]存在未完成的任务!"); + } BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false); PdmBiSlittingproductionplan demoPlan = plans.get(0); String resourceName = demoPlan.getResource_name(); @@ -1256,6 +1266,11 @@ public class SlitterServiceImpl implements SlitterService { if (plans.size() == 0) { throw new BadRequestException("子卷号:[" + containerName + "] 的分切计划没找到,检查是否推送或者子卷号是否正确!"); } + // 校验是否存在任务 + List taskList = taskService.checkHaveStartTask(pointCode1); + if (taskList.size() > 0) { + throw new BadRequestException("操作失败,点位[" + pointCode1 + "]存在未完成的任务!"); + } BstIvtCutpointivt pointCode = bcutpointivtService.getPintByTrussCode(pointCode1, false); PdmBiSlittingproductionplan demoPlan = plans.get(0); String resourceName = demoPlan.getResource_name();