diff --git a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java
index b68114506..5a9a0e540 100644
--- a/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java
+++ b/blade-service-api/logpm-statisticsdata-api/src/main/java/com/logpm/statistics/feign/IOrderInfoClient.java
@@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 @FeignClient(
-	value = ModuleNameConstant.APPLICATION_BASICDATA_NAME
+	value = ModuleNameConstant.APPLICATION_STATISTICSDATA_NAME
 )
 public interface IOrderInfoClient {
 
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
index ec1eb3a9f..e8ec3f7f3 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/entity/TrunklineCarsLoadScanEntity.java
@@ -142,4 +142,16 @@ public class TrunklineCarsLoadScanEntity extends TenantEntity {
 	@ApiModelProperty(name = "卸车托盘编码",notes = "")
 	private String unloadTrayCode;
 
+	/** 顾客名字 */
+	@ApiModelProperty(name = "顾客名字",notes = "")
+	private String customerName;
+
+	/** 顾客电话 */
+	@ApiModelProperty(name = "顾客电话",notes = "")
+	private String customerTelephone;
+
+	/** 顾客地址 */
+	@ApiModelProperty(name = "顾客地址",notes = "")
+	private String customerAddress;
+
 }
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
index dd2c2f5df..317b8b479 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillExportVO.java
@@ -187,17 +187,17 @@ public class FinanceWaybillExportVO implements Serializable {
 	@ExcelProperty(value = "回扣")
 	private BigDecimal rebate;
 	@ExcelProperty(value = "品类数量")
-	private BigDecimal goodsTypeNum;
+	private String goodsTypeNum;
 	@ExcelProperty(value = "品类开单运费")
-	private BigDecimal goodsTypePrice;
+	private String goodsTypePrice;
 	@ExcelProperty(value = "品类系统配送单价")
-	private BigDecimal goodsTypeDeliveryPrice;
+	private String goodsTypeDeliveryPrice;
 	@ExcelProperty(value = "品类系统提货单价")
-	private BigDecimal goodsTypePickupPrice;
+	private String goodsTypePickupPrice;
 	@ExcelProperty(value = "品类系统运费单价")
-	private BigDecimal goodsTypeFreightPrice;
+	private String goodsTypeFreightPrice;
 	@ExcelProperty(value = "品类数")
-	private BigDecimal goodsTypeCount;
+	private Integer goodsTypeCount;
 
 
 
diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java
index 9d805d508..3a8d2e43d 100644
--- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java
+++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/vo/FinanceWaybillVO.java
@@ -47,6 +47,7 @@ public class FinanceWaybillVO implements Serializable {
 	private String cancleCheckUserName;
 	private Date cancleCheckTime;
 	private String waybillStatus;
+	private String waybillType;
 	private Date openTime;
 	private String goodsName;
 	private Integer totalCount;
@@ -75,12 +76,12 @@ public class FinanceWaybillVO implements Serializable {
 	private BigDecimal claimingValue;
 	private BigDecimal thirdOperationFee;
 	private BigDecimal rebate;
-	private BigDecimal goodsTypeNum;
-	private BigDecimal goodsTypePrice;
-	private BigDecimal goodsTypeDeliveryPrice;
-	private BigDecimal goodsTypePickupPrice;
-	private BigDecimal goodsTypeFreightPrice;
-	private BigDecimal goodsTypeCount;
+	private String goodsTypeNum;
+	private String goodsTypePrice;
+	private String goodsTypeDeliveryPrice;
+	private String goodsTypePickupPrice;
+	private String goodsTypeFreightPrice;
+	private Integer goodsTypeCount;
 
 
 
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java
index e10fd4560..d796428fd 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/listener/mq/WaybillCancleCheckListener.java
@@ -1,5 +1,6 @@
 package com.logpm.statistics.listener.mq;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import com.logpm.statistics.entity.StatisticsOrderInfoEntity;
@@ -46,12 +47,14 @@ public class WaybillCancleCheckListener {
 		//把orderInfoEntityList中所有元素的id放入一个集合
 		List<Long> orderInfoIdsList = orderInfoEntityList.stream().map(StatisticsOrderInfoEntity::getId).collect(Collectors.toList());
 
-		//删除订单
-		statisticsOrderInfoService.deleteListByOrderInfoIds(orderInfoIdsList);
-		//删除包件
-		trunklinePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
-		warehousePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
-		distributionPackageService.deleteListByOrderInfoIds(orderInfoIdsList);
+		if(CollUtil.isNotEmpty(orderInfoIdsList)){
+			//删除订单
+			statisticsOrderInfoService.deleteListByOrderInfoIds(orderInfoIdsList);
+			//删除包件
+			trunklinePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
+			warehousePackageService.deleteListByOrderInfoIds(orderInfoIdsList);
+			distributionPackageService.deleteListByOrderInfoIds(orderInfoIdsList);
+		}
 
 		log.info("#########cancleCheckWaybillIncomingData: 运单取消审核处理收入结算数据 结束 waybillId={}",waybillId);
 	}
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
index 018fd8233..f5c30d11f 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/StatisticsOrderInfoMapper.xml
@@ -64,8 +64,8 @@
         <if test="param.waybillNo != null and param.waybillNo != '' ">
             and Locate(#{param.waybillNo},lww.waybill_no) > 0
         </if>
-        <if test="param.orderNo != null and param.orderNo != '' ">
-            and Locate(#{param.orderNo},lww.order_code) > 0
+        <if test="param.orderCode != null and param.orderCode != '' ">
+            and Locate(#{param.orderCode},lww.order_code) > 0
         </if>
         <if test="param.shipper != null and param.shipper != '' ">
             and Locate(#{param.shipper},lww.shipper) > 0
@@ -194,8 +194,8 @@
         <if test="param.waybillNo != null and param.waybillNo != '' ">
             and Locate(#{param.waybillNo},lww.waybill_no) > 0
         </if>
-        <if test="param.orderNo != null and param.orderNo != '' ">
-            and Locate(#{param.orderNo},lww.order_code) > 0
+        <if test="param.orderCode != null and param.orderCode != '' ">
+            and Locate(#{param.orderCode},lww.order_code) > 0
         </if>
         <if test="param.shipper != null and param.shipper != '' ">
             and Locate(#{param.shipper},lww.shipper) > 0
@@ -405,24 +405,24 @@
         IFNULL(sum(lstp.num),0) totalNum,
         IFNULL(sum(lstp.weight),0) totalWeight,
         IFNULL(sum(lstp.volume),0) totalVolume,
-        IFNULL(sum(lstp.system_freight_price*lstp.num),0) systemFreightPrice,
-        IFNULL(sum(lstp.freight_price*lstp.num),0) freightPrice,
-        IFNULL(sum(lstp.system_pickup_price*lstp.num),0) systemPickupPrice,
-        IFNULL(sum(lstp.pickup_price*lstp.num),0) pickupPrice,
-        IFNULL(sum(lswp.warehuse_service_fee*lstp.num),0) warehouseServiceFee,
-        IFNULL(sum(lswp.warehouse_fee*lstp.num),0) warehouseFee,
-        IFNULL(sum(lswp.warehouse_manage_fee*lstp.num),0) warehouseManageFee,
-        IFNULL(sum(lswp.warehouse_sorting_fee*lstp.num),0) warehouseSortingFee,
-        IFNULL(sum(lswp.warehouse_operating_fee*lstp.num),0) warehouseOperatingFee,
-        IFNULL(sum(lsdp.system_delivery_fee*lstp.num),0) systemDeliveryFee,
-        IFNULL(sum(lsdp.delivery_service_fee*lstp.num),0) deliveryServiceFee,
-        IFNULL(sum(lsdp.delivery_fee*lstp.num),0) deliveryFee,
-        IFNULL(sum(lsdp.delivery_loading_fee*lstp.num),0) deliveryLoadingFee,
-        IFNULL(sum(lsdp.delivery_sorting_fee*lstp.num),0) deliverySortingFee,
-        IFNULL(sum(lsdp.delivery_upfloor_fee*lstp.num),0) deliveryUpfloorFee,
-        IFNULL(sum(lsdp.delivery_move_fee*lstp.num),0) deliveryMoveFee,
-        IFNULL(sum(lsdp.delivery_other_fee*lstp.num),0) deliveryOtherFee,
-        IFNULL(sum(lsdp.delivery_crossing_fee*lstp.num),0) deliveryCrossingFee
+        IFNULL(sum(lstp.system_freight_price),0) systemFreightPrice,
+        IFNULL(sum(lstp.freight_price),0) freightPrice,
+        IFNULL(sum(lstp.system_pickup_price),0) systemPickupPrice,
+        IFNULL(sum(lstp.pickup_price),0) pickupPrice,
+        IFNULL(sum(lswp.warehouse_service_fee),0) warehouseServiceFee,
+        IFNULL(sum(lswp.warehouse_fee),0) warehouseFee,
+        IFNULL(sum(lswp.warehouse_manage_fee),0) warehouseManageFee,
+        IFNULL(sum(lswp.warehouse_sorting_fee),0) warehouseSortingFee,
+        IFNULL(sum(lswp.warehouse_operating_fee),0) warehouseOperatingFee,
+        IFNULL(sum(lsdp.system_delivery_fee),0) systemDeliveryFee,
+        IFNULL(sum(lsdp.delivery_service_fee),0) deliveryServiceFee,
+        IFNULL(sum(lsdp.delivery_fee),0) deliveryFee,
+        IFNULL(sum(lsdp.delivery_loading_fee),0) deliveryLoadingFee,
+        IFNULL(sum(lsdp.delivery_sorting_fee),0) deliverySortingFee,
+        IFNULL(sum(lsdp.delivery_upfloor_fee),0) deliveryUpfloorFee,
+        IFNULL(sum(lsdp.delivery_move_fee),0) deliveryMoveFee,
+        IFNULL(sum(lsdp.delivery_other_fee),0) deliveryOtherFee,
+        IFNULL(sum(lsdp.delivery_crossing_fee),0) deliveryCrossingFee
         from logpm_statistics_trunkline_package lstp
         left join logpm_statistics_warehouse_package lswp on lswp.order_info_id = lstp.order_info_id and lswp.order_package_code = lstp.order_package_code and lswp.product_id = lstp.product_id
         left join logpm_statistics_distribution_package lsdp on lsdp.order_info_id = lswp.order_info_id and lsdp.order_package_code = lswp.order_package_code and lswp.product_id = lsdp.product_id
@@ -438,11 +438,13 @@
         IFNULL(sum(lstp.num),0) totalNum,
         IFNULL(sum(lstp.weight),0) totalWeight,
         IFNULL(sum(lstp.volume),0) totalVolume,
+        IFNULL(sum(lstp.system_freight_price),0)+IFNULL(sum(lstp.system_pickup_price),0)+IFNULL(sum(lswp.warehouse_service_fee),0)+IFNULL(sum(lsdp.delivery_service_fee),0) sysTotalFee,
+        IFNULL(sum(lstp.freight_price),0)+IFNULL(sum(lstp.pickup_price),0)+IFNULL(sum(lswp.warehouse_service_fee),0)+IFNULL(sum(lsdp.delivery_service_fee),0) totalFee,
         IFNULL(sum(lstp.system_freight_price),0) systemFreightPrice,
         IFNULL(sum(lstp.freight_price),0) freightPrice,
         IFNULL(sum(lstp.system_pickup_price),0) systemPickupPrice,
         IFNULL(sum(lstp.pickup_price),0) pickupPrice,
-        IFNULL(sum(lswp.warehuse_service_fee),0) warehouseServiceFee,
+        IFNULL(sum(lswp.warehouse_service_fee),0) warehouseServiceFee,
         IFNULL(sum(lswp.warehouse_fee),0) warehouseFee,
         IFNULL(sum(lswp.warehouse_manage_fee),0) warehouseManageFee,
         IFNULL(sum(lswp.warehouse_sorting_fee),0) warehouseSortingFee,
@@ -479,7 +481,7 @@
     </select>
 
     <select id="findCreateRencilitionOrderStatus" resultType="int">
-        select max(lsoi.create_reconciliation_order_status)
+        select IFNULL(max(lsoi.create_reconciliation_order_status),0)
         from logpm_statistics_order_info lsoi
         where 1=1
         and lsoi.waybill_id = #{waybillId}
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
index b47d7e15a..84bcd07c3 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/service/impl/StatisticsOrderInfoServiceImpl.java
@@ -82,17 +82,18 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		List<StatisticsOrderInfoVO> records = statisticsOrderInfoVOIPage.getRecords();
 		//把records中所有的orderInfoId放入一个集合
 		List<Long> orderInfoIdList = records.stream().map(StatisticsOrderInfoVO::getOrderInfoId).collect(Collectors.toList());
-
-		List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
-		//把orderPackageInfoList转化成以orderInfoId为key的Map
-		Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap = orderPackageInfoList.stream()
-			.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
-
-		records.forEach(statisticsOrderInfoVO -> {
-			Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
-			StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
-			BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
-		});
+		if(CollUtil.isNotEmpty(orderInfoIdList)){
+			List<StatisticsPackageFeeInfoVO> orderPackageInfoList = baseMapper.findPackageListByOrderIdsGroupById(orderInfoIdList);
+			//把orderPackageInfoList转化成以orderInfoId为key的Map
+			Map<Long, StatisticsPackageFeeInfoVO> orderPackageInfoMap = orderPackageInfoList.stream()
+				.collect(Collectors.toMap(StatisticsPackageFeeInfoVO::getOrderInfoId, statisticsPackageFeeInfoVO -> statisticsPackageFeeInfoVO));
+
+			records.forEach(statisticsOrderInfoVO -> {
+				Long orderInfoId = statisticsOrderInfoVO.getOrderInfoId();
+				StatisticsPackageFeeInfoVO statisticsPackageFeeInfoVO = orderPackageInfoMap.get(orderInfoId);
+				BeanUtil.copy(statisticsPackageFeeInfoVO, statisticsOrderInfoVO);
+			});
+		}
 
 		statisticsOrderInfoVOIPage.setRecords(records);
 		return statisticsOrderInfoVOIPage;
@@ -624,8 +625,7 @@ public class StatisticsOrderInfoServiceImpl extends BaseServiceImpl<StatisticsOr
 		});
 
 
-
-		return Collections.emptyList();
+		return records;
 	}
 
 	private void calculateReconcilitionOrder(StatisticsReconciliationOrderInfoEntity reconciliationOrderInfo) {
diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java
index 4a3aa1d4a..33fe7bcd8 100644
--- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java
+++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/vo/StatisticsPackageFeeInfoVO.java
@@ -17,6 +17,8 @@ public class StatisticsPackageFeeInfoVO implements Serializable {
 	private BigDecimal totalWeight;
 	private BigDecimal totalVolume;
 
+	private BigDecimal sysTotalFee;
+	private BigDecimal totalFee;
 
 	private BigDecimal systemFreightPrice;
 	private BigDecimal freightPrice;
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
index 80841d122..a3ca76a1c 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/OpenOrderController.java
@@ -1436,7 +1436,7 @@ public class OpenOrderController {
 	@ResponseBody
 	@PostMapping("/cancleCheckWaybill")
 	@ApiOperationSupport(order = 1)
-	@ApiOperation(value = "审核运单", notes = "传入openOrderDTO")
+	@ApiOperation(value = "取消审核运单", notes = "传入openOrderDTO")
 	public R cancleCheckWaybill(@RequestBody OpenOrderDTO openOrderDTO) {
 		String method = "############cancleCheckWaybill: ";
 		log.info(method + "请求参数{}", openOrderDTO);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
index 043151f81..0cf3dfcca 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java
@@ -2842,8 +2842,8 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405,"运单已作废");
 		}
 
-		Long checkUserId = warehouseWaybillEntity.getCheckUserId();
-		if(!Objects.isNull(checkUserId)){
+		Integer checkStatus = warehouseWaybillEntity.getCheckStatus();
+		if(checkStatus.equals(1)){
 			log.warn("##############checkWaybill: 运单已经审核 waybillId={}",waybillId);
 			return R.fail(405, "运单已经审核");
 		}
@@ -3683,7 +3683,6 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 			return R.fail(405,"运单已有预存单确认");
 		}
 
-
 		WarehouseWaybillEntity updateWaybillEntity = new WarehouseWaybillEntity();
 		updateWaybillEntity.setId(waybillId);
 		updateWaybillEntity.setCheckStatus(0);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 2a771a1dd..5188c84f5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -2909,6 +2909,10 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				distributionParcelListClient.updateOrderPackageCodeById(otherPackageId, "60");
 				distributionStockArticleClient.submitHandleNumByOrderId(1, articleId);
 
+				carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
+				carsLoadScanEntity.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
+				carsLoadScanEntity.setCustomerAddress(stockArticleEntity.getCustomerAddress());
+
 				remark = "有数据,不在当前仓,异常装车";
 				audio = "包件未入库";
 				if(StringUtils.isNotBlank(orderPackageCode)){
@@ -3003,8 +3007,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			if (StringUtil.isBlank(trayCode) && StringUtil.isBlank(orderPackageCode)) {
 				updownTypeClient.downPackageOrDelTray(orderPackageCode, warehouseId, "干线装车下架解托");
 			}
+			carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
+			carsLoadScanEntity.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
+			carsLoadScanEntity.setCustomerAddress(stockArticleEntity.getCustomerAddress());
+
 		}
 		carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
+
 		trunklineCarsLoadScanService.save(carsLoadScanEntity);
 		loadScanId = carsLoadScanEntity.getId();
 
@@ -3230,6 +3239,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			carsLoadScanEntity.setFinalNodeId(finalNodeId);
 			carsLoadScanEntity.setFinalNodeName(finalNodeName);
 			carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
+			carsLoadScanEntity.setCustomerName(stockArticleEntity.getCustomerName());
+			carsLoadScanEntity.setCustomerTelephone(stockArticleEntity.getCustomerTelephone());
+			carsLoadScanEntity.setCustomerAddress(stockArticleEntity.getCustomerAddress());
 			trunklineCarsLoadScanService.save(carsLoadScanEntity);
 			loadScanId = carsLoadScanEntity.getId();
 			List<TrunklineScanZeroDetailEntity> zeroDetailList = new ArrayList<>();
@@ -6308,10 +6320,18 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 				finalNodeName = finalNodeWarehouse.getName();
 			}
 			List<DistributionParcelListEntity> entityListByOrderCode = distributionParcelListClient.findEntityListByOrderCodeAndStatus(orderCode, warehouseId, "20", waybillNo);
+			//把entityListByOrderCode中所有stockArticleId放入一个Set集合
+			Set<Long> stockArticleIdSet = entityListByOrderCode.stream().map(DistributionParcelListEntity::getStockArticleId).collect(Collectors.toSet());
+			List<DistributionStockArticleEntity> stockArticleEntityList = distributionStockArticleClient.findListByIds(stockArticleIdSet);
+			//把stockArticleEntityList中所有元素转化成以id为key的Map
+			Map<Long, DistributionStockArticleEntity> stockArticleMap = stockArticleEntityList.stream().collect(Collectors.toMap(DistributionStockArticleEntity::getId, e1 -> e1));
+
 			int size = entityListByOrderCode.size();
 			if (planNum.equals(size + realNum)) {
 				for (DistributionParcelListEntity parcelListEntity : entityListByOrderCode) {
 					String orderPackageCode = parcelListEntity.getOrderPackageCode();
+					Long stockArticleId = parcelListEntity.getStockArticleId();
+					DistributionStockArticleEntity stockArticle = stockArticleMap.get(stockArticleId);
 					TrunklineCarsLoadScanEntity carsLoadScanEntity = new TrunklineCarsLoadScanEntity();
 					carsLoadScanEntity.setLoadId(loadId);
 					carsLoadScanEntity.setWarehouseId(warehouseId);
@@ -6334,6 +6354,11 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 					carsLoadScanEntity.setUnloadCheck(0);
 					carsLoadScanEntity.setIsSupple(0);
 					carsLoadScanEntity.setLoadingUserName(AuthUtil.getNickName());
+					if(!Objects.isNull(stockArticle)){
+						carsLoadScanEntity.setCustomerName(stockArticle.getCustomerName());
+						carsLoadScanEntity.setCustomerTelephone(stockArticle.getCustomerTelephone());
+						carsLoadScanEntity.setCustomerAddress(stockArticle.getCustomerAddress());
+					}
 					addCarsLoadScanList.add(carsLoadScanEntity);
 
 					Date date = new Date();
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 498bb5e3a..9e970f90a 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
@@ -67,4 +67,10 @@ public class WarehouseWaybillDTO extends WarehouseWaybillEntity {
 	private Date freezeTimeStartDate;
 	private Date freezeTimeEndDate;
 
+
+	private String checkTimeStartStr;
+	private String checkTimeEndStr;
+	private Date checkTimeStartDate;
+	private Date checkTimeEndDate;
+
 }
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 a0a02983b..1aeb12de5 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
@@ -366,6 +366,7 @@
         lww.cancle_check_user_name cancleCheckUserName,
         lww.cancle_check_time cancleCheckTime,
         lww.waybill_status waybillStatus,
+        lww.waybill_type waybillType,
         lww.document_making_time openTime,
         lww.goods_name goodsName,
         lww.total_count totalCount,
@@ -470,8 +471,8 @@
         <if test="param.urgency != null">
             and lww.urgency = #{param.urgency}
         </if>
-        <if test="param.transportType != null">
-            and lww.transport_type = #{param.transportType}
+        <if test="param.serviceType != null">
+            and lww.service_type = #{param.serviceType}
         </if>
         <if test="param.transportType != null">
             and lww.transport_type = #{param.transportType}
@@ -479,6 +480,10 @@
         <if test="param.waybillStatus != null">
             and lww.waybill_status = #{param.waybillStatus}
         </if>
+
+        <if test="param.checkStatus != null">
+            and IFNULL(lww.check_status,0) = #{param.checkStatus}
+        </if>
         <if test="param.pickupCompleteOrNot != null">
             and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
         </if>
@@ -497,6 +502,12 @@
         <if test="param.createTimeEndDate != null">
             and lww.create_time &lt;= #{param.createTimeEndDate}
         </if>
+        <if test="param.checkTimeStartDate != null">
+            and lww.check_time &gt;= #{param.checkTimeStartDate}
+        </if>
+        <if test="param.checkTimeEndDate != null">
+            and lww.check_time &lt;= #{param.checkTimeEndDate}
+        </if>
         <if test="param.agent != null and param.agent != ''">
             and lww.Locate(#{param.agent},agent) > 0
         </if>
@@ -536,7 +547,7 @@
         <if test="param.freezeTimeEndDate != null">
             and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
         </if>
-
+        GROUP BY lww.id
         order by lww.create_time desc
     </select>
 
@@ -725,8 +736,8 @@
         <if test="param.urgency != null">
             and lww.urgency = #{param.urgency}
         </if>
-        <if test="param.transportType != null">
-            and lww.transport_type = #{param.transportType}
+        <if test="param.serviceType != null">
+            and lww.service_type = #{param.serviceType}
         </if>
         <if test="param.transportType != null">
             and lww.transport_type = #{param.transportType}
@@ -734,6 +745,10 @@
         <if test="param.waybillStatus != null">
             and lww.waybill_status = #{param.waybillStatus}
         </if>
+
+        <if test="param.checkStatus != null">
+            and IFNULL(lww.check_status,0) = #{param.checkStatus}
+        </if>
         <if test="param.pickupCompleteOrNot != null">
             and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
         </if>
@@ -752,6 +767,12 @@
         <if test="param.createTimeEndDate != null">
             and lww.create_time &lt;= #{param.createTimeEndDate}
         </if>
+        <if test="param.checkTimeStartDate != null">
+            and lww.check_time &gt;= #{param.checkTimeStartDate}
+        </if>
+        <if test="param.checkTimeEndDate != null">
+            and lww.check_time &lt;= #{param.checkTimeEndDate}
+        </if>
         <if test="param.agent != null and param.agent != ''">
             and lww.Locate(#{param.agent},agent) > 0
         </if>
@@ -791,7 +812,7 @@
         <if test="param.freezeTimeEndDate != null">
             and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
         </if>
-
+        GROUP BY lww.id
         order by lww.create_time desc
     </select>
 
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 42427e00b..4cec2fda6 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
@@ -833,6 +833,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
 		waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
 
+		waybillDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCheckTimeStartStr()));
+		waybillDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCheckTimeEndStr()));
+
 		IPage<FinanceWaybillVO> pageList = baseMapper.pageFinanceWaybillList(page, waybillDTO);
 //		List<FinanceWaybillVO> records = pageList.getRecords();
 //
@@ -1116,9 +1119,11 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 		waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
 		waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
 
-		List<FinanceWaybillExportVO> list = baseMapper.financeWaybillListExport(waybillDTO);
+		waybillDTO.setCheckTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCheckTimeStartStr()));
+		waybillDTO.setCheckTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCheckTimeEndStr()));
 
+		List<FinanceWaybillExportVO> list = baseMapper.financeWaybillListExport(waybillDTO);
 
-		return Collections.emptyList();
+		return list;
 	}
 }