diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index 8f30bfcbd..4f439a529 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -178,35 +178,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 )
             </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')
+
+            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')
+
+                <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 test="params.salesmen != null and params.salesmen != ''">
+                    and ewb.salesmen like concat('%', #{params.salesmen}, '%')
+                </if>
+
+                <if test="params.sendName != null and params.sendName != ''">
+                    and ewb.send_name like concat('%', #{params.sendName}, '%')
+                </if>
+
+                <if test="params.sendMobile != null and params.sendMobile != ''">
+                    and ewb.send_mobile  like concat('%', #{params.sendMobile}, '%')
+                </if>
+
+                <if test="params.sendCompany != null and params.sendCompany != ''">
+                    and ewb.send_company like concat('%', #{params.sendCompany}, '%')
+                </if>
+
+                <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
                     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')
-                        <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>
+
 
             <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
                 and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}