From d0fa45146ca5927f7125c431f8f5fe0b7913ecfe Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 29 Dec 2024 14:10:31 +0800
Subject: [PATCH] md

---
 .../mapper/EmisWarehouseInMapper.xml          | 44 +++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index b19699d17..8f30bfcbd 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -86,14 +86,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and confirm_status= '2'
             </if>
 
-            <if test="params.searchValue != null  and params.searchValue !='' ">
+            <if test="searchValue != null  and 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}, '%')
+                    a.in_no like concat('%', #{searchValue}, '%')
+                    or a.bill_code like concat('%', #{searchValue}, '%')
+                    or a.order_sn like concat('%', #{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}, '%')
+                            ew.receive_name like concat('%', #{searchValue}, '%') or ew.receive_mobile like concat('%', #{searchValue}, '%')
                         )
                     )
                 )
@@ -165,14 +165,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and confirm_status= '2'
             </if>
 
-            <if test="params.searchValue != null  and params.searchValue !='' ">
+            <if test="searchValue != null  and 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}, '%')
+                a.in_no like concat('%', #{searchValue}, '%')
+                or a.bill_code like concat('%', #{searchValue}, '%')
+                or a.order_sn like concat('%', #{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}, '%')
+                ew.receive_name like concat('%', #{searchValue}, '%') or ew.receive_mobile like concat('%', #{searchValue}, '%')
                 )
                 )
                 )
@@ -180,14 +180,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
             <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                 and EXISTS (
-                    select 1 from emis_waybill  ewb where a.bill_code=ewb.bill_code and  ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3') and ewb.into_warehouse_code=#{params.privSiteCode}
+                    select 1 from emis_waybill  ewb
+                    where a.bill_code=ewb.bill_code and  ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3')
+                    and ewb.into_warehouse_code=#{params.privSiteCode}
+                    <if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
+                        and ewb.pick_start_date <![CDATA[ >= ]]>  #{params.beginPickStartDate}
+                    </if>
+                    <if test="params.endPickStartDate != null and params.endPickStartDate != ''">
+                        and ewb.pick_start_date <![CDATA[ <= ]]>  #{params.endPickStartDate}
+                    </if>
+
                 )
             </if>
 
             <if test="params.privSiteCode != null and params.privSiteCode == '88888'">
                 and EXISTS (
-                     select 1 from emis_waybill  ewb where a.bill_code=ewb.bill_code and  ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3')
-                )
+                     select 1 from emis_waybill  ewb
+                     where a.bill_code=ewb.bill_code and  ewb.pickup_method in('1','3') and ewb.order_status in ('0','1','3')
+                        <if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
+                            and ewb.pick_start_date <![CDATA[ >= ]]>  #{params.beginPickStartDate}
+                        </if>
+                        <if test="params.endPickStartDate != null and params.endPickStartDate != ''">
+                            and ewb.pick_start_date <![CDATA[ <= ]]>  #{params.endPickStartDate}
+                        </if>
+
+
+            )
             </if>
 
             <if test="params.beginCreateTime != null and params.beginCreateTime != ''">