添加任务，配送导出

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -244,12 +244,7 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distributionDeliveryList")
 	public void exportDistributionDeliveryList(@ApiIgnore @RequestParam Map<String, Object> distributionDeliveryList, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionDeliveryListEntity> queryWrapper = Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistributionDeliveryList::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionDeliveryListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionDeliveryListExcel> list = distributionDeliveryListService.exportDistributionDeliveryList(queryWrapper);
+		List<DistributionDeliveryListExcel> list = distributionDeliveryListService.exportDistributionDeliveryList(distributionDeliveryList);
 		ExcelUtil.export(response, "配送管理数据" + DateUtil.time(), "配送管理数据表", list, DistributionDeliveryListExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -183,12 +183,8 @@ public class DistributionReservationController extends BladeController {
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "导出数据", notes = "传入distrbutionReservation")
 	public void exportDistrbutionReservation(@ApiIgnore @RequestParam Map<String, Object> distrbutionReservation, BladeUser bladeUser, HttpServletResponse response) {
-		QueryWrapper<DistributionReservationEntity> queryWrapper = Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class);
-		//if (!AuthUtil.isAdministrator()) {
-		//	queryWrapper.lambda().eq(DistrbutionReservation::getTenantId, bladeUser.getTenantId());
-		//}
-		queryWrapper.lambda().eq(DistributionReservationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
-		List<DistributionReservationExcel> list = reservationService.exportDistrbutionReservation(queryWrapper);
+
+		List<DistributionReservationExcel> list = reservationService.exportDistrbutionReservation(distrbutionReservation);
 		ExcelUtil.export(response, "预约列表数据" + DateUtil.time(), "预约列表数据表", list, DistributionReservationExcel.class);
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionDeliveryListExcel.java

@@ -41,71 +41,37 @@ public class DistributionDeliveryListExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
 	/**
-	 * 租户号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
-	/**
-	 * 是否已删除
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
+	 * 车次
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("车次")
+	private String trainNumber;
 	/**
 	 * 车次
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("车次")
-	private String trainNumber;
+	@ExcelProperty("配送日期")
+	private String taskTime;
+
 	/**
 	 * 仓库
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("仓库")
-	private String warehouse;
+	private String warehouseName;
 	/**
 	 * 配送类型;1-自主配送,2-三方配送
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送类型;1-自主配送,2-三方配送")
+	@ExcelProperty("配送类型")
 	private String type;
 	/**
 	 * 配送种类;1-市配,2-商配
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送种类;1-市配,2-商配")
+	@ExcelProperty("配送种类")
 	private String kind;
 	/**
 	 * 配送车辆
@@ -123,13 +89,13 @@ public class DistributionDeliveryListExcel implements Serializable {
 	 * 配送公司;1-货拉拉,2-京东
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送公司;1-货拉拉,2-京东")
+	@ExcelProperty("配送公司")
 	private String distributionCompany;
 	/**
 	 * 配送状态;1-配送中,2-已完成
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送状态;1-配送中,2-已完成")
+	@ExcelProperty("配送状态")
 	private String state;
 	/**
 	 * 配送客户数
@@ -143,12 +109,12 @@ public class DistributionDeliveryListExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("配送价格")
 	private BigDecimal price;
-	/**
-	 * 增值服务表id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("增值服务表id")
-	private Integer addedServicesId;
+//	/**
+//	 * 增值服务表id
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("增值服务表id")
+//	private Integer addedServicesId;
 	/**
 	 * 订单总数
 	 */
@@ -159,8 +125,14 @@ public class DistributionDeliveryListExcel implements Serializable {
 	 * 配送件数
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送件数")
+	@ExcelProperty("配送包件数")
 	private Integer deliveryNumber;
+	/**
+	 * 配送件数
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("配送库存品数")
+	private Integer inventoryNub;
 	/**
 	 * 扫描件数
 	 */
@@ -173,11 +145,11 @@ public class DistributionDeliveryListExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("装卸班组")
 	private String loadingTeam;
-	/**
-	 * 预约表id
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预约表id")
-	private String reservationId;
+//	/**
+//	 * 预约表id
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约表id")
+//	private String reservationId;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionReservationExcel.java

@@ -42,24 +42,44 @@ public class DistributionReservationExcel implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+
+	/**
+	 * 订单自编号;订单自编号，关联订单表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约单编号")
+	private String reservationCode;
+	/**
+	 * 订单自编号;订单自编号，关联订单表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("订单号")
+	private String orderCode;
 	/**
-	 * 租户号
+	 * 订单自编号;订单自编号，关联订单表
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("租户号")
-	private String tenantId;
+	@ExcelProperty("服务号")
+	private String serviceNumber;
 	/**
-	 * 是否已删除
+	 * 订单自编号;订单自编号，关联订单表
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("是否已删除")
-	private Integer isDeleted;
+	@ExcelProperty("仓库")
+	private String warehouseName;
 	/**
 	 * 订单自编号;订单自编号，关联订单表
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("订单自编号;订单自编号，关联订单表")
-	private String orderId;
+	@ExcelProperty("商场")
+	private String mallName;
+	/**
+	 * 订单自编号;订单自编号，关联订单表
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("门店")
+	private String storeName;
+
 	/**
 	 * 收货人
 	 */
@@ -78,18 +98,43 @@ public class DistributionReservationExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("预约时间")
 	private Date reservationData;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约包件数")
+	private Integer reservationNumber;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("预约库存品数")
+	private Integer stockListNumber;
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("待收货款")
+	private BigDecimal dueSincere;
+
+	/**
+	 * 预约时间
+	 */
+	@ColumnWidth(20)
+	@ExcelProperty("时段")
+	private String periodTimeName;
 	/**
 	 * 服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("服务类型;预约服务类型；1-上楼、2-超区、3-拆样、4-平移、5-分拣、6-搬运、7-返货；")
-	private String serveType;
+	@ExcelProperty("服务类型")
+	private String serveTypeName;
 	/**
 	 * 配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("配送方式;预约添加送货方式；1-送货(商配的唯一方式)、2-送货上楼、3-送装一体、4-装")
-	private String deliveryType;
+	@ExcelProperty("配送方式")
+	private String deliveryTypeName;
 	/**
 	 * 到付运费
 	 */
@@ -107,66 +152,48 @@ public class DistributionReservationExcel implements Serializable {
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("代付运费")
-	private String replaceFee;
+	private BigDecimal replaceFee;
 	/**
 	 * 收件人电话
 	 */
 	@ColumnWidth(20)
 	@ExcelProperty("收件人电话")
 	private String deliveryPhone;
+//	/**
+//	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("预约信息状态;预约列表信息状态；1-待确认、2-已确认")
+//	private String resvervationStatus;
 	/**
 	 * 预约信息状态;预约列表信息状态；1-待确认、2-已确认
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("预约信息状态;预约列表信息状态；1-待确认、2-已确认")
-	private String resvervationStatus;
-	/**
-	 * 订单来源
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("订单来源")
-	private String orderSource;
+	@ExcelProperty("预约信息状态")
+	private String resvervationStatusName;
+//	/**
+//	 * 订单来源
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("订单来源")
+//	private String orderSource;
+//	/**
+//	 * 备货状态;备货状态；1-未备货、2-待备货、3-已备货
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备货状态")
+//	private String stockupStatus;
 	/**
 	 * 备货状态;备货状态；1-未备货、2-待备货、3-已备货
 	 */
 	@ColumnWidth(20)
-	@ExcelProperty("备货状态;备货状态；1-未备货、2-待备货、3-已备货")
-	private String stockupStatus;
-	/**
-	 * 备货区编号
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("备货区编号")
-	private String goodsShelfId;
-	/**
-	 * 预留1
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留1")
-	private String reserve1;
-	/**
-	 * 预留2
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留2")
-	private String reserve2;
-	/**
-	 * 预留3
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留3")
-	private String reserve3;
-	/**
-	 * 预留4
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留4")
-	private String reserve4;
-	/**
-	 * 预留5
-	 */
-	@ColumnWidth(20)
-	@ExcelProperty("预留5")
-	private String reserve5;
+	@ExcelProperty("备货状态")
+	private String stockupStatusName;
+//	/**
+//	 * 备货区编号
+//	 */
+//	@ColumnWidth(20)
+//	@ExcelProperty("备货区编号")
+//	private String goodsShelfId;
 
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.java

@@ -57,7 +57,7 @@ public interface DistributionDeliveryListMapper extends BaseMapper<DistributionD
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionDeliveryListExcel> exportDistributionDeliveryList(@Param("ew") Wrapper<DistributionDeliveryListEntity> queryWrapper);
+	List<DistributionDeliveryListVO> exportDistributionDeliveryList(@Param("ew") Wrapper<DistributionDeliveryListEntity> queryWrapper);
 	/**
 	 * 商配车次
 	 *

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -260,7 +260,7 @@
     </select>
 
 
-    <select id="exportDistributionDeliveryList" resultType="com.logpm.distribution.excel.DistributionDeliveryListExcel">
+    <select id="exportDistributionDeliveryList" resultType="com.logpm.distribution.vo.DistributionDeliveryListVO">
         SELECT * FROM logpm_distribution_delivery_list ${ew.customSqlSegment}
     </select>
     <select id="selectBycommercialNub" resultType="java.lang.Integer">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java

@@ -55,7 +55,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	 * @param queryWrapper
 	 * @return
 	 */
-	List<DistributionReservationExcel> exportDistrbutionReservation(@Param("ew") Wrapper<DistributionReservationEntity> queryWrapper);
+	List<DistributionReservationVO> exportDistrbutionReservation(@Param("ew") Wrapper<DistributionReservationEntity> queryWrapper);
 
 	Integer addReservations(@Param("list")List<Long> toLongList);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -73,8 +73,8 @@
     </select>
 
 
-    <select id="exportDistrbutionReservation" resultType="com.logpm.distribution.excel.DistributionReservationExcel">
-        SELECT * FROM logpm_distrbution_reservation ${ew.customSqlSegment}
+    <select id="exportDistrbutionReservation" resultType="com.logpm.distribution.vo.DistributionReservationVO">
+        SELECT * FROM logpm_distribution_reservation ${ew.customSqlSegment}
     </select>
     <!--    查询预约列表详情，包含订单信息，详细的增值服务-->
     <select id="getReservationDetail" resultType="com.logpm.distribution.vo.DistributionReservationVO">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -57,10 +57,10 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param distributionDeliveryList
 	 * @return
 	 */
-	List<DistributionDeliveryListExcel> exportDistributionDeliveryList(Wrapper<DistributionDeliveryListEntity> queryWrapper);
+	List<DistributionDeliveryListExcel> exportDistributionDeliveryList(Map<String, Object> distributionDeliveryList);
 
 	/**
 	 * 获取其他表信息

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -49,10 +49,10 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	/**
 	 * 导出数据
 	 *
-	 * @param queryWrapper
+	 * @param distrbutionReservation
 	 * @return
 	 */
-	List<DistributionReservationExcel> exportDistrbutionReservation(Wrapper<DistributionReservationEntity> queryWrapper);
+	List<DistributionReservationExcel> exportDistrbutionReservation(Map<String, Object> distrbutionReservation);
 
 	/**
 	 * 批量确认预约信息

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java

@@ -52,6 +52,7 @@ import lombok.extern.log4j.Log4j2;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.scripting.xmltags.ForEachSqlNode;
 import org.jetbrains.annotations.NotNull;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.InventoryLoadingStatusConstant;
 import org.springblade.common.constant.common.IsOrNoConstant;
@@ -79,6 +80,7 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.system.cache.DictBizCache;
@@ -174,12 +176,55 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 
 
 	@Override
-	public List<DistributionDeliveryListExcel> exportDistributionDeliveryList(Wrapper<DistributionDeliveryListEntity> queryWrapper) {
-		List<DistributionDeliveryListExcel> distributionDeliveryListList = baseMapper.exportDistributionDeliveryList(queryWrapper);
-		//distributionDeliveryListList.forEach(distributionDeliveryList -> {
-		//	distributionDeliveryList.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionDeliveryList.getType()));
-		//});
-		return distributionDeliveryListList;
+	public List<DistributionDeliveryListExcel> exportDistributionDeliveryList(Map<String, Object> distributionDeliveryList) {
+
+		Object o = distributionDeliveryList.get("ids");
+		if(ObjectUtils.isNotNull(o)){
+			distributionDeliveryList.remove("ids");
+		}
+		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isNull(myCurrentWarehouse)){
+			throw new ServiceException("没有仓库信息！");
+		}
+		QueryWrapper<DistributionDeliveryListEntity> queryWrapper = Condition.getQueryWrapper(distributionDeliveryList, DistributionDeliveryListEntity.class);
+		queryWrapper.eq("warehouse_id",myCurrentWarehouse.getId());
+		if(ObjectUtils.isNotNull(o)){
+			queryWrapper.in("id",String.valueOf(o).split(","));
+		}
+		queryWrapper.lambda().eq(DistributionDeliveryListEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		List<DistributionDeliveryListExcel> list = new ArrayList<>();
+		List<DistributionDeliveryListVO> distributionDeliveryListVOS = baseMapper.exportDistributionDeliveryList(queryWrapper);
+		distributionDeliveryListVOS.forEach(dis -> {
+//			distributionDeliveryList.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistributionDeliveryList.getType()));
+			DistributionDeliveryListExcel deliveryListExcel = new DistributionDeliveryListExcel();
+			BeanUtils.copyProperties(dis,deliveryListExcel);
+			String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, dis.getType());
+			deliveryListExcel.setType(value);
+			String valuek = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_DELIVERY_KiIND, dis.getKind());
+			deliveryListExcel.setKind(valuek);
+			String valueks = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_DELIVERY_STATUS, dis.getDeliveryStatus());
+			deliveryListExcel.setState(valueks);
+			deliveryListExcel.setInventoryNub(ObjectUtils.isNotNull(dis.getInventoryNub() ) ? dis.getInventoryNub() : 0 );
+			//查询配送数据
+			if(dis.getKind().equals("1")){
+				//z自
+				List<DistributionDeliverySelfEntity> list1 = distributionDeliverySelfService.list(Wrappers.<DistributionDeliverySelfEntity>query().lambda().eq(DistributionDeliverySelfEntity::getDeliveryId, dis.getId()));
+				String collect = list1.stream().map(DistributionDeliverySelfEntity::getDriverName).collect(Collectors.joining());
+				String colle = list1.stream().map(DistributionDeliverySelfEntity::getVehicleNub).collect(Collectors.joining());
+				deliveryListExcel.setDriver(collect);
+				deliveryListExcel.setVehicle(colle);
+			}else{
+				//三
+				List<DistributionDeliveryTripartiteEntity> list1 = distributionDeliveryTripartiteService.list(Wrappers.<DistributionDeliveryTripartiteEntity>query().lambda().eq(DistributionDeliveryTripartiteEntity::getDeliveryId, dis.getId()));
+				String collect = list1.stream().map(DistributionDeliveryTripartiteEntity::getDriverName).collect(Collectors.joining());
+				String colle = list1.stream().map(DistributionDeliveryTripartiteEntity::getVehicleNum).collect(Collectors.joining());
+				deliveryListExcel.setDriver(collect);
+				deliveryListExcel.setVehicle(colle);
+			}
+			deliveryListExcel.setLoadingTeam("装:"+dis.getLoadingTeamName()+",卸:"+dis.getUnloadingTeamName());
+			list.add(deliveryListExcel);
+		});
+		return list;
 	}
 
 	@Override

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -20,6 +20,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -35,6 +36,7 @@ import com.logpm.oldproject.entity.WayBillEntity;
 import com.logpm.oldproject.feign.IWayBillClient;
 import com.logpm.warehouse.feign.IWarehouseWaybillClient;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.common.constant.Inventory.*;
 import org.springblade.common.constant.common.IsOrNoConstant;
@@ -48,14 +50,17 @@ import org.springblade.common.constant.stockup.StockAssignStatusConstant;
 import org.springblade.common.constant.stockup.StockupStatusConstant;
 import org.springblade.common.constant.stockup.StockupTypeConstant;
 import org.springblade.common.serviceConstant.ServiceConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.ObjectUtil;
+import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -196,14 +201,75 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		return page.setRecords(baseMapper.selectDistrbutionReservationPage(page, distrbutionReservation));
 	}
 
-
+	/**
+	 * 预约导出
+	 * @param distrbutionReservation
+	 * @return
+	 */
 	@Override
-	public List<DistributionReservationExcel> exportDistrbutionReservation(Wrapper<DistributionReservationEntity> queryWrapper) {
-		List<DistributionReservationExcel> distrbutionReservationList = baseMapper.exportDistrbutionReservation(queryWrapper);
-		//distrbutionReservationList.forEach(distrbutionReservation -> {
-		//	distrbutionReservation.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistrbutionReservation.getType()));
-		//});
-		return distrbutionReservationList;
+	public List<DistributionReservationExcel> exportDistrbutionReservation(Map<String, Object> distrbutionReservation) {
+		Object o = distrbutionReservation.get("ids");
+		if(ObjectUtils.isNotNull(o)){
+			distrbutionReservation.remove("ids");
+		}
+		BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse();
+		if(ObjectUtils.isNull()){
+			throw new ServiceException("请选择仓库！");
+		}
+		QueryWrapper<DistributionReservationEntity> queryWrapper = Condition.getQueryWrapper(distrbutionReservation, DistributionReservationEntity.class);
+		queryWrapper.lambda().eq(DistributionReservationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
+		if(ObjectUtils.isNotNull(o)){
+			queryWrapper.in("id",String.valueOf(o).split(","));
+		}
+		queryWrapper.eq("warehouse_id",myCurrentWarehouse.getId());
+//		List<DistributionReservationExcel> distrbutionReservationList = baseMapper.exportDistrbutionReservation(queryWrapper);
+		List<DistributionReservationVO> distrbutionReservationList = baseMapper.exportDistrbutionReservation(queryWrapper);
+		List<DistributionReservationExcel> excelList = new ArrayList<>();
+		distrbutionReservationList.forEach( dis -> {
+//			distrbutionReservation.setTypeName(DictCache.getValue(DictEnum.YES_NO, DistrbutionReservation.getType()));
+			DistributionReservationExcel reservationExcel = new DistributionReservationExcel();
+			reservationExcel.setReservationCode(dis.getReservationCode());
+			reservationExcel.setOrderCode("订单自编号");
+			reservationExcel.setServiceNumber(dis.getServiceNumber());
+			reservationExcel.setWarehouseName(dis.getWarehouseName());
+			reservationExcel.setMallName(dis.getMallName());
+			reservationExcel.setStoreName(dis.getStoreName());
+			reservationExcel.setConsignee(dis.getConsignee());
+			reservationExcel.setDeliveryAddress(dis.getDeliveryAddress());
+			reservationExcel.setDeliveryPhone(dis.getDeliveryPhone());
+			reservationExcel.setReservationData(dis.getReservationDate());
+			String value3 = DictBizCache.getValue(DictBizConstant.PERIOD_OF_TIME, dis.getPeriodOfTime());
+			reservationExcel.setPeriodTimeName(value3); //时段
+			if(ObjectUtils.isNotNull(dis.getTypeService())){
+				String[] split = dis.getServeType().split(",");
+				StringBuffer sb = new StringBuffer();
+				for (String s : split) {
+					String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, s);
+					sb.append(value);
+				}
+				reservationExcel.setServeTypeName(String.valueOf(sb));
+			}
+			if(ObjectUtils.isNotNull(dis.getDeliveryType())){
+				String[] split = dis.getDeliveryType().split(",");
+				StringBuffer sb = new StringBuffer();
+				for (String s : split) {
+					String value = DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, s);
+					sb.append(value);
+				}
+				reservationExcel.setDeliveryTypeName(String.valueOf(sb));
+			}
+			reservationExcel.setReservationNumber(dis.getReservationNum());
+			reservationExcel.setStockListNumber(dis.getReservationStockListNum());
+			reservationExcel.setCollectFee(ObjectUtils.isNotNull(dis.getCollectFee()) ? dis.getCollectFee() : BigDecimal.valueOf(0));
+			reservationExcel.setOtherFee(dis.getOtherFee());
+			reservationExcel.setReplaceFee(ObjectUtils.isNotNull(dis.getReplaceFee()) ? dis.getReplaceFee() : BigDecimal.valueOf(0));
+			String value1 = DictBizCache.getValue(DictBizConstant.RESERVATION_STATUS, dis.getReservationStatus());
+			reservationExcel.setResvervationStatusName(value1);
+			String value2 = DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS, dis.getStockupStatus());
+			reservationExcel.setStockupStatusName(value2);
+			excelList.add(reservationExcel);
+		});
+		return excelList;
 	}
 
 	@Override