diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java b/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java
index 16fac4dd3..1958fdd47 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/IncomingTypeEnum.java
@@ -10,7 +10,7 @@ public enum IncomingTypeEnum {
 	LINE_INCOMING(3, "直接入库"),
 	CARS_NO_INCOMING(4, "按车次号入库"),
 	ORDER_CODE_INCOMING(5, "按订单号入库"),
-	PACKAGE_INCOMING(6, "按件入库"),
+	PACKAGE_INCOMING(6, "卸车入库"),
 	BATCH_INCOMING(7, "批量卸车入库"),
 	UNLOAD_TRAY_INCOMING(8, "托盘卸车入库"),
 	UNLOAD_TRAY_ONE(9, "卸分一体"),
diff --git a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
index 270d49312..bbf747c33 100644
--- a/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
+++ b/blade-biz-common/src/main/java/org/springblade/common/constant/WorkNodeEnums.java
@@ -16,6 +16,7 @@ public enum WorkNodeEnums implements Serializable {
 	DELETE_DATA_ENTRY(100000, "删除数据"),
 	INITIAL_DATA_ENTRY(101010, "数据入库"),
 	INITIAL_WAREHOUSE_ENTRY(101020, "始发仓入库"),
+	UNLOAD_WAREHOUSE_ENTRY(101021, "卸车并入库"),
 
 	OPEN_ORDER(102010, "开单"),
 	CHANGE_ORDER(102020, "改单"),
diff --git a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java
index e3e827012..7b5af9180 100644
--- a/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java
+++ b/blade-service-api/logpm-trunkline-api/src/main/java/com/logpm/trunkline/vo/TrunklineLoadSignOrderVO.java
@@ -15,6 +15,10 @@ public class TrunklineLoadSignOrderVO extends TrunklineLoadSignOrderEntity {
 	private String carsLineName;
 	private String carNumber;
 	private String driverMobile;
+	private String mallName;
+	private String mallPerson;
+	private String mallMobile;
+	private String mallAddress;
 
 	private List<TrunklineLoadSignPhotoEntity> signPhotoList;
 
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
index 7c3c47558..133440dcd 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineLoadSignOrderMapper.xml
@@ -66,6 +66,10 @@
         ltlso.plan_num planNum,
         ltlso.load_sign_code loadSignCode,
         ltlso.sign_num signNum,
+        ltlso.mall_name mallName,
+        ltlso.mall_person mallPerson,
+        ltlso.mall_mobile mallMobile,
+        ltlso.mall_address mallAddress,
         ltcl.driver_name driverName,
         ltcl.driver_mobile driverMobile,
         ltcl.car_number carNumber,
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
index 56275a692..55e2b65d3 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/InComingServiceImpl.java
@@ -333,8 +333,15 @@ public class InComingServiceImpl implements IInComingService {
 //
 //					List<String> orderPackageCodes = new ArrayList<>();
 //					orderPackageCodes.add(orderPackageCode);
+
+						Integer c = WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode();
+
+						if(incomingType.equals(IncomingTypeEnum.PACKAGE_INCOMING.getCode())){
+							c = WorkNodeEnums.UNLOAD_WAREHOUSE_ENTRY.getCode();
+						}
+
 						//存入日志
-						packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, finalWarehouseName, WorkNodeEnums.INITIAL_WAREHOUSE_ENTRY.getCode(), "包件" + IncomingTypeEnum.getValue(incomingType));
+						packageTrackLogAsyncService.addPackageTrackLog(AuthUtil.getTenantId(), AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getNickName(), orderPackageCodes, warehouseId, finalWarehouseName, c, "包件" + IncomingTypeEnum.getValue(incomingType));
 
 
 						//2.判断包件和订单是否已经存入在库订单
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 1fff09e8c..e92265440 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
@@ -691,9 +691,9 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		waybillEntity.setStockCount(advanceDetailStockNumVO.getStockNum());
 		waybillEntity.setStockWeight(advanceDetailStockNumVO.getStockWeight());
 		waybillEntity.setStockVolume(advanceDetailStockNumVO.getStockVolume());
-		List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);
+//		List<BillladingPackageVO> billladingPackageList = advanceDetailService.findBillladingPackageByAdvanceIdsAnd(advanceIds);
 		//把billladingPackageList中的所有num累加
-		waybillEntity.setBillladingNum(billladingPackageList.stream().mapToInt(BillladingPackageVO::getNum).sum());
+		waybillEntity.setBillladingNum(0);
 
 		waybillEntity.setTotalFreight(openOrderDTO.getTotalFreight());
 		waybillEntity.setDeliveryFee(openOrderDTO.getDeliveryFee());
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 c22259724..07a33090d 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
@@ -68,6 +68,9 @@ import org.springblade.system.cache.DictBizCache;
 import org.springblade.system.entity.DictBiz;
 import org.springframework.amqp.rabbit.connection.CorrelationData;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.data.redis.core.script.DefaultRedisScript;
+import org.springframework.scripting.support.ResourceScriptSource;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -11544,6 +11547,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	public R unloadPackage(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
 		log.info("#############unloadPackage: 卸车包件");
 
+		String key = "unloadPackage:"+orderPackageCode;
+		String value = "1";
+		Long expireTime = 5L;
+
+		DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
+		redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("luascript/resubmit.lua")));
+		redisScript.setResultType(Long.class);
+
+		List<String> keys = Collections.singletonList(key);
+		List<Object> args = Arrays.asList(value, expireTime);
+
+		log.info("Keys: {}", keys);
+		log.info("Args: {}", args);
+
+		Long result = bladeRedis.getRedisTemplate().execute(redisScript, keys, args.toArray());
+
+		if (result == 1) {
+			log.warn("#########orderScanOrderPackageCode: 包件正在卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return R.fail(405, "包件正在卸车，请重试");
+		}
+
+
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(basicdataWarehouseEntity)) {
 			log.warn("##############unloadPackage: 仓库信息不存在");
@@ -12357,6 +12382,9 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 //			audio.append("异常卸车").append(abnormalUnloadNum).append("件");
 //		}
 
+
+		bladeRedis.del(key);
+
 		if (isData == 0) {
 			return Resp.scanFail(4005,"系统无编码","系统无编码");
 		}
@@ -12370,6 +12398,28 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 	public R unloadPackageNoXz(Long loadId, String orderPackageCode, Long warehouseId, Integer unbindTray, String remark, Integer incomingType,String unloadTrayName,String unloadTrayCode) {
 		log.info("#############unloadPackageNoXz: 卸车包件");
 
+		String key = "unloadPackage:"+orderPackageCode;
+		String value = "1";
+		Long expireTime = 5L;
+
+		DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>();
+		redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("luascript/resubmit.lua")));
+		redisScript.setResultType(Long.class);
+
+		List<String> keys = Collections.singletonList(key);
+		List<Object> args = Arrays.asList(value, expireTime);
+
+		log.info("Keys: {}", keys);
+		log.info("Args: {}", args);
+
+		Long result = bladeRedis.getRedisTemplate().execute(redisScript, keys, args.toArray());
+
+		if (result == 1) {
+			log.warn("#########orderScanOrderPackageCode: 包件正在卸车 orderPackageCode={} warehouseId={}", orderPackageCode, warehouseId);
+			return R.fail(405, "包件正在卸车，请重试");
+		}
+
+
 		BasicdataWarehouseEntity basicdataWarehouseEntity = basicdataWarehouseClient.getEntityWarehouseId(warehouseId);
 		if (Objects.isNull(basicdataWarehouseEntity)) {
 			log.warn("##############unloadPackageNoXz: 仓库信息不存在");
@@ -13136,6 +13186,8 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		//TODO 暂时注释
 //		carsLoadAsyncService.sendReportPackageUnloadData(AuthUtil.getNickName(),AuthUtil.getUserId(),warehouseId,warehouseName,carsLoadEntity,orderPackageCodeList);
 
+		bladeRedis.del(key);
+
 		if (isData == 0) {
 			return Resp.scanSuccess("卸车成功", "系统无编码");
 		}
diff --git a/blade-service/logpm-trunkline/src/main/resources/luascript/resubmit.lua b/blade-service/logpm-trunkline/src/main/resources/luascript/resubmit.lua
new file mode 100644
index 000000000..51b559add
--- /dev/null
+++ b/blade-service/logpm-trunkline/src/main/resources/luascript/resubmit.lua
@@ -0,0 +1,12 @@
+local key = KEYS[1]
+local value = ARGV[1]
+local expireTime = ARGV[2]
+
+local exists = redis.call("EXISTS", key)
+
+if exists == 1 then
+    return 1
+end
+
+redis.call("SETEX", key, expireTime, value)
+return 0
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 c610725cc..2544fc1bb 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
@@ -28,6 +28,7 @@ import com.logpm.warehouse.dto.SplitOrderDTO;
 import com.logpm.warehouse.dto.WarehouseWaybillDTO;
 import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.excel.WarehouseWaybillExcel;
+import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
 import com.logpm.warehouse.service.IWarehouseWaybillService;
 import com.logpm.warehouse.vo.ExportWarehouseWaybillVO;
 import com.logpm.warehouse.vo.FinanceWaybillExportVO;
@@ -81,6 +82,8 @@ public class WarehouseWaybillController extends BladeController {
 
 	private final IDictBizClient dictBizClient;
 
+	private final IWarehouseWaybillAbolishService warehouseWaybillAbolishService;
+
 	/**
 	 * 运单表 详情
 	 */
@@ -452,5 +455,29 @@ public class WarehouseWaybillController extends BladeController {
 	}
 
 
+	@ResponseBody
+	@PostMapping("/pageAbolishWaybillList")
+	@ApiOperationSupport(order = 1)
+	@ApiOperation(value = "分页查询作废运单", notes = "传入waybillDTO")
+	public R pageAbolishWaybillList(@RequestBody WarehouseWaybillDTO waybillDTO) {
+		String method = "############pageWaybillList: ";
+		log.info(method + "请求参数{}", waybillDTO);
+		try{
+			//当前登录人选择的仓库
+			List<Long> warehouseIds = warehouseClient.getWarehouseIds();
+			waybillDTO.setWarehouseIds(warehouseIds);
+
+			IPage<WarehouseWaybillVO> pages = warehouseWaybillAbolishService.pageAbolishWaybillList(waybillDTO);
+
+			return R.data(pages);
+		}catch (CustomerException e){
+			log.error(e.message,e);
+			return R.fail(e.code,e.message);
+		}catch (Exception e){
+			log.error("############sendOrders: 系统异常",e);
+			return R.fail(500,"############sendOrders: 系统异常");
+		}
+	}
+
 
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java
index b9a46f90d..84684882e 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWayBillDetailAbolishMapper.java
@@ -1,9 +1,16 @@
 package com.logpm.warehouse.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 @Mapper
 public interface WarehouseWayBillDetailAbolishMapper extends BaseMapper<WarehouseWayBillDetailAbolish> {
+
+    List<WarehouseWayBillDetail> findByWaybillIds(@Param("ids") List<Long> ids);
+
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.java
index 31689ae75..1d2adedcc 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.java
@@ -1,9 +1,15 @@
 package com.logpm.warehouse.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.dto.WarehouseWaybillDTO;
 import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface WarehouseWaybillAbolishMapper extends BaseMapper<WarehouseWaybillAbolishEntity> {
+
+    IPage<WarehouseWaybillVO> pageAbolishWaybillList(IPage<Object> page, @Param("param") WarehouseWaybillDTO waybillDTO);
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.xml
new file mode 100644
index 000000000..7b1cfd0c8
--- /dev/null
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillAbolishMapper.xml
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper">
+
+    <select id="pageAbolishWaybillList" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
+        select  lww.id id,
+        lww.brand brand,
+        lww.waybill_no waybillNo,
+        lww.order_no orderNo,
+        lww.consignee consignee,
+        lww.consignee_name consigneeName,
+        lww.consignee_mobile consigneeMobile,
+        lww.consignee_address consigneeAddress,
+        lww.shipper shipper,
+        lww.shipper_name shipperName,
+        lww.shipper_mobile shipperMobile,
+        lww.shipper_address shipperAddress,
+        lww.destination destination,
+        lww.complete_destination completeDestination,
+        lww.departure departure,
+        lww.complete_departure completeDeparture,
+        lww.departure_warehouse_name departureWarehouseName,
+        lww.destination_warehouse_name destinationWarehouseName,
+        lww.delivery_way deliveryWay,
+        lww.customer_train customerTrain,
+        IFNULL(lww.return_status,0) returnStatus,
+        lww.remark remark,
+        lww.pay_type payType,
+        lww.pay_way payWay,
+        lww.x_pay xPay,
+        lww.d_pay dPay,
+        lww.h_pay hPay,
+        lww.y_pay yPay,
+        lww.service_type serviceType,
+        lww.cancle_check_remark cancleCheckRemark,
+        lww.cancle_check_user_name cancleCheckUserName,
+        lww.cancle_check_time cancleCheckTime,
+        lww.waybill_status waybillStatus,
+        lww.agent agent,
+        lww.waybill_type waybillType,
+        lww.document_making_time documentMakingTime,
+        lww.create_time createTime,
+        lww.total_count totalCount,
+        lww.cost_piece costPiece,
+        lww.cost_zhang costZhang,
+        lww.cost_num costNum,
+        lww.total_freight totalFreight,
+        lww.delivery_fee deliveryFee,
+        lww.pickup_fee pickupFee,
+        lww.storage_fee storageFee,
+        lww.warehouse_management_fee warehouseManagementFee,
+        lww.sorting_fee sortingFee,
+        lww.handling_fee handlingFee,
+        lww.claiming_value claimingValue,
+        lww.rebate rebate,
+        lww.urgency urgency,
+        lww.receipt_num receiptNum,
+        lww.receipt receipt,
+        lww.transport_type transportType,
+        lww.third_operation_fee thirdOperationFee,
+        lww.pickup_complete_or_not pickupCompleteOrNot,
+        lww.trunkline_complete_or_not trunklineCompleteOrNot,
+        lww.freeze_status freezeStatus,
+        lww.freeze_user_name freezeUserName,
+        lww.freeze_time freezeTime,
+        lww.abolish_status abolishStatus,
+        lww.abolish_user_name abolishUserName,
+        lww.abolish_time abolishTime,
+        lww.sign_num signNum,
+        lww.sign_user_name signUserName,
+        lww.sign_time signTime,
+        lww.sign_check_user_name signCheckUserName,
+        lww.sign_check_time signCheckTime,
+        IFNULL(lww.check_status,0) checkStatus,
+        lww.check_reson checkReson,
+        lww.check_remark checkRemark,
+        lww.check_user_name checkUserName,
+        lww.check_time checkTime
+        from logpm_warehouse_waybill_abolish lww
+        where lww.is_deleted = 0
+        and lww.abolish_status = 0
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
+            and lww.departure_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.waybillNoList != null">
+            and lww.waybill_no in
+            <foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <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_no) > 0
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
+            and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
+        </if>
+        <if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
+            and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0
+        </if>
+        <if test="param.customerTrain != null and param.customerTrain != ''">
+            and Locate(#{param.customerTrain},lww.customer_train) > 0
+        </if>
+        <if test="param.brand != null and param.brand != ''">
+            and Locate(#{param.brand},lww.brand) > 0
+        </if>
+        <if test="param.shipper != null and param.shipper != ''">
+            and Locate(#{param.shipper},lww.shipper) > 0
+        </if>
+        <if test="param.shipperName != null and param.shipperName != ''">
+            and Locate(#{param.shipperName},lww.shipper_name) > 0
+        </if>
+        <if test="param.shipperMobile != null and param.shipperMobile != ''">
+            and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0
+        </if>
+        <if test="param.consignee != null and param.consignee != ''">
+            and Locate(#{param.consignee},lww.consignee) > 0
+        </if>
+        <if test="param.consigneeName != null and param.consigneeName != ''">
+            and Locate(#{param.consigneeName},lww.consignee_name) > 0
+        </if>
+        <if test="param.consigneeMobile != null and param.consigneeMobile != ''">
+            and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
+        </if>
+        <if test="param.destination != null and param.destination != ''">
+            and Locate(#{param.destination},lww.destination) > 0
+        </if>
+        <if test="param.completeDestination != null and param.completeDestination != ''">
+            and Locate(#{param.completeDestination},lww.complete_destination) > 0
+        </if>
+        <if test="param.departure != null and param.departure != ''">
+            and Locate(#{param.departure},lww.departure) > 0
+        </if>
+        <if test="param.completeDeparture != null and param.completeDeparture != ''">
+            and Locate(#{param.completeDeparture},lww.complete_departure) > 0
+        </if>
+        <if test="param.payType != null">
+            and lww.pay_type = #{param.payType}
+        </if>
+        <if test="param.payWay != null">
+            and lww.pay_way = #{param.payWay}
+        </if>
+        <if test="param.deliveryWay != null">
+            and lww.delivery_way = #{param.deliveryWay}
+        </if>
+        <if test="param.urgency != null">
+            and lww.urgency = #{param.urgency}
+        </if>
+        <if test="param.transportType != null">
+            and lww.transport_type = #{param.transportType}
+        </if>
+        <if test="param.transportType != null">
+            and lww.transport_type = #{param.transportType}
+        </if>
+        <if test="param.waybillStatus != null">
+            and lww.waybill_status = #{param.waybillStatus}
+        </if>
+        <if test="param.pickupCompleteOrNot != null">
+            and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
+        </if>
+        <if test="param.trunklineCompleteOrNot != null">
+            and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot}
+        </if>
+        <if test="param.documentMakingTimeStartDate != null">
+            and lww.document_making_time &gt;= #{param.documentMakingTimeStartDate}
+        </if>
+        <if test="param.documentMakingTimeEndDate != null">
+            and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
+        </if>
+        <if test="param.createTimeStartDate != null">
+            and lww.create_time &gt;= #{param.createTimeStartDate}
+        </if>
+        <if test="param.createTimeEndDate != null">
+            and lww.create_time &lt;= #{param.createTimeEndDate}
+        </if>
+        <if test="param.agent != null and param.agent != ''">
+            and Locate(#{param.agent},lww.agent) > 0
+        </if>
+        <if test="param.goodsName != null and param.goodsName != ''">
+            and Locate(#{param.goodsName},lww.goods_name) > 0
+        </if>
+        <if test="param.freezeStatus != null">
+            and lww.freeze_status = #{param.freezeStatus}
+        </if>
+        <if test="param.abolishStatus != null">
+            and lww.abolish_status = #{param.abolishStatus}
+        </if>
+        <if test="param.remark != null and param.remark != ''">
+            and Locate(#{param.remark},lww.remark) > 0
+        </if>
+        <if test="param.consigneeAddress != null and param.consigneeAddress != ''">
+            and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
+        </if>
+        <if test="param.totalCount != null">
+            and lww.total_count = #{param.totalCount}
+        </if>
+        <if test="param.totalWeight != null">
+            and lww.total_weight = #{param.totalWeight}
+        </if>
+        <if test="param.totalVolume != null">
+            and lww.total_volume = #{param.totalVolume}
+        </if>
+        <if test="param.abolishTimeStartDate != null">
+            and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
+        </if>
+        <if test="param.abolishTimeEndDate != null">
+            and lww.abolish_time &lt;= #{param.abolishTimeEndDate}
+        </if>
+        <if test="param.freezeTimeStartDate != null">
+            and lww.freeze_time &gt;= #{param.freezeTimeStartDate}
+        </if>
+        <if test="param.freezeTimeEndDate != null">
+            and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
+        </if>
+        <if test="param.checkStatus != null">
+            and IFNULL(lww.check_status,0) = #{param.checkStatus}
+        </if>
+        order by lww.create_time desc
+    </select>
+
+</mapper>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillDetailAbolishMapper.xml b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillDetailAbolishMapper.xml
new file mode 100644
index 000000000..68783a831
--- /dev/null
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/mapper/WarehouseWaybillDetailAbolishMapper.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.logpm.warehouse.mapper.WarehouseWayBillDetailAbolishMapper">
+
+    <select id="findByWaybillIds" resultType="com.logpm.warehouse.entity.WarehouseWayBillDetail">
+        select *
+        from logpm_warehouse_waybill_detail_abolish
+        where waybill_id in
+        <foreach collection="list" item="item" separator="," open="(" close=")">
+            #{item}
+        </foreach>
+        and is_deleted = 0
+    </select>
+
+</mapper>
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 a7cd85678..0e6a0972d 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
@@ -1290,4 +1290,246 @@
         update logpm_warehouse_waybill set service_type = #{serviceType} where id = #{waybillId}
     </update>
 
+    <select id="pageAbolishWaybillList" resultType="com.logpm.warehouse.vo.WarehouseWaybillVO">
+        select  lww.id id,
+        lww.brand brand,
+        lww.waybill_no waybillNo,
+        lww.order_no orderNo,
+        lww.consignee consignee,
+        lww.consignee_name consigneeName,
+        lww.consignee_mobile consigneeMobile,
+        lww.consignee_address consigneeAddress,
+        lww.shipper shipper,
+        lww.shipper_name shipperName,
+        lww.shipper_mobile shipperMobile,
+        lww.shipper_address shipperAddress,
+        lww.destination destination,
+        lww.complete_destination completeDestination,
+        lww.departure departure,
+        lww.complete_departure completeDeparture,
+        lww.departure_warehouse_name departureWarehouseName,
+        lww.destination_warehouse_name destinationWarehouseName,
+        lww.delivery_way deliveryWay,
+        lww.customer_train customerTrain,
+        IFNULL(lww.return_status,0) returnStatus,
+        lww.remark remark,
+        lww.pay_type payType,
+        lww.pay_way payWay,
+        lww.x_pay xPay,
+        lww.d_pay dPay,
+        lww.h_pay hPay,
+        lww.y_pay yPay,
+        lww.service_type serviceType,
+        lww.cancle_check_remark cancleCheckRemark,
+        lww.cancle_check_user_name cancleCheckUserName,
+        lww.cancle_check_time cancleCheckTime,
+        lww.waybill_status waybillStatus,
+        lww.agent agent,
+        lww.waybill_type waybillType,
+        lww.document_making_time documentMakingTime,
+        lww.create_time createTime,
+        lww.total_count totalCount,
+        lww.cost_piece costPiece,
+        lww.cost_zhang costZhang,
+        lww.cost_num costNum,
+        lww.total_freight totalFreight,
+        lww.delivery_fee deliveryFee,
+        lww.pickup_fee pickupFee,
+        lww.storage_fee storageFee,
+        lww.warehouse_management_fee warehouseManagementFee,
+        lww.sorting_fee sortingFee,
+        lww.handling_fee handlingFee,
+        lww.claiming_value claimingValue,
+        lww.rebate rebate,
+        lww.urgency urgency,
+        lww.receipt_num receiptNum,
+        lww.receipt receipt,
+        lww.transport_type transportType,
+        lww.third_operation_fee thirdOperationFee,
+        lww.pickup_complete_or_not pickupCompleteOrNot,
+        lww.trunkline_complete_or_not trunklineCompleteOrNot,
+        lww.freeze_status freezeStatus,
+        lww.freeze_user_name freezeUserName,
+        lww.freeze_time freezeTime,
+        lww.abolish_status abolishStatus,
+        lww.abolish_user_name abolishUserName,
+        lww.abolish_time abolishTime,
+        lww.sign_num signNum,
+        lww.sign_user_name signUserName,
+        lww.sign_time signTime,
+        lww.sign_check_user_name signCheckUserName,
+        lww.sign_check_time signCheckTime,
+        IFNULL(lww.check_status,0) checkStatus,
+        lww.check_reson checkReson,
+        lww.check_remark checkRemark,
+        lww.check_user_name checkUserName,
+        lww.check_time checkTime
+        from logpm_warehouse_waybill lww
+        where lww.is_deleted = 0
+        and lww.abolish_status = 0
+        <if test="param.warehouseIds != null and param.warehouseIds.size() > 0">
+            and lww.id in (select l.id
+            from logpm_warehouse_waybill l
+            left join logpm_trunkline_waybill_track wt on wt.waybill_id = l.id
+            where (l.departure_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            or l.destination_warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+            or wt.warehouse_id in
+            <foreach collection="param.warehouseIds" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>)
+            group by l.id)
+        </if>
+        <if test="param.waybillNoList != null">
+            and lww.waybill_no in
+            <foreach collection="param.waybillNoList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
+        <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_no) > 0
+        </if>
+        <if test="param.destinationWarehouseName != null and param.destinationWarehouseName != ''">
+            and Locate(#{param.destinationWarehouseName},lww.destination_warehouse_name) > 0
+        </if>
+        <if test="param.departureWarehouseName != null and param.departureWarehouseName != ''">
+            and Locate(#{param.departureWarehouseName},lww.departure_warehouse_name) > 0
+        </if>
+        <if test="param.customerTrain != null and param.customerTrain != ''">
+            and Locate(#{param.customerTrain},lww.customer_train) > 0
+        </if>
+        <if test="param.brand != null and param.brand != ''">
+            and Locate(#{param.brand},lww.brand) > 0
+        </if>
+        <if test="param.shipper != null and param.shipper != ''">
+            and Locate(#{param.shipper},lww.shipper) > 0
+        </if>
+        <if test="param.shipperName != null and param.shipperName != ''">
+            and Locate(#{param.shipperName},lww.shipper_name) > 0
+        </if>
+        <if test="param.shipperMobile != null and param.shipperMobile != ''">
+            and Locate(#{param.shipperMobile},lww.shipper_mobile) > 0
+        </if>
+        <if test="param.consignee != null and param.consignee != ''">
+            and Locate(#{param.consignee},lww.consignee) > 0
+        </if>
+        <if test="param.consigneeName != null and param.consigneeName != ''">
+            and Locate(#{param.consigneeName},lww.consignee_name) > 0
+        </if>
+        <if test="param.consigneeMobile != null and param.consigneeMobile != ''">
+            and Locate(#{param.consigneeMobile},lww.consignee_mobile) > 0
+        </if>
+        <if test="param.destination != null and param.destination != ''">
+            and Locate(#{param.destination},lww.destination) > 0
+        </if>
+        <if test="param.completeDestination != null and param.completeDestination != ''">
+            and Locate(#{param.completeDestination},lww.complete_destination) > 0
+        </if>
+        <if test="param.departure != null and param.departure != ''">
+            and Locate(#{param.departure},lww.departure) > 0
+        </if>
+        <if test="param.completeDeparture != null and param.completeDeparture != ''">
+            and Locate(#{param.completeDeparture},lww.complete_departure) > 0
+        </if>
+        <if test="param.payType != null">
+            and lww.pay_type = #{param.payType}
+        </if>
+        <if test="param.payWay != null">
+            and lww.pay_way = #{param.payWay}
+        </if>
+        <if test="param.deliveryWay != null">
+            and lww.delivery_way = #{param.deliveryWay}
+        </if>
+        <if test="param.urgency != null">
+            and lww.urgency = #{param.urgency}
+        </if>
+        <if test="param.transportType != null">
+            and lww.transport_type = #{param.transportType}
+        </if>
+        <if test="param.transportType != null">
+            and lww.transport_type = #{param.transportType}
+        </if>
+        <if test="param.waybillStatus != null">
+            and lww.waybill_status = #{param.waybillStatus}
+        </if>
+        <if test="param.pickupCompleteOrNot != null">
+            and lww.pickup_complete_or_not = #{param.pickupCompleteOrNot}
+        </if>
+        <if test="param.trunklineCompleteOrNot != null">
+            and lww.trunkline_complete_or_not = #{param.trunklineCompleteOrNot}
+        </if>
+        <if test="param.documentMakingTimeStartDate != null">
+            and lww.document_making_time &gt;= #{param.documentMakingTimeStartDate}
+        </if>
+        <if test="param.documentMakingTimeEndDate != null">
+            and lww.document_making_time &lt;= #{param.documentMakingTimeEndDate}
+        </if>
+        <if test="param.createTimeStartDate != null">
+            and lww.create_time &gt;= #{param.createTimeStartDate}
+        </if>
+        <if test="param.createTimeEndDate != null">
+            and lww.create_time &lt;= #{param.createTimeEndDate}
+        </if>
+        <if test="param.agent != null and param.agent != ''">
+            and Locate(#{param.agent},lww.agent) > 0
+        </if>
+        <if test="param.goodsName != null and param.goodsName != ''">
+            and Locate(#{param.goodsName},lww.goods_name) > 0
+        </if>
+        <if test="param.freezeStatus != null">
+            and lww.freeze_status = #{param.freezeStatus}
+        </if>
+        <if test="param.abolishStatus != null">
+            and lww.abolish_status = #{param.abolishStatus}
+        </if>
+        <if test="param.remark != null and param.remark != ''">
+            and Locate(#{param.remark},lww.remark) > 0
+        </if>
+        <if test="param.consigneeAddress != null and param.consigneeAddress != ''">
+            and Locate(#{param.consigneeAddress},lww.consignee_address) > 0
+        </if>
+        <if test="param.totalCount != null">
+            and lww.total_count = #{param.totalCount}
+        </if>
+        <if test="param.totalWeight != null">
+            and lww.total_weight = #{param.totalWeight}
+        </if>
+        <if test="param.totalVolume != null">
+            and lww.total_volume = #{param.totalVolume}
+        </if>
+        <if test="param.abolishTimeStartDate != null">
+            and lww.abolish_time &gt;= #{param.abolishTimeStartDate}
+        </if>
+        <if test="param.abolishTimeEndDate != null">
+            and lww.abolish_time &lt;= #{param.abolishTimeEndDate}
+        </if>
+        <if test="param.freezeTimeStartDate != null">
+            and lww.freeze_time &gt;= #{param.freezeTimeStartDate}
+        </if>
+        <if test="param.freezeTimeEndDate != null">
+            and lww.freeze_time &lt;= #{param.freezeTimeEndDate}
+        </if>
+        <if test="param.checkStatus != null">
+            and IFNULL(lww.check_status,0) = #{param.checkStatus}
+        </if>
+        <if test="param.destinationWarehouseIds != null and param.destinationWarehouseIds.size() > 0 ">
+            and lww.destination_warehouse_id in
+            <foreach collection="param.destinationWarehouseIds" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        order by lww.create_time desc
+    </select>
+
+
+
+
 </mapper>
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailAbolishService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailAbolishService.java
index 5e358351e..7522188ad 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailAbolishService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWayBillDetailAbolishService.java
@@ -1,8 +1,12 @@
 package com.logpm.warehouse.service;
 
+import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
 import org.springblade.core.mp.base.BaseService;
 
+import java.util.List;
+
 public interface IWarehouseWayBillDetailAbolishService extends BaseService<WarehouseWayBillDetailAbolish> {
 
+    List<WarehouseWayBillDetail> findByWaybillIds(List<Long> ids);
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java
index 350de82a6..edcf44d41 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseWaybillAbolishService.java
@@ -1,7 +1,13 @@
 package com.logpm.warehouse.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.warehouse.dto.WarehouseWaybillDTO;
 import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
+import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import org.springblade.core.mp.base.BaseService;
 
 public interface IWarehouseWaybillAbolishService extends BaseService<WarehouseWaybillAbolishEntity> {
+
+    IPage<WarehouseWaybillVO> pageAbolishWaybillList(WarehouseWaybillDTO waybillDTO);
+
 }
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 d741deee4..4423e9ce0 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
@@ -97,4 +97,5 @@ public interface IWarehouseWaybillService extends BaseService<WarehouseWaybillEn
     List<WarehouseWaybillEntity> findWaybillVOByOrderCode(String orderCode);
 
     R updateWaybillTypeService(WarehouseWaybillDTO waybillDTO);
+
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java
index c393a6bda..dec14375b 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWayBillDetailAbolishServiceImpl.java
@@ -1,5 +1,6 @@
 package com.logpm.warehouse.service.impl;
 
+import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWayBillDetailAbolish;
 import com.logpm.warehouse.mapper.WarehouseWayBillDetailAbolishMapper;
 import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService;
@@ -8,11 +9,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+
 @Slf4j
 @AllArgsConstructor
 @Service
 public class WarehouseWayBillDetailAbolishServiceImpl extends BaseServiceImpl<WarehouseWayBillDetailAbolishMapper, WarehouseWayBillDetailAbolish> implements IWarehouseWayBillDetailAbolishService {
 
-
-
+	@Override
+	public List<WarehouseWayBillDetail> findByWaybillIds(List<Long> ids) {
+		return baseMapper.findByWaybillIds(ids);
+	}
 }
diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java
index 40f8fe035..fa3076eb7 100644
--- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java
+++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseWaybillAbolishServiceImpl.java
@@ -1,15 +1,85 @@
 package com.logpm.warehouse.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.logpm.warehouse.dto.WarehouseWaybillDTO;
+import com.logpm.warehouse.entity.WarehouseWayBillDetail;
 import com.logpm.warehouse.entity.WarehouseWaybillAbolishEntity;
 import com.logpm.warehouse.mapper.WarehouseWaybillAbolishMapper;
+import com.logpm.warehouse.service.IWarehouseWayBillDetailAbolishService;
 import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
+import com.logpm.warehouse.vo.WarehouseWaybillVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.core.tool.utils.StringUtil;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 @Service
 @AllArgsConstructor
 @Slf4j
 public class WarehouseWaybillAbolishServiceImpl extends BaseServiceImpl<WarehouseWaybillAbolishMapper, WarehouseWaybillAbolishEntity> implements IWarehouseWaybillAbolishService {
+
+	private final IWarehouseWayBillDetailAbolishService warehouseWayBillDetailAbolishService;
+
+	@Override
+	public IPage<WarehouseWaybillVO> pageAbolishWaybillList(WarehouseWaybillDTO waybillDTO) {
+
+		IPage<Object> page = new Page<>();
+		page.setCurrent(waybillDTO.getPageNum());
+		page.setSize(waybillDTO.getPageSize());
+
+		waybillDTO.setDocumentMakingTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getDocumentMakingTimeStartStr()));
+		waybillDTO.setDocumentMakingTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getDocumentMakingTimeEndStr()));
+		waybillDTO.setCreateTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getCreateTimeStartStr()));
+		waybillDTO.setCreateTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getCreateTimeEndStr()));
+		waybillDTO.setAbolishTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getAbolishTimeStartStr()));
+		waybillDTO.setAbolishTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getAbolishTimeEndStr()));
+		waybillDTO.setFreezeTimeStartDate(CommonUtil.getStartByDateStr(waybillDTO.getFreezeTimeStartStr()));
+		waybillDTO.setFreezeTimeEndDate(CommonUtil.getEndByDateStr(waybillDTO.getFreezeTimeEndStr()));
+
+		IPage<WarehouseWaybillVO> pageList = baseMapper.pageAbolishWaybillList(page, waybillDTO);
+
+
+		List<WarehouseWaybillVO> records = pageList.getRecords();
+
+		if (!records.isEmpty()) {
+			//把records中的id取出作为一个集合
+			List<Long> ids = records.stream().map(WarehouseWaybillVO::getId).collect(Collectors.toList());
+			List<WarehouseWayBillDetail> wayBillDetailList = warehouseWayBillDetailAbolishService.findByWaybillIds(ids);
+			//把wayBillDetailList通过waibillId分组
+			Map<Long, List<WarehouseWayBillDetail>> map = wayBillDetailList.stream().collect(Collectors.groupingBy(WarehouseWayBillDetail::getWaybillId));
+			for (WarehouseWaybillVO record : records) {
+				Long waybillId = record.getId();
+				if (!Objects.isNull(map.get(waybillId))){
+					List<WarehouseWayBillDetail> warehouseWayBillDetails = map.get(waybillId);
+					// 将集合 warehouseWayBillDetails 中的productName 按照， 进行拼接
+					String productNames = warehouseWayBillDetails.stream().filter(s -> StringUtil.isNotBlank(s.getProductName())).map(WarehouseWayBillDetail::getProductName).collect(Collectors.joining(","));
+					record.setGoodsName(productNames);
+					String productNum = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getNum())).map(s -> s.getNum().toString()).collect(Collectors.joining(","));
+					record.setProductNum(productNum);
+					String productPrice = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getPrice())).map(s -> s.getPrice().toString()).collect(Collectors.joining(","));
+					record.setProductPrice(productPrice);
+					// 对集合中的weight 进行求和
+					BigDecimal sumWeight = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getWeight())).map(WarehouseWayBillDetail::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add);
+					record.setTotalWeight(sumWeight);
+					BigDecimal productVolume = warehouseWayBillDetails.stream().filter(s -> !Objects.isNull(s.getVolume())).map(WarehouseWayBillDetail::getVolume).reduce(BigDecimal.ZERO, BigDecimal::add);
+					record.setTotalVolume(productVolume);
+					record.setDetailList(warehouseWayBillDetails);
+				}
+
+			}
+			pageList.setRecords(records);
+		}
+
+		return pageList;
+
+	}
 }
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 ba9010796..b788aab1b 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
@@ -37,6 +37,7 @@ import com.logpm.warehouse.entity.WarehouseWaybillEntity;
 import com.logpm.warehouse.excel.WarehouseWaybillExcel;
 import com.logpm.warehouse.mapper.WarehouseWaybillMapper;
 import com.logpm.warehouse.service.IWarehouseWayBillDetailService;
+import com.logpm.warehouse.service.IWarehouseWaybillAbolishService;
 import com.logpm.warehouse.service.IWarehouseWaybillService;
 import com.logpm.warehouse.vo.ExportWarehouseWaybillVO;
 import com.logpm.warehouse.vo.FinanceWaybillExportVO;
@@ -93,6 +94,9 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 	private final IBasicPrintTemplateClient basicPrintTemplateClient;
 
+	private final IWarehouseWaybillAbolishService warehouseWaybillAbolishService;
+
+
 	@Override
 	public IPage<WarehouseWaybillVO> selectWarehouseWaybillPage(IPage<WarehouseWaybillVO> page, WarehouseWaybillVO warehouseWaybill) {
 		return page.setRecords(baseMapper.selectWarehouseWaybillPage(page, warehouseWaybill));
@@ -1256,4 +1260,5 @@ public class WarehouseWaybillServiceImpl extends BaseServiceImpl<WarehouseWaybil
 
 		return R.success("修改成功");
 	}
+
 }