From af5081bc0d0668d526a204076557a171097ddb8d Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 二月 2026 14:02:59 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into ctu_conveyor
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
index 5505d5f..dec3af8 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/TaskService.java
@@ -19,7 +19,7 @@
Task pick(TaskStsType taskStsType);
- Task selectByUuid(String uuid);
+ Task selectBySeqNum(Long busId, String seqNum);
List<Task> selectBySts(TaskStsType taskStsType);
@@ -27,9 +27,9 @@
List<Map<String, Object>> selectStatByLastSevenDays();
- Boolean complete(Long taskId, Long userId);
+ Boolean complete(Long taskId, Long userId, String from);
- Boolean cancel(Long taskId, Long userId);
+ Boolean cancel(Long taskId, Long userId, String from);
LaneDto checkoutOriginLane(Task task);
--
Gitblit v1.9.1