From cb0be1cbbf9c5181871f07fc900faa1a38213fc0 Mon Sep 17 00:00:00 2001
From: LGH <1746689524@qq.com>
Date: Fri, 9 Sep 2022 22:04:20 +0800
Subject: [PATCH] =?UTF-8?q?update:=20currTask=E5=88=97=E8=A1=A8=E6=80=BB?=
 =?UTF-8?q?=E8=A7=88=E5=8F=8A=E6=93=8D=E4=BD=9C=E6=96=B9=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9-bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../empty/service/impl/CurrTaskServiceImpl.java   | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
index 04c472f..26ed88e 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/CurrTaskServiceImpl.java
@@ -173,12 +173,6 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
                 String nowStep="未开始";
                 for (CurrTask currTask1:currTasks
                      ) {
-                    if (currTask1.getStatus()==1){
-                        nowStep=currTask1.getTargetPosition();
-                    }else if (currTask1.getIsCache()==1){
-                        nowStep=currTask.getLocationName();
-                    }
-                    allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
                     InStockInfo inStockInfo = inStockInfoServiceBiz.getOne(new QueryWrapper<InStockInfo>().eq(InStockInfo.TASK_ID, currTask1.getId()));
                     if (inStockInfo!=null){
                         List<InStockInfoVo> inStockInfoVoList=new ArrayList<>();
@@ -187,6 +181,15 @@ public class CurrTaskServiceImpl extends BaseService implements CurrTaskService
                         inStockInfoVoList.add(inStockInfoVo);
                         currTaskInfoVo.setInStockInfoVoList(inStockInfoVoList);
                     }
+                    if (currTask1.getStatus()==1){
+                        nowStep=currTask1.getTargetPosition();
+                    }else if (currTask1.getIsCache()==1){
+                        nowStep=currTask.getLocationName();
+                    }
+                    if (currTaskInfoVo.getInStockInfoVoList().size()>0){
+                        nowStep=currTaskInfoVo.getInStockInfoVoList().get(0).getLocationName();
+                    }
+                    allStep=allStep.concat("->").concat(currTask1.getTargetPosition());
                 }
                 //
                 currTaskInfoVo.setAllStep(allStep);