From 6ccf38a18676fe3c748aff7d24e76ccbf4b3f35f Mon Sep 17 00:00:00 2001 From: tuqiang <437016993@qq.com> Date: Fri, 28 Feb 2025 20:45:23 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acs/point/service/IAcsPointService.java | 1 - .../task/service/impl/WorkServiceImpl.java | 37 ++++++------- .../nl/hand/service/impl/HandServiceImpl.java | 3 ++ .../nl/hand/service/impl/PdaServiceImpl.java | 37 ++++++------- .../service/quartz/task/AutoCreateInst.java | 53 +++++++++++++++++++ 5 files changed, 94 insertions(+), 37 deletions(-) diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/point/service/IAcsPointService.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/point/service/IAcsPointService.java index 6c92d8c..e45b761 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/point/service/IAcsPointService.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/point/service/IAcsPointService.java @@ -28,7 +28,6 @@ public interface IAcsPointService extends IService { * @return IPage */ IPage queryAll(PointQuery whereJson, PageQuery pageable); - /** * 创建 * diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java index 1044a74..c696516 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/sch/task/service/impl/WorkServiceImpl.java @@ -165,6 +165,7 @@ public class WorkServiceImpl extends ServiceImpl implements Wo } List list = taskService.lambdaQuery() .in(Task::getTask_status, VALID_STATUS) + .eq(Task::getStart_device_code,"QZJYTW2") .list(); if (list.size()>0) { throw new BadRequestException("已存在正在执行中或者就绪的AGV任务!"); @@ -186,24 +187,24 @@ public class WorkServiceImpl extends ServiceImpl implements Wo throw new BadRequestException("工单起点和终点未确认！"); } - AcsPoint startPoint = acsPointService.lambdaQuery() - .eq(AcsPoint::getPoint_code, "QZJYTW2") - .one(); - AcsPoint nextPoint = acsPointService.lambdaQuery() - .eq(AcsPoint::getPoint_code,taskDto.getNext_device_code()) - .one(); - if (ObjectUtil.isEmpty(nextPoint)) { - throw new BadRequestException("终点设备不存在"); - } - if (!nextPoint.getIs_used().booleanValue() || nextPoint.getPoint_status().equals(CommonFinalParam.ONE)) { - throw new BadRequestException("下发任务失败的原因是：终点点位被禁用或者终点点位有货，请检查起点点位"+nextPoint.getPoint_code()+"的状态!"); - } - if (ObjectUtil.isEmpty(startPoint)) { - throw new BadRequestException("起点设备不存在"); - } - if (!startPoint.getIs_used().booleanValue() || startPoint.getPoint_status().equals(CommonFinalParam.ZERO)) { - throw new BadRequestException("下发任务失败的原因是：起点点位被禁用或者起点点位无货，请检查起点点位"+startPoint.getPoint_code()+"的状态!"); - } +// AcsPoint startPoint = acsPointService.lambdaQuery() +// .eq(AcsPoint::getPoint_code, "QZJYTW2") +// .one(); +// AcsPoint nextPoint = acsPointService.lambdaQuery() +// .eq(AcsPoint::getPoint_code,taskDto.getNext_device_code()) +// .one(); +// if (ObjectUtil.isEmpty(nextPoint)) { +// throw new BadRequestException("终点设备不存在"); +// } +// if (!nextPoint.getIs_used().booleanValue() || nextPoint.getPoint_status().equals(CommonFinalParam.ONE)) { +// throw new BadRequestException("下发任务失败的原因是：终点点位被禁用或者终点点位有货，请检查起点点位"+nextPoint.getPoint_code()+"的状态!"); +// } +// if (ObjectUtil.isEmpty(startPoint)) { +// throw new BadRequestException("起点设备不存在"); +// } +// if (!startPoint.getIs_used().booleanValue() || startPoint.getPoint_status().equals(CommonFinalParam.ZERO)) { +// throw new BadRequestException("下发任务失败的原因是：起点点位被禁用或者起点点位无货，请检查起点点位"+startPoint.getPoint_code()+"的状态!"); +// } taskDto.setStart_device_code("QZJYTW2"); taskDto.setTask_type(CommonFinalParam.ONE); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java index c50f814..7c8ea0d 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/HandServiceImpl.java @@ -47,6 +47,9 @@ public class HandServiceImpl implements HandService { if (work == null){ return PdaResponseVo.pdaResultOk("配料作业不存在"); } + if (work.getRemain_num()==0){ + return PdaResponseVo.pdaResultOk("配料作业剩余数量不能为0!"); + } workService.confirm(work.getWork_id()); return PdaResponseVo.pdaResultOk("配料作业确认成功"); } diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java index 5170fbc..b6b16f4 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/hand/service/impl/PdaServiceImpl.java @@ -284,29 +284,30 @@ public class PdaServiceImpl implements PdaService { } List list = taskService.lambdaQuery() .in(Task::getTask_status, VALID_STATUS) + .eq(Task::getNext_device_code,"QZJYTW1") .list(); if (list.size()>0) { throw new BadRequestException("已存在正在执行中或者就绪的AGV任务!"); } - AcsPoint startPoint = acsPointService.lambdaQuery() - .eq(AcsPoint::getPoint_code, start_device_code) - .one(); - AcsPoint nextPoint = acsPointService.lambdaQuery() - .eq(AcsPoint::getPoint_code,"QZJYTW1") - .one(); - if (ObjectUtil.isEmpty(nextPoint)) { - throw new BadRequestException("终点设备不存在"); - } - if (!nextPoint.getIs_used().booleanValue() || nextPoint.getPoint_status().equals(CommonFinalParam.ONE)) { - throw new BadRequestException("下发任务失败的原因是：终点点位被禁用或者终点点位有货，请检查起点点位"+nextPoint.getPoint_code()+"的状态!"); - } - if (ObjectUtil.isEmpty(startPoint)) { - throw new BadRequestException("起点设备不存在"); - } - if (!startPoint.getIs_used().booleanValue() || startPoint.getPoint_status().equals(CommonFinalParam.ZERO)) { - throw new BadRequestException("下发任务失败的原因是：起点点位被禁用或者起点点位无货，请检查起点点位"+startPoint.getPoint_code()+"的状态!"); - } +// AcsPoint startPoint = acsPointService.lambdaQuery() +// .eq(AcsPoint::getPoint_code, start_device_code) +// .one(); +// AcsPoint nextPoint = acsPointService.lambdaQuery() +// .eq(AcsPoint::getPoint_code,"QZJYTW1") +// .one(); +// if (ObjectUtil.isEmpty(nextPoint)) { +// throw new BadRequestException("终点设备不存在"); +// } +// if (!nextPoint.getIs_used().booleanValue() || nextPoint.getPoint_status().equals(CommonFinalParam.ONE)) { +// throw new BadRequestException("下发任务失败的原因是：终点点位被禁用或者终点点位有货，请检查起点点位"+nextPoint.getPoint_code()+"的状态!"); +// } +// if (ObjectUtil.isEmpty(startPoint)) { +// throw new BadRequestException("起点设备不存在"); +// } +// if (!startPoint.getIs_used().booleanValue() || startPoint.getPoint_status().equals(CommonFinalParam.ZERO)) { +// throw new BadRequestException("下发任务失败的原因是：起点点位被禁用或者起点点位无货，请检查起点点位"+startPoint.getPoint_code()+"的状态!"); +// } JSONObject jo = new JSONObject(); jo.put("start_device_code", start_device_code); diff --git a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java index 5f11d3b..063583f 100644 --- a/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java +++ b/acs/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/quartz/task/AutoCreateInst.java @@ -18,12 +18,15 @@ import org.nl.acs.limit_regional.server.LimitRegionalService; import org.nl.acs.limit_regional.server.dto.LimitRegionalDto; import org.nl.acs.opc.DeviceAppService; import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.acs.point.domain.AcsPoint; +import org.nl.acs.point.service.IAcsPointService; import org.nl.acs.route.service.RouteLineService; import org.nl.acs.route.service.dto.RouteLineDto; import org.nl.acs.task.enums.TaskStatusEnum; import org.nl.acs.task.enums.TaskTypeEnum; import org.nl.acs.task.service.TaskService; import org.nl.acs.task.service.dto.TaskDto; +import org.nl.common.exception.BadRequestException; import org.nl.common.utils.SecurityUtils; import org.nl.config.SpringContextHolder; import org.nl.config.lucene.service.LuceneExecuteLogService; @@ -51,6 +54,7 @@ public class AutoCreateInst { InstructionService instructionService = SpringContextHolder.getBean(InstructionService.class); RouteLineService routeLineService = SpringContextHolder.getBean(RouteLineService.class); DeviceAppService appService = SpringContextHolder.getBean(DeviceAppServiceImpl.class); + IAcsPointService acsPointService = SpringContextHolder.getBean(IAcsPointService.class); LuceneExecuteLogService luceneExecuteLogService = SpringContextHolder.getBean(LuceneExecuteLogServiceImpl.class); List list = taskserver.queryAllByStatus("0"); for (int i = 0; i < list.size(); i++) { @@ -108,6 +112,55 @@ public class AutoCreateInst { if (!StrUtil.equals(shortPathsList.get(0).getType(), CommonFinalParam.ONE)) { continue; } + if (acsTask.getNext_device_code().equals("QZJYTW1")){ + AcsPoint startPoint = acsPointService.lambdaQuery() + .eq(AcsPoint::getPoint_code, start_device_code) + .one(); + AcsPoint nextPoint = acsPointService.lambdaQuery() + .eq(AcsPoint::getPoint_code,"QZJYTW1") + .one(); + if (ObjectUtil.isEmpty(nextPoint)) { + log.error("终点设备不存在"); + continue; + } + if (!nextPoint.getIs_used().booleanValue() || nextPoint.getPoint_status().equals(CommonFinalParam.ONE)) { + log.error("下发任务失败的原因是：终点点位被禁用或者终点点位有货，请检查起点点位"+nextPoint.getPoint_code()+"的状态!"); + continue; + } + if (ObjectUtil.isEmpty(startPoint)) { + log.error("起点设备不存在"); + continue; + } + if (!startPoint.getIs_used().booleanValue() || startPoint.getPoint_status().equals(CommonFinalParam.ZERO)) { + log.error("下发任务失败的原因是：起点点位被禁用或者起点点位无货，请检查起点点位"+startPoint.getPoint_code()+"的状态!"); + continue; + } + } + + if (acsTask.getStart_device_code().equals("QZJYTW2")) { + AcsPoint startPoint = acsPointService.lambdaQuery() + .eq(AcsPoint::getPoint_code, "QZJYTW2") + .one(); + AcsPoint nextPoint = acsPointService.lambdaQuery() + .eq(AcsPoint::getPoint_code, acsTask.getNext_device_code()) + .one(); + if (ObjectUtil.isEmpty(nextPoint)) { + log.error("终点设备不存在"); + continue; + } + if (!nextPoint.getIs_used().booleanValue() || nextPoint.getPoint_status().equals(CommonFinalParam.ONE)) { + log.error("下发任务失败的原因是：终点点位被禁用或者终点点位有货，请检查起点点位" + nextPoint.getPoint_code() + "的状态!"); + continue; + } + if (ObjectUtil.isEmpty(startPoint)) { + log.error("起点设备不存在"); + continue; + } + if (!startPoint.getIs_used().booleanValue() || startPoint.getPoint_status().equals(CommonFinalParam.ZERO)) { + log.error("下发任务失败的原因是：起点点位被禁用或者起点点位无货，请检查起点点位" + startPoint.getPoint_code() + "的状态!"); + continue; + } + } RouteLineDto routeLineDto = shortPathsList.get(0); String path = routeLineDto.getPath();