From 97aa2cd09e92f73cd4dff3d99eaef64e748c80b3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 28 六月 2023 19:04:32 +0800
Subject: [PATCH] 优化出库小车避让

---
 src/main/java/com/zy/asrs/utils/Utils.java |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 89e907d..d862cba 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -9,6 +9,7 @@
 import com.zy.asrs.service.impl.MainServiceImpl;
 import com.zy.common.model.NavigateNode;
 import com.zy.common.model.enums.NavigationMapType;
+import com.zy.common.service.CommonService;
 import com.zy.common.utils.NavigateMapData;
 import com.zy.common.utils.NavigatePositionConvert;
 import com.zy.common.utils.NavigateUtils;
@@ -525,6 +526,7 @@
     public static ShuttleAssignCommand searchEmptyGroupToMoveShuttle(int z, Integer currentShuttleId, ShuttleThread shuttleThread, String startLocNo) {
         LocMastService locMastService = SpringUtils.getBean(LocMastService.class);
         MainServiceImpl mainServiceImpl = SpringUtils.getBean(MainServiceImpl.class);
+        CommonService commonService = SpringUtils.getBean(CommonService.class);
 
         if (shuttleThread == null) {
             return null;
@@ -579,7 +581,7 @@
             //鍒涘缓鍒嗛厤鍛戒护
             ShuttleAssignCommand assignCommand = new ShuttleAssignCommand();
             assignCommand.setShuttleNo(shuttleProtocol.getShuttleNo());//鍥涘悜绌挎杞﹀彿
-            assignCommand.setTaskNo((short) 9998);//浠诲姟鍙�
+            assignCommand.setTaskNo((short) commonService.getWorkNo(7));//浠诲姟鍙�
             assignCommand.setTaskMode(ShuttleTaskModeType.MOVE_LOC_NO.id.shortValue());//绉诲姩鍒扮洰鏍囧簱浣�
             assignCommand.setSourceLocNo(startLocNo);//婧愬簱浣�
 

--
Gitblit v1.9.1