diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index df56454c0..80f710b37 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -265,6 +265,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="params.sendSiteCode != null and params.sendSiteCode != ''">
                     and ewb.send_site_code=#{params.sendSiteCode}
                 </if>
+
+                <if test="params.sendCountry != null and params.sendCountry != ''">
+                    and ewb.send_country=#{params.sendCountry}
+                </if>
+
+                <if test="params.receiveCountry != null and params.receiveCountry != ''">
+                    and ewb.receive_country=#{params.receiveCountry}
+                </if>
+
+                <if test="params.transLineType != null and params.transLineType != ''">
+                    and ewb.trans_line_type=#{params.transLineType}
+                </if>
+
+                <if test="params.productType != null and params.productType != ''">
+                    and ewb.product_type=#{params.productType}
+                </if>
             )
 
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 57c1ddf09..9f3bf713f 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -1075,6 +1075,13 @@
                 and a.order_date <![CDATA[ <= ]]>  #{params.endOrderDate}
             </if>
 
+            <if test="params.beginPickStartDate != null and params.beginPickStartDate != ''">
+                and a.pick_start_date <![CDATA[ >= ]]>  #{params.beginPickStartDate}
+            </if>
+            <if test="params.endPickStartDate != null and params.endPickStartDate != ''">
+                and a.pick_start_date <![CDATA[ <= ]]>  #{params.endPickStartDate}
+            </if>
+
             <if test="payee != null  and payee != ''">
                 and a.payee=#{payee}
              </if>
@@ -3858,8 +3865,11 @@
     <select id="selectHistoryVirtualWaybill" resultMap="EmisWaybillResult">
         select a.id, a.bill_code,a.master_bill_code,a.problem_type, a.remark,a.fee_remark
         from emis_waybill a
-        where  a.del_flag = '0' and
-        a.problem_type in (173,170)
+        where a.del_flag = '0'
+          and exists (
+        select 1 from emis_waybill_problem_info c where a.bill_code = c.bill_code and c.problem_type in (173,170)
+        and c.del_flag = '0'
+        )
           and (master_bill_code is null or master_bill_code='' or master_bill_code=' ')
         order by a.create_time desc
         limit #{offset}, #{pageSize}