From dd1a4b448e131cbdbc1be0dd17de3c14a3232f9d Mon Sep 17 00:00:00 2001
From: lgh <lgh0010>
Date: Mon, 15 Aug 2022 11:05:34 +0800
Subject: [PATCH] =?UTF-8?q?update:=20finishQuantity=E8=AE=A1=E7=AE=97bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java | 2 +-
 .../src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java        | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
index 83a2ea8..1098526 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/service/impl/TaskDetHisServiceImpl.java
@@ -88,7 +88,7 @@ public class TaskDetHisServiceImpl extends BaseService implements TaskDetHisServ
             //如果是多步骤任务且不是第一步,移除对象
             if (byId.getIsAuto()==1){
                 AutoExeTask autoExeTask = autoExeTaskServiceBiz.getById(byId.getAutoExeTaskId());
-                if (!byId.getId().equals(autoExeTask.getFTaskId())){
+                if (!byId.getTaskId().equals(autoExeTask.getFTaskId())){
                     iterator.remove();
                 }
             }
diff --git a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java
index c61cd1c..f0e1b79 100644
--- a/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java
+++ b/6.program/wms-empty/src/main/java/com/mt/wms/empty/vo/CurrTaskVo.java
@@ -138,4 +138,9 @@ public class CurrTaskVo extends BaseVo implements PageVo.ConvertVo {
      */
     @TableField("auto_exe_task_id")
     private Long autoExeTaskId;
+    /**
+     * currid
+     */
+    @TableField("auto_exe_task_id")
+    private Long taskId;
 }