From 3dce5380d8495ef11cab43777c1d662aa391a8d3 Mon Sep 17 00:00:00 2001
From: LGH <1746689524@qq.com>
Date: Tue, 2 Aug 2022 22:55:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E7=82=89=E5=89=8D?=
 =?UTF-8?q?=E5=8E=BB=E7=BC=93=E5=AD=98=E5=8C=BA=E6=97=B6=E5=9B=A0=E4=B8=BA?=
 =?UTF-8?q?=E5=BC=82=E6=AD=A5=E8=B0=83=E7=94=A8=E6=9F=A5=E8=AF=A2=E5=88=B0?=
 =?UTF-8?q?=E7=9A=84localtion=E4=B8=BAnull=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/mt/wms/empty/task/AsynRunTaskService.java   | 4 ++--
 .../src/main/java/com/mt/wms/empty/task/RunTaskUtils.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
index ca71cb5..cdcab79 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/AsynRunTaskService.java
@@ -274,9 +274,9 @@ public class AsynRunTaskService extends BaseService {
 
     //工业炉已满，调用车辆起点为提升台，终点为缓存区
     @Async("asyncServiceExecutor")
-    public void asynRunTaskToWarehouse(Long currTaskId, Long vehicleId) throws IOException {
+    public void asynRunTaskToWarehouse(Long currTaskId, Long vehicleId,Location location) throws IOException {
         CurrTask currTask = currTaskServiceBiz.getById(currTaskId);
-        Location location = locationServiceBiz.getById(currTask.getLocationId());
+        //Location location = locationServiceBiz.getById(currTask.getLocationId());
         VehicleInfo vehicle = vehicleInfoServiceBiz.getById(vehicleId);
         //检查车辆是否冲突，冲突则避让
         rgvStatus(vehicleId, currTask);
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
index 3829e4f..c1452f7 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/task/RunTaskUtils.java
@@ -179,7 +179,7 @@ public class RunTaskUtils {
                 currTask.setLocationId(location.getId());
                 currTaskServiceBiz.updateById(currTask);
                 //异步调用车辆
-                asynRunTaskService.asynRunTaskToWarehouse(currTask.getId(),vehicleId);
+                asynRunTaskService.asynRunTaskToWarehouse(currTask.getId(),vehicleId,location);
                 return R.ok("操作成功！当前目标工业炉已满，托盘准备加入缓存区待加工队列。");
             }
             return R.failed("当前目标工业炉已满！缓存区已满！请稍后重试!");