From d0c03c571ea92c6c527fbc151fbea762571ee7cc Mon Sep 17 00:00:00 2001
From: "han\\hanst" <songtao.han@xujiesoft.com>
Date: Sat, 8 Nov 2025 09:03:27 +0800
Subject: [PATCH] =?UTF-8?q?AGV=E9=BB=98=E8=AE=A4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/automatedWarehouse/AgvTaskMapper.xml    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/automatedWarehouse/AgvTaskMapper.xml b/src/main/resources/mapper/automatedWarehouse/AgvTaskMapper.xml
index 90ff070..ad16158 100644
--- a/src/main/resources/mapper/automatedWarehouse/AgvTaskMapper.xml
+++ b/src/main/resources/mapper/automatedWarehouse/AgvTaskMapper.xml
@@ -63,9 +63,12 @@
         <if test="data.palletId != null and data.palletId != ''">
             AND pallet_id LIKE CONCAT('%', #{data.palletId}, '%')
         </if>
-        <if test="data.status != null and data.status != ''">
+        <if test="data.status != null and data.status != '' and data.status!='未完成'">
             AND status = #{data.status}
         </if>
+        <if test="data.status != null and data.status == '未完成'">
+            AND status != '已完成' AND status !='已取消'
+        </if>
         <if test="data.startDate != null and data.startDate != ''">
             AND CONVERT(VARCHAR(10), created_time, 23) &gt;= #{data.startDate}
         </if>