From e588a32472b137bafe417b7a84a2d50689d00af3 Mon Sep 17 00:00:00 2001 From: "DESKTOP-5DIJMF9\\admin" <2388969634@qq.com> Date: Fri, 11 Apr 2025 12:13:06 +0800 Subject: [PATCH] =?UTF-8?q?opt:=E6=9C=89=E4=BB=BB=E5=8A=A1=E7=A6=81?= =?UTF-8?q?=E6=AD=A2=E7=BB=91=E5=AE=9A=E5=AD=90=E5=8D=B7=E3=80=81=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E6=B0=94=E8=83=80=E8=BD=B4=EF=BC=8C=E4=B8=8B=E6=96=99?= =?UTF-8?q?=E5=88=B0=E5=86=85=E4=BF=9D=E9=97=B4=E5=88=A4=E6=96=AD=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E6=9C=89=E6=B0=94=E8=83=80=E8=BD=B4=E3=80=81=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E6=9C=89=E8=AE=A1=E5=88=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../slitter/service/impl/SlitterServiceImpl.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) 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();