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 | 28 +++++++++++++++++++++++++---
1 files changed, 25 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 dc8b6df..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
@@ -1,6 +1,10 @@
package com.zy.acs.manager.manager.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.acs.manager.common.domain.BaseParam;
+import com.zy.acs.manager.common.domain.PageParam;
+import com.zy.acs.manager.common.domain.PageResult;
+import com.zy.acs.manager.core.domain.LaneDto;
import com.zy.acs.manager.manager.entity.Task;
import com.zy.acs.manager.manager.enums.TaskStsType;
@@ -9,18 +13,36 @@
public interface TaskService extends IService<Task> {
+ PageResult<Task> pageRel(PageParam<Task, BaseParam> pageParam);
+
String generateSeqNum();
Task pick(TaskStsType taskStsType);
- Task selectByUuid(String uuid);
+ Task selectBySeqNum(Long busId, String seqNum);
List<Task> selectBySts(TaskStsType taskStsType);
List<Task> selectInSts(Long agvId, TaskStsType... taskStsTypes);
- void operateTaskSts(Integer taskId, Boolean finish);
-
List<Map<String, Object>> selectStatByLastSevenDays();
+ Boolean complete(Long taskId, Long userId, String from);
+
+ Boolean cancel(Long taskId, Long userId, String from);
+
+ LaneDto checkoutOriginLane(Task task);
+
+ LaneDto checkoutDestinationLane(Task task);
+
+ List<Task> findRunningTasksByLaneHash(String laneHash);
+
+ List<Task> findTransportTasksByAgv(Long agvId);
+
+ Integer findTransportTasksCountByAgv(Long agvId);
+
+ Task findLatestTask(Long agvId, TaskStsType taskSts);
+
+ void maintainLocAndSta(Task task);
+
}
--
Gitblit v1.9.1