diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
index 5755525d6..95c66d924 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/dto/LoadCarsDTO.java
@@ -206,4 +206,12 @@ public class LoadCarsDTO implements Serializable {
 
 	private Long endWarehouseId;
 
+	private String driverName;
+	private String driverMobile;
+	private String carNumber;
+	private String endWarehouseNames;
+	private String arriveTime;
+	private String createUserName;
+	private String createTime;
+
 }
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
index 585bd2db6..f0a22db02 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadMapper.xml
@@ -82,6 +82,42 @@
         <if test="param.arriveTimeEnd != null ">
             and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
         </if>
+        <if test="param.driverName != null and param.driverName != ''">
+            and ltcl.driver_name like CONCAT('%',#{param.driverName},'%')
+        </if>
+        <if test="param.driverMobile != null and param.driverMobile != ''">
+            and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
+        </if>
+        <if test="param.driverMobile != null and param.driverMobile != ''">
+            and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
+        </if>
+        <if test="param.driverMobile != null and param.driverMobile != ''">
+            and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
+        </if>
+        <if test="param.driverMobile != null and param.driverMobile != ''">
+            and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
+        </if>
+        <if test="param.carNumber != null and param.carNumber != ''">
+            and ltcl.car_number like CONCAT('%',#{param.carNumber},'%')
+        </if>
+        <if test="param.startWarehouseName != null and param.startWarehouseName != ''">
+            and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%')
+        </if>
+        <if test="param.endWarehouseNames != null and param.endWarehouseNames != ''">
+            and ltcl.end_warehouse_names like CONCAT('%',#{param.endWarehouseNames},'%')
+        </if>
+        <if test="param.createUserName != null and param.createUserName != ''">
+            and ltcl.create_user_name like CONCAT('%',#{param.createUserName},'%')
+        </if>
+        <if test="param.arriveTime != null ">
+            and  DATE_FORMAT(ltcl.arrive_time,'%y%d%m') = DATE_FORMAT(#{param.arriveTime},'%y%d%m')
+        </if>
+        <if test="param.startTime != null ">
+            and  DATE_FORMAT(ltcl.start_time,'%y%d%m') = DATE_FORMAT(#{param.startTime},'%y%d%m')
+        </if>
+        <if test="param.createTime != null ">
+            and  DATE_FORMAT(ltcl.create_time,'%y%d%m') = DATE_FORMAT(#{param.createTime},'%y%d%m')
+        </if>
         group by ltcl.id,ltcl.cars_no,
                  ltcl.plan_loading_number,
                  ltcl.real_loading_number,
@@ -170,6 +206,36 @@
         <if test="param.arriveTimeEnd != null ">
             and ltcl.arrive_time &lt;= #{param.arriveTimeEnd}
         </if>
+        <if test="param.driverName != null and  param.driverName != ''">
+            and ltcl.driver_name like CONCAT('%',#{param.driverName},'%')
+        </if>
+        <if test="param.driverMobile != null and  param.driverMobile != ''">
+            and ltcl.driver_mobile like CONCAT('%',#{param.driverMobile},'%')
+        </if>
+        <if test="param.carNumber != null and  param.carNumber != ''">
+            and ltcl.driver_mobile like CONCAT('%',#{param.carNumber},'%')
+        </if>
+        <if test="param.startWarehouseName != null and  param.startWarehouseName != ''">
+            and ltcl.start_warehouse_name like CONCAT('%',#{param.startWarehouseName},'%')
+        </if>
+        <if test="param.endWarehouseNames != null and  param.endWarehouseNames != ''">
+            and ltcl.end_warehouse_names like CONCAT('%',#{param.endWarehouseNames},'%')
+        </if>
+        <if test="param.createUserName != null and  param.createUserName != ''">
+            and ltcl.create_user_name like CONCAT('%',#{param.createUserName},'%')
+        </if>
+        <if test="param.operator != null and  param.operator != ''">
+            and ltcl.operator like CONCAT('%',#{param.operator},'%')
+        </if>
+        <if test="param.arriveTime != null ">
+           AND DATE_FORMAT(ltcl.arrive_time,'%y%d%m') = DATE_FORMAT(#{param.arriveTime},'%y%d%m')
+        </if>
+        <if test="param.startTime != null ">
+           AND DATE_FORMAT(ltcl.start_time,'%y%d%m') = DATE_FORMAT(#{param.startTime},'%y%d%m')
+        </if>
+        <if test="param.createTime != null ">
+           AND DATE_FORMAT(ltcl.create_time,'%y%d%m') = DATE_FORMAT(#{param.createTime},'%y%d%m')
+        </if>
         group by ltcl.id,ltcl.cars_no,
         ltcl.plan_loading_number,
         ltcl.real_loading_number,
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
index bc2667475..4b6bf7a4e 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/controller/WarehouseWaybillController.java
@@ -290,8 +290,13 @@ public class WarehouseWaybillController extends BladeController {
 				myWatchWarehouse.forEach(warehouseEntity -> warehouseIds.add(warehouseEntity.getId()));
 			}
 			waybillDTO.setWarehouseIds(warehouseIds);
+			List<Long> idslist = new ArrayList<>();
+			if (!Objects.isNull(waybillDTO.getIds())){
+				List<Long> ids = Func.toLongList(",", waybillDTO.getIds());
+				idslist .addAll(ids) ;
+			}
 
-			List<ExportWarehouseWaybillVO> list = warehouseWaybillService.exportWaybillList(waybillDTO);
+			List<ExportWarehouseWaybillVO> list = warehouseWaybillService.exportWaybillList(waybillDTO,idslist);
 
 			fileNameStringBuffer.append(DateUtil.format(DateUtil.now(), DateUtil.PATTERN_DATE));
 			//导出ls
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
index 23cbcf63e..eac25f05b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/dto/WarehouseWaybillDTO.java
@@ -73,5 +73,6 @@ public class WarehouseWaybillDTO extends WarehouseWaybillEntity {
 	private String checkTimeEndStr;
 	private Date checkTimeStartDate;
 	private Date checkTimeEndDate;
+	private String ids;
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
index f9e2dc6ed..e0f0dabd6 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.java
@@ -69,7 +69,7 @@ public interface WarehouseWaybillMapper extends BaseMapper<WarehouseWaybillEntit
 
 	List<WarehouseWaybillEntity> findWaybillBilllByWaybillNos(@Param("waybillNos") List<String> waybillNos);
 
-    List<ExportWarehouseWaybillVO> exportWaybillList(@Param("param") WarehouseWaybillDTO waybillDTO);
+    List<ExportWarehouseWaybillVO> exportWaybillList(@Param("param") WarehouseWaybillDTO waybillDTO,@Param("idsList") List<Long> idsList);
 
     void deleteByWaybillNo(@Param("waybillNo") String waybillNo);
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
index 04b414089..3b1f3d51a 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillMapper.xml
@@ -1013,6 +1013,12 @@
                 #{item}
             </foreach>
         </if>
+        <if test="idsList != null">
+            and lww.id in
+            <foreach collection="idsList" item="id" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
         <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
             and (
             lww.departure_warehouse_id in
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
index 8708a3d9d..cb9005bee 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillService.java
@@ -81,7 +81,7 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
 
 	List<WarehouseWaybillEntity> findWaybillBilllByWaybillNos(List<String> waybillNos);
 
-    List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO);
+    List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO,List<Long> list);
 
     void deleteByWaybillNo(String waybillNo);
 
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
index 57d989c4c..8027e8c2e 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillServiceImpl.java
@@ -888,7 +888,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 	}
 
 	@Override
-	public List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO) {
+	public List<ExportWarehouseWaybillVO> exportWaybillList(WarehouseWaybillDTO waybillDTO,List<Long> idsList) {
 
 		waybillDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getDocumentMakingTimeStartStr()));
 		waybillDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getDocumentMakingTimeEndStr()));
@@ -899,7 +899,7 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
 		waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
 
-		List<ExportWarehouseWaybillVO> list = baseMapper.exportWaybillList(waybillDTO);
+		List<ExportWarehouseWaybillVO> list = baseMapper.exportWaybillList(waybillDTO,idsList);
 
 		list.forEach(item -> {
 			item.setPayType(DictBizCache.getValue(DictBizConstant.OPEN_ORDER_PAY_TYPE, item.getPayType()));