From 8e73194bf1782e895574c44d0afc06ca2baec1c6 Mon Sep 17 00:00:00 2001
From: gtsxc <3272660260@qq.com>
Date: 星期四, 27 二月 2025 08:46:47 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml | 4 ++--
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
index 5a2034d..0012067 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/timer/TaskTimer.java
@@ -47,7 +47,7 @@
// taskSts.add(TaskStsType.COMPLETE_OUTBOUND.sts);
taskSts.add(TaskStsType.COMPLETE_CHARGE.sts);
taskSts.add(TaskStsType.COMPLETE_MOVE.sts);
-// taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
+ taskSts.add(TaskStsType.COMPLETE_MANUAL.sts);
List<Task> tasks = taskService.list(new LambdaQueryWrapper<Task>()
.eq(Task::getStatus, 1)
diff --git a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
index 75256bc..cd32c17 100644
--- a/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
+++ b/zy-asrs-wcs/src/main/resources/mapper/core/TaskMapper.xml
@@ -105,7 +105,7 @@
<select id="selectWorkingByShuttle" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
- where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403)
+ where task_sts in (1,2,3,101,102,103,301,302,303,401,402,403,501,502,503)
and shuttle_no = #{shuttleNo}
<if test="taskNo!=null">
and task_no != #{taskNo}
@@ -115,7 +115,7 @@
<select id="selectWorkingByLift" resultType="com.zy.asrs.wcs.core.entity.Task">
select * from wcs_task
- where task_sts in (1,2,3,101,102,103,201,202,203,301,302,303,401,402,403)
+ where task_sts in (1,2,3,101,102,103,201,202,203,301,302,303,401,402,403,501,502,503)
and lift_no = #{liftNo}
<if test="taskNo!=null">
and task_no != #{taskNo}
--
Gitblit v1.9.1