From 9611dc686299be640ce5e5f5990c747765161ec7 Mon Sep 17 00:00:00 2001
From: chen.llin <1442464845@qq.comm>
Date: 星期三, 21 一月 2026 10:59:38 +0800
Subject: [PATCH] agv逻辑调整2
---
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index b8114ca..0974a79 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -742,6 +742,7 @@
.eq("barcode", completedTask.getBarcode())
.in("io_type", 110, 101) // 绌烘澘鍑哄簱鎴栧叏鏉垮嚭搴�
.eq("wrk_sts", 7) // 寰呭懠鍙獳GV鐘舵��
+ .andNew("(is_deleted = 0)")
);
if (!existingTasks.isEmpty()) {
log.info("浠诲姟ID锛歿}鐨勬墭鐩樼爜锛歿}宸插瓨鍦ㄧ┖鎵�/婊℃墭鍑哄簱浠诲姟锛岃烦杩囩敓鎴�", completedTask.getId(), completedTask.getBarcode());
@@ -862,6 +863,7 @@
.eq("task_type", "agv")
.eq("wrk_sts", 8L) // 鍙鏌ユ鍦ㄦ惉杩愮姸鎬佺殑浠诲姟
.in("io_type", 101, 110) // 鍑哄簱鍒扮紦瀛樺尯鐨勪换鍔＄被鍨�
+ .andNew("(is_deleted = 0)")
);
// 濡傛灉鏈夋鍦ㄦ惉杩愮殑浠诲姟锛屼笖宸ヤ綔妗ｆ湭瀹屾垚锛屽垯涓嶅垎閰嶇紦瀛樺簱浣�
@@ -1176,6 +1178,7 @@
.eq("task_type", "agv")
.eq("wrk_sts", 8L) // 鍙鏌ユ鍦ㄦ惉杩愮姸鎬佺殑浠诲姟
.in("io_type", checkIoTypes)
+ .andNew("(is_deleted = 0)")
);
if (!transportingTasks.isEmpty()) {
--
Gitblit v1.9.1