From f23549bc50ae4d489c37d68c0f3b1456b7156ea8 Mon Sep 17 00:00:00 2001
From: gtsxc <3272660260@qq.com>
Date: 星期二, 10 十二月 2024 16:06:31 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java | 87 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 87 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
index b58abda..d484864 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/kernel/command/ShuttleCommandService.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
import com.zy.asrs.framework.exception.CoolException;
import com.zy.asrs.wcs.common.ExecuteSupport;
import com.zy.asrs.wcs.core.action.LiftAction;
@@ -24,6 +25,8 @@
import com.zy.asrs.wcs.rcs.thread.DevpThread;
import com.zy.asrs.wcs.rcs.thread.LiftThread;
import com.zy.asrs.wcs.rcs.thread.ShuttleThread;
+import com.zy.asrs.wcs.system.entity.Dict;
+import com.zy.asrs.wcs.system.service.DictService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -65,6 +68,8 @@
private ShuttleDispatcher shuttleDispatcher;
@Autowired
private NavigateUtils navigateUtils;
+ @Autowired
+ private DictService dictService;
// 璁＄畻
public Boolean accept(Motion motion) {
@@ -104,6 +109,14 @@
return false;
}
+ Double similarityRef = 0.9D;
+ Dict similarityRefDict = dictService.getOne(new LambdaQueryWrapper<Dict>()
+ .eq(Dict::getFlag, "similarityRef")
+ .eq(Dict::getStatus, 1));
+ if (similarityRefDict != null) {
+ similarityRef = Double.parseDouble(similarityRefDict.getValue());
+ }
+
ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
assignCommand.setShuttleNo(deviceNo);
assignCommand.setTaskNo(motion.getTaskNo());
@@ -117,6 +130,10 @@
LiftThread liftThread = null;
LiftProtocol liftProtocol = null;
+ String movePath = null;
+ List<NavigateNode> originPath = null;
+ List<NavigateNode> finalPath = null;
+ Double similarity = null;
switch (Objects.requireNonNull(MotionCtgType.get(motion.getMotionCtgEl()))){
case SHUTTLE_MOVE:
@@ -128,6 +145,18 @@
}
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.NORMAL.id, assignCommand, shuttleThread);
shuttleTaskModeType = ShuttleTaskModeType.SHUTTLE_MOVE;
+
+ movePath = motion.getMovePath();
+ if (!Cools.isEmpty(movePath)) {
+ originPath = JSON.parseArray(movePath, NavigateNode.class);
+ finalPath = assignCommand.getNodes();
+ similarity = navigateUtils.similarityPath(originPath, finalPath);
+ if(similarity <= similarityRef) {
+ News.error("{} dash {} path similarity mismatch!", motion.getOrigin(), motion.getTarget());
+ return false;
+ }
+ }
+
break;
case SHUTTLE_TRANSPORT://绌挎杞﹁浇璐ц璧�
// 濡傛灉宸茬粡鍦ㄥ綋鍓嶆潯鐮佸垯杩囨护
@@ -138,6 +167,17 @@
}
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
shuttleTaskModeType = ShuttleTaskModeType.TRANSPORT;
+
+ movePath = motion.getMovePath();
+ if (!Cools.isEmpty(movePath)) {
+ originPath = JSON.parseArray(movePath, NavigateNode.class);
+ finalPath = assignCommand.getNodes();
+ similarity = navigateUtils.similarityPath(originPath, finalPath);
+ if(similarity <= similarityRef) {
+ News.error("{} dash {} path similarity mismatch!", motion.getOrigin(), motion.getTarget());
+ return false;
+ }
+ }
if (motion.getReleaseLift() == 2) {//鎵ц涓噴鏀炬彁鍗囨満
task.setLiftNo(0);
@@ -179,15 +219,51 @@
}
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
shuttleTaskModeType = ShuttleTaskModeType.TRANSPORT_TO_CONVEYOR;
+
+ movePath = motion.getMovePath();
+ if (!Cools.isEmpty(movePath)) {
+ originPath = JSON.parseArray(movePath, NavigateNode.class);
+ finalPath = assignCommand.getNodes();
+ similarity = navigateUtils.similarityPath(originPath, finalPath);
+ if(similarity <= similarityRef) {
+ News.error("{} dash {} path similarity mismatch!", motion.getOrigin(), motion.getTarget());
+ return false;
+ }
+ }
+
break;
case SHUTTLE_MOVE_LIFT_PALLET://绌挎杞﹂《鍗囧苟绉诲姩
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
shuttleTaskModeType = ShuttleTaskModeType.MOVE_PALLET_LIFT;
+
+ movePath = motion.getMovePath();
+ if (!Cools.isEmpty(movePath)) {
+ originPath = JSON.parseArray(movePath, NavigateNode.class);
+ finalPath = assignCommand.getNodes();
+ similarity = navigateUtils.similarityPath(originPath, finalPath);
+ if(similarity <= similarityRef) {
+ News.error("{} dash {} path similarity mismatch!", motion.getOrigin(), motion.getTarget());
+ return false;
+ }
+ }
+
shuttleCommands.add(0, shuttleThread.getLiftCommand(motion.getTaskNo(), true));
break;
case SHUTTLE_MOVE_DOWN_PALLET://绌挎杞︾Щ鍔ㄥ苟鎵樼洏涓嬮檷
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), motion.getTarget(), NavigationMapType.DFX.id, assignCommand, shuttleThread);
shuttleTaskModeType = ShuttleTaskModeType.MOVE_PALLET_DOWN;
+
+ movePath = motion.getMovePath();
+ if (!Cools.isEmpty(movePath)) {
+ originPath = JSON.parseArray(movePath, NavigateNode.class);
+ finalPath = assignCommand.getNodes();
+ similarity = navigateUtils.similarityPath(originPath, finalPath);
+ if(similarity <= similarityRef) {
+ News.error("{} dash {} path similarity mismatch!", motion.getOrigin(), motion.getTarget());
+ return false;
+ }
+ }
+
shuttleCommands.add(shuttleCommands.size(), shuttleThread.getLiftCommand(motion.getTaskNo(), false));
break;
case SHUTTLE_MOVE_FROM_LIFT://鍑烘彁鍗囨満
@@ -297,6 +373,17 @@
String shuttleFromLiftStandbyLoc = shuttleDispatcher.searchAvailableLocNo(Integer.valueOf(shuttleDevice.getDeviceNo()), shuttleDevice.getHostId(), shuttleThread.getStatus().getCurrentLocNo(), standbyLocs);
shuttleCommands = this.shuttleAssignCommand(motion.getOrigin(), shuttleFromLiftStandbyLoc, NavigationMapType.NORMAL.id, assignCommand, shuttleThread);
+ movePath = motion.getMovePath();
+ if (!Cools.isEmpty(movePath)) {
+ originPath = JSON.parseArray(movePath, NavigateNode.class);
+ finalPath = assignCommand.getNodes();
+ similarity = navigateUtils.similarityPath(originPath, finalPath);
+ if(similarity <= similarityRef) {
+ News.error("{} dash {} path similarity mismatch!", motion.getOrigin(), motion.getTarget());
+ return false;
+ }
+ }
+
//鏇存柊鍔ㄤ綔鍙敤寰呮満浣�
motion.setTarget(shuttleFromLiftStandbyLoc);
motion.setUpdateTime(new Date());
--
Gitblit v1.9.1