From db593cf1a355406e819547331861f9aa8b4ef8ea Mon Sep 17 00:00:00 2001
From: zane <zane0312@foxmail.com>
Date: Sat, 14 Sep 2024 15:57:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/inout/FilterOrderRequest.java  |  2 +-
 .../com/glxp/api/req/inout/IoSplitCodeRequest.java  |  4 ++++
 .../resources/mybatis/mapper/inout/IoOrderDao.xml   | 13 ++++++++++---
 .../mybatis/mapper/inout/IoSplitCodeMapper.xml      |  7 +++++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
index 4dca2fd26..dca7c3db3 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderRequest.java
@@ -199,7 +199,7 @@ public class FilterOrderRequest extends ListPageRequest {
     private String unionRemark;
 
     private String remark;
-    private String keyWords;
+    private String keywords;
     private Integer confirmStatus;
     private Boolean filterSelected;
     private List<String> inOrders;
diff --git a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
index c8297c8fa..c39102832 100644
--- a/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/IoSplitCodeRequest.java
@@ -134,6 +134,10 @@ public class IoSplitCodeRequest extends ListPageRequest {
      * 工位
      */
     private Long workPlaceCode;
+    /**
+     * 关键字搜索
+     */
+    private String keywords;
 
 
 
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
index 51284fb6b..7e99b4b4b 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDao.xml
@@ -54,9 +54,9 @@
             <if test="productType != null and productType != ''">
                 AND io.productType = #{productType}
             </if>
-            <if test="keyWords != null and keyWords != ''">
-                AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))
-            </if>
+<!--            <if test="keyWords != null and keyWords != ''">-->
+<!--                AND (aw.name like concat('%', #{keyWords}, '%') or bc.name like concat('%', #{keyWords}, '%'))-->
+<!--            </if>-->
 
             <if test="corpName != null and corpName != ''">
                 AND (SELECT NAME FROM auth_warehouse aw2 WHERE aw2.CODE = io.fromInvCode) like
@@ -191,6 +191,13 @@
             <if test="fromPatientCode != null">
                 AND io.fromPatientCode = #{fromPatientCode}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (io.billNo like concat('%', #{keywords}, '%')
+                or io.fromCorp like concat('%', #{keywords}, '%')
+                or io.workPlaceCode like concat('%', #{keywords}, '%')
+                or io.busType like concat('%', #{keywords}, '%')
+                or io.fromType like concat('%', #{keywords}, '%'))
+            </if>
 
             <if test="supInoivceSearch != null">
                 <if test="invoiceActions1 != null and invoiceActions2 == null">
diff --git a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
index fe814c71f..425e9c5a8 100644
--- a/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoSplitCodeMapper.xml
@@ -39,6 +39,13 @@
             <if test=" workPlaceCode != null">
                 AND workPlaceCode = #{workPlaceCode}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and (isc.workPlaceCode like concat('%', #{keywords}, '%')
+                or isc.nameCode like concat('%', #{keywords}, '%')
+                or isc.batchNo like concat('%', #{keywords}, '%')
+                or isc.supId like concat('%', #{keywords}, '%')
+                or isc.invCode like concat('%', #{keywords}, '%'))
+            </if>
         </where>
     </select>
 </mapper>