From c91310b7db476924026995f9c00853fa7e381abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E9=B9=8F=E9=A3=9E?= <rakor2010@gmail.com>
Date: Tue, 12 May 2026 11:01:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(search):=20=E5=90=88=E5=B9=B6=E5=A4=9A?=
 =?UTF-8?q?=E4=B8=AA=E6=A8=A1=E7=B3=8A=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=B8=BA=E5=85=B3=E9=94=AE=E5=AD=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 用单一关键字参数替代了物料编码、图号、检测单号、供应商编号和供应商名称的多个模糊查询字段
- 修改Mapper层SQL，使用关键字同时匹配多个字段实现模糊搜索
- 简化查询条件，提升接口调用便捷性和代码维护性
- 更新查询QO类，移除多余字段，增加关键字字段以支持统一搜索逻辑
---
 ...QmsIncomingInspectionTaskTodoSearchQO.java | 27 +++----------------
 .../QmsIncomingInspectionTaskMapper.xml       | 22 ++++++---------
 2 files changed, 12 insertions(+), 37 deletions(-)

diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java
index 2aae7d34..23f90edc 100644
--- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java
+++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsIncomingInspectionTaskTodoSearchQO.java
@@ -11,32 +11,13 @@ import lombok.EqualsAndHashCode;
 public class QmsIncomingInspectionTaskTodoSearchQO extends PageQO {
 
     /**
-     * 物料编码（模糊匹配）
+     * 关键字
      */
-    private String materialNo;
+    private String key;
 
     /**
-     * 物料图号（模糊匹配）
-     */
-    private String drawingNo;
-
-    /**
-     * 检测单号（模糊匹配）
-     */
-    private String taskNo;
-
-    /**
-     * 供应商编号（模糊匹配）
-     */
-    private String supplierCode;
-
-    /**
-     * 供应商名称（模糊匹配）
-     */
-    private String supplierName;
-
-    /**
-     * 检验状态：0=待检，1=检验中，2=已检（不传则默认查 0 和 1）
+     * 检验状态，不传则默认查 0 和 1
+     * 0=待检，1=检验中，2=已检
      */
     private Short inspectionStatus;
 
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
index be24adf1..db38d286 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskMapper.xml
@@ -160,20 +160,14 @@
             <if test="request.isOverdue != null">
                 AND t.is_overdue = #{request.isOverdue}
             </if>
-            <if test="request.materialNo != null and request.materialNo != ''">
-                AND m.material_no ilike concat('%', #{request.materialNo}, '%')
-            </if>
-            <if test="request.drawingNo != null and request.drawingNo != ''">
-                AND m.drawing_no ilike concat('%', #{request.drawingNo}, '%')
-            </if>
-            <if test="request.taskNo != null and request.taskNo != ''">
-                AND t.task_no ilike concat('%', #{request.taskNo}, '%')
-            </if>
-            <if test="request.supplierCode != null and request.supplierCode != ''">
-                AND t.supplier_code ilike concat('%', #{request.supplierCode}, '%')
-            </if>
-            <if test="request.supplierName != null and request.supplierName != ''">
-                AND t.supplier_name ilike concat('%', #{request.supplierName}, '%')
+            <if test="request.key != null and request.key != ''">
+                AND (m.material_no ilike concat('%', #{request.key}, '%')
+                    or m.material_desc ilike concat('%', #{request.key}, '%')
+                    or m.drawing_no ilike concat('%', #{request.key}, '%')
+                    or t.task_no ilike concat('%', #{request.key}, '%')
+                    or t.supplier_code ilike concat('%', #{request.key}, '%')
+                    or t.supplier_name ilike concat('%', #{request.key}, '%')
+                )
             </if>
         </where>
         ORDER BY t.required_finish_time ASC