From 08915b05c42b2ba97a8bb0809aeb48802ae63b46 Mon Sep 17 00:00:00 2001
From: skyouc <958836976@qq.com>
Date: 星期五, 27 三月 2026 20:42:32 +0800
Subject: [PATCH] no message
---
src/main/java/com/zy/common/model/TaskDto.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/model/TaskDto.java b/src/main/java/com/zy/common/model/TaskDto.java
index 1da9a02..f8dc606 100644
--- a/src/main/java/com/zy/common/model/TaskDto.java
+++ b/src/main/java/com/zy/common/model/TaskDto.java
@@ -65,6 +65,31 @@
return false;
}
+ public static boolean hasAgv(List<TaskDto> list, TaskDto dto) {
+ if (Cools.isEmpty(list)) {
+ return false;
+ }
+ for (TaskDto taskDto : list) {
+ if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getAgvStaNo().equals(dto.getAgvStaNo())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ public static TaskDto findAgv(List<TaskDto> list, TaskDto dto) {
+ if (Cools.isEmpty(list)) {
+ return null;
+ }
+ for (TaskDto taskDto : list) {
+ if (dto.getLocNo().equals(taskDto.getLocNo()) && taskDto.getAgvStaNo().equals(dto.getAgvStaNo())) {
+ return taskDto;
+ }
+ }
+ return null;
+ }
+
public static TaskDto find(List<TaskDto> list, TaskDto dto) {
if (Cools.isEmpty(list)) {
return null;
@@ -118,8 +143,8 @@
continue;
}
}
- if (dto.getAnfme() > locDetl.getAnfme()) {
- throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�");
+ if (dto.getAnfme() > locDetl.getAnfme() && dto.getStandby1().equals(locDetl.getStandby1()) ) {
+ throw new CoolException("璁㈠崟鏁伴噺涓嶈兘澶т簬搴撳瓨鏁伴噺锛侊紒");
}
if (dto.getAnfme().equals(locDetl.getAnfme())) {
sameNumber++;
--
Gitblit v1.9.1