From e5db2f5c88887e45f809767098629afdc73a14de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?=
 <qi.ruan@xujiesoft.com>
Date: Mon, 9 Nov 2026 13:16:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E5=92=8C=E6=8E=A8=E9=80=81?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/vo/HaiAnWmsTransportTask.java                  | 4 ++--
 .../service/impl/HaiAnAgvTaskServiceImpl.java             | 8 ++++++++
 .../mapper/autoWareHourceHaian/HaiAnAgvTaskMapper.xml     | 7 ++++++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/vo/HaiAnWmsTransportTask.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/vo/HaiAnWmsTransportTask.java
index 0cf85b15..2cc43b8e 100644
--- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/vo/HaiAnWmsTransportTask.java
+++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/entity/vo/HaiAnWmsTransportTask.java
@@ -79,7 +79,7 @@ public class HaiAnWmsTransportTask {
     private String fromLocation;
 
     /**
-     * 目标库位 - rqrq
+     * 目标站点，来源 haian_wms_transport_task.to_location。AGV任务页按输入片段模糊筛选。 - rqrq
      */
     private String toLocation;
 
@@ -169,7 +169,7 @@ public class HaiAnWmsTransportTask {
     private String palletType;
 
     /**
-     * 目标区域（业务区域编码area_id） - rqrq
+     * 目标区域，来源 haian_wms_transport_task.to_area，存 haian_area.area_id。AGV任务页下拉按这个编码精确筛选，名称只用于列表展示。 - rqrq
      */
     private String toArea;
 
diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnAgvTaskServiceImpl.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnAgvTaskServiceImpl.java
index 8f6cfd71..a416e74e 100644
--- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnAgvTaskServiceImpl.java
+++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnAgvTaskServiceImpl.java
@@ -96,6 +96,14 @@ public class HaiAnAgvTaskServiceImpl implements HaiAnAgvTaskService {
         if (data.getSize() == null || data.getSize() <= 0) {
             data.setSize(20);
         }
+        // 目标站点去空格后做模糊匹配，目标区域去空格后按区域编码精确匹配；空白视为不筛选 - rqrq
+        if (StringUtils.hasText(data.getToLocation())) {
+            data.setToLocation(data.getToLocation().trim());
+        }
+        if (StringUtils.hasText(data.getToArea())) {
+            data.setToArea(data.getToArea().trim());
+        }
+        // 按当前筛选分页查运输任务；站点模糊、区域精确，失败由调用方返回错误，不改任务数据 - rqrq
         IPage<HaiAnWmsTransportTask> page = haiAnAgvTaskMapper.getTransportTaskList(
                 new Page<HaiAnWmsTransportTask>(data.getPage(), data.getSize()),
                 data
diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnAgvTaskMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnAgvTaskMapper.xml
index b3bd1ae8..7f79d918 100644
--- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnAgvTaskMapper.xml
+++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnAgvTaskMapper.xml
@@ -139,8 +139,13 @@
         <if test="data.agvCode != null and data.agvCode != ''">
             AND t.agv_code = #{data.agvCode}
         </if>
+        <!-- 目标站点按输入片段模糊匹配，和任务单号、托盘编码同一口径 - rqrq -->
         <if test="data.toLocation != null and data.toLocation != ''">
-            AND t.to_location = #{data.toLocation}
+            AND t.to_location LIKE CONCAT('%', #{data.toLocation}, '%')
+        </if>
+        <!-- 目标区域按下拉选中的 area_id 精确匹配，空值表示不限制 - rqrq -->
+        <if test="data.toArea != null and data.toArea != ''">
+            AND t.to_area = #{data.toArea}
         </if>
         <if test="data.palletId != null and data.palletId != ''">
             AND t.pallet_id LIKE CONCAT('%', #{data.palletId}, '%')