diff --git a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
index e4b92e806..ac07742ab 100644
--- a/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWarehouseInMapper.xml
@@ -143,6 +143,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and used_status= '0'
+ and stock_in_flag=#{stockInFlag}
+
+
+ and confirm_status= '0'
+
+
+
+ and confirm_status= '1'
+
+
+
+ and confirm_status= '2'
+
+
+
+ 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}, '%')
+ )
+ )
+ )
+
+
order by create_time desc