From 0dab5a05ed6e734a83c43f8e6e5ef1b07115f48d Mon Sep 17 00:00:00 2001 From: Junjie <540245094@qq.com> Date: 星期二, 10 十二月 2024 10:50:54 +0800 Subject: [PATCH] #path similarity --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java | 20 ++++++++++++++++++++ 1 files changed, 20 insertions(+), 0 deletions(-) diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java index dd37a7e..e4f74df 100644 --- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java +++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/KernelService.java @@ -1,11 +1,21 @@ package com.zy.asrs.wcs.core.kernel; +import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.zy.asrs.framework.exception.CoolException; import com.zy.asrs.wcs.core.domain.dto.MotionDto; +import com.zy.asrs.wcs.core.model.NavigateNode; import com.zy.asrs.wcs.core.model.enums.DeviceCtgType; import com.zy.asrs.wcs.core.model.enums.MotionCtgType; import com.zy.asrs.wcs.core.entity.Motion; +import com.zy.asrs.wcs.core.model.enums.NavigationMapType; import com.zy.asrs.wcs.core.service.MotionService; import com.zy.asrs.wcs.core.utils.LiftDispatcher; +import com.zy.asrs.wcs.core.utils.NavigateUtils; +import com.zy.asrs.wcs.core.utils.Utils; +import com.zy.asrs.wcs.rcs.News; +import com.zy.asrs.wcs.rcs.entity.Device; +import com.zy.asrs.wcs.rcs.service.DeviceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -22,6 +32,10 @@ private MotionService motionService; @Autowired private LiftDispatcher liftDispatcher; + @Autowired + private NavigateUtils navigateUtils; + @Autowired + private DeviceService deviceService; // agv ----------------------------------------------------------------------------- @Deprecated @@ -321,6 +335,12 @@ motion.setReleaseLift(target.getReleaseLift()); } + List<NavigateNode> nodeList = navigateUtils.calc(motion.getOrigin(), motion.getTarget(), NavigationMapType.NONE_LOCK.id, Utils.getShuttlePoints(Integer.parseInt(target.getShuttleDevice().getDeviceNo()), Utils.getLev(motion.getTarget()))); + if (nodeList == null) { + throw new CoolException(motion.getOrigin() + " dash " + motion.getTarget() + " can't find navigate path!"); + } + motion.setMovePath(JSON.toJSONString(nodeList)); + })); return motionList; -- Gitblit v1.9.1