From 1516a5104fef0df1c70de9dbd1fb7fcbf50c9f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com>
Date: Thu, 20 Jul 2023 19:02:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=80=E6=9D=A5=E5=8D=95=E4=BD=8D=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../glxp/api/req/inout/FilterOrderDetailResultRequest.java  | 1 +
 .../mybatis/mapper/inout/IoOrderDetailResultDao.xml         | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
index f7ce7869b..24e5b8981 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -16,6 +16,7 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
      * 单据号
      */
     private String orderIdFk;
+    private String keyWords;
 
     /**
      * 耗材字典ID
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index cc532bb24..cd5aefb43 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -33,11 +33,17 @@
         FROM io_order_detail_result a2
                      LEFT JOIN io_order a1 ON a1.billNo = a2.orderIdFk
                      LEFT JOIN basic_corp b1 ON b1.erpId = a1.fromCorp
+                     left join auth_warehouse aw on aw.code = a1.fromInvCode
+
+
         <where>
             a1.status = 7
             <if test="orderIdFk != null and orderIdFk != ''">
                 AND a2.orderIdFk = #{orderIdFk}
             </if>
+            <if test="keyWords != null and keyWords != ''">
+                AND (aw.name like concat('%', #{keyWords}, '%') or b1.name like concat('%', #{keyWords}, '%'))
+            </if>
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>