From 4316af0d9b6c354413c9ae392746634deaf6864a Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 8 Sep 2024 18:41:39 +0800
Subject: [PATCH] Md

---
 .../mapper/EmisWarehouseInMapper.xml          | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index bb06875d0..b465816bc 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -44,7 +44,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <select id="selectEmisWarehouseInListByOms" parameterType="EmisWarehouseIn" resultMap="EmisWarehouseInResult">
-        <include refid="selectEmisWarehouseInVo"/>
+        select id, serial_no, in_no, order_sn, bill_code, customer_code, customer_name, entry_date, confirm_status, confirm_date, used_status, status, stock_in_flag, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site
+        from emis_warehouse_in a
         <where>
             del_flag='0'
             <if test="id != null "> and id = #{id}</if>
@@ -73,18 +74,31 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="stockInFlag != null  and stockInFlag != ''"> and stock_in_flag=#{stockInFlag}</if>
 
-            <if test="queryStatusType != null  and queryStatusType == 0">
+            <if test="params.queryStatusType != null  and params.queryStatusType == 0">
                 and confirmStatus= '0'
             </if>
 
-            <if test="queryStatusType != null  and queryStatusType == 1">
+            <if test="params.queryStatusType != null  and params.queryStatusType == 1">
                 and confirmStatus= '1'
             </if>
 
-            <if test="queryStatusType != null  and queryStatusType == 2">
+            <if test="params.queryStatusType != null  and params.queryStatusType == 2">
                 and confirmStatus= '2'
             </if>
 
+            <if test="params.searchValue != null  and params.searchValue !='' ">
+                and (
+                    a.in_no like concat('%', #{params.searchValue}, '%')
+                    or a.bill_code like concat('%', #{params.searchValue}, '%')
+                    or a.order_sn like concat('%', #{params.searchValue}, '%')
+                    or exists (
+                        select 1 from emis_waybill ew where a.bill_code=ew.bill_code and (
+                            ew.receive_name like concat('%', #{params.searchValue}, '%') or ew.receive_mobile like concat('%', #{params.searchValue}, '%')
+                        )
+                    )
+                )
+            </if>
+
 
         </where>
         order by create_time desc