From 08c96e4b797573fd64b42a52a2f9b9805d59d3e3 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期日, 07 四月 2024 14:03:54 +0800
Subject: [PATCH] #

---
 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
index bb57f54..e7c5592 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java
@@ -9,6 +9,7 @@
 import com.zy.asrs.wcs.core.model.enums.MotionStsType;
 import com.zy.asrs.wcs.core.model.enums.TaskStsType;
 import com.zy.asrs.wcs.core.service.*;
+import com.zy.asrs.wcs.core.utils.ShuttleDispatcher;
 import com.zy.asrs.wcs.core.utils.Utils;
 import com.zy.asrs.wcs.rcs.News;
 import com.zy.asrs.wcs.rcs.cache.SlaveConnection;
@@ -62,6 +63,8 @@
     private TaskCtgService taskCtgService;
     @Autowired
     private DictService dictService;
+    @Autowired
+    private ShuttleDispatcher shuttleDispatcher;
 
     /**
      * 缁勬墭
@@ -356,6 +359,9 @@
                 continue;
             }
 
+            //鑾峰彇閬胯浣嶇疆
+            String standByLocNo = shuttleDispatcher.searchStandByLocNo(Integer.valueOf(device.getDeviceNo()), device.getHostId(), shuttleThread.getStatus().getCurrentLocNo());
+
             Task task = new Task();
             task.setUuid(String.valueOf(snowflakeIdWorker.nextId()));
             task.setTaskNo(String.valueOf(Utils.getTaskNo("MOVE")));
@@ -365,7 +371,7 @@
             task.setOriginSite(null);
             task.setOriginLoc(null);
             task.setDestSite(null);
-            task.setDestLoc("1-1-1"); // 鏆傛椂鏈畾
+            task.setDestLoc(standByLocNo); // 閬胯浣嶇疆
             task.setIoTime(new Date());
             task.setStartTime(new Date());
             task.setHostId(device.getHostId());

--
Gitblit v1.9.1