Merge remote-tracking branch 'origin/dev' into dev

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdatPriceApiVO.java

@@ -16,11 +16,10 @@
  */
 package com.logpm.basicdata.vo;
 
-import com.logpm.basicdata.enums.PriceBizTypeApiEnums;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 
 /**
@@ -33,27 +32,25 @@ import java.io.Serializable;
 public class BasicdatPriceApiVO implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	/**
-	 * 客户id
-	 */
 	@NotEmpty(message = "客户id不能为空")
+	@ApiModelProperty(value = "客户id")
 	private String clientId;
-	/**
-	 * 品牌id
-	 */
 	@NotEmpty(message = "品牌id不能为空")
+	@ApiModelProperty(value = "品牌id")
 	private String brandId;
-	/**
-	 * 发货单位id
-	 */
+	@ApiModelProperty(value = "发货单位id")
 	private String sendOrgId;
-	/**
-	 * 始发地
-	 */
-	private String startAreaId;
-	/**
-	 * 目的地
-	 */
-	private String endAreaId;
+	@ApiModelProperty(value = "始发地省份id")
+	private Long startProvinceId;
+	@ApiModelProperty(value = "始发地城市id")
+	private Long startCityId;
+	@ApiModelProperty(value = "始发地区县id")
+	private Long startCountyId;
+	@ApiModelProperty(value = "目的地省份id")
+	private Long endProvinceId;
+	@ApiModelProperty(value = "目的地城市id")
+	private Long endCityId;
+	@ApiModelProperty(value = "目的地区县id")
+	private Long endCountyId;
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataPriceController.java

@@ -19,8 +19,10 @@ package com.logpm.basicdata.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.logpm.basicdata.service.IBasicdataPriceService;
+import com.logpm.basicdata.vo.BasicdatPriceApiVO;
 import com.logpm.basicdata.vo.BasicdataPriceBasicUpdateVO;
 import com.logpm.basicdata.vo.BasicdataPricePageVO;
+import com.logpm.basicdata.vo.PriceClientVO;
 import com.logpm.basicdata.vo.PriceVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -113,13 +115,18 @@ public class BasicdataPriceController extends BladeController {
 		@ApiImplicitParam(name = "file", value = "文件", dataType = "MultipartFile")
 	})
 	public R<String> upload(@RequestPart("file") MultipartFile file) {
-		try (InputStream inputStream = file.getInputStream()) {
-			String res = basicdataPriceService.upload(inputStream);
-			return R.data(res);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		return R.data("上传失败");
+		return R.data(basicdataPriceService.upload(file));
+	}
+
+	/**
+	 * 基础价格表 指定查询
+	 */
+	@GetMapping("/custom")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "指定条件查询", notes = "传入basicdataPrice")
+	public R<PriceClientVO> custom(BasicdatPriceApiVO param) {
+		PriceClientVO detail = basicdataPriceService.price(param);
+		return R.data(detail);
 	}
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryBasicExcel.java

@@ -0,0 +1,62 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel.price;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 价格 Excel实体类
+ *
+ * @author chao
+ * @since 2024-04-19
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataPriceCategoryBasicExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty(value = "客户名称", index = 0)
+	private String client;
+	@ExcelProperty(value = "品牌", index = 1)
+	private String brand;
+	@ExcelProperty(value = "发站", index = 2)
+	private String startName;
+	@ExcelProperty(value = "到站", index = 3)
+	private String endName;
+	@ExcelProperty(value = "发货单位", index = 4)
+	private String sendOrg;
+	@ExcelProperty(value = "服务类型", index = 5)
+	private String type;
+	@ExcelProperty(value = "计费类型", index = 6)
+	private String costType;
+	@ExcelProperty(value = "品类", index = 7)
+	private String category;
+	@ExcelProperty(value = "单价", index = 8)
+	private String price;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryDispatchExcel.java

@@ -0,0 +1,66 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel.price;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 价格 Excel实体类
+ *
+ * @author chao
+ * @since 2024-04-19
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataPriceCategoryDispatchExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty(value = "客户名称", index = 0)
+	private String client;
+	@ExcelProperty(value = "品牌", index = 1)
+	private String brand;
+	@ExcelProperty(value = "费用类型", index = 2)
+	private String type;
+	@ExcelProperty(value = "计价方式", index = 3)
+	private String costType;
+	@ExcelProperty(value = "品类", index = 4)
+	private String category;
+	@ExcelProperty(value = "单价", index = 5)
+	private Double price;
+	@ExcelProperty(value = "遗留单价", index = 6)
+	private Double leaveBehindPrice;
+	@ExcelProperty(value = "分货费", index = 7)
+	private Double sortPrice;
+	@ExcelProperty(value = "操作/装卸费", index = 8)
+	private Double handlingPrice;
+	@ExcelProperty(value = "平移费", index = 9)
+	private Double relocationPrice;
+	@ExcelProperty(value = "上楼费", index = 10)
+	private Double upstairsDeliveryPrice;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceCategoryWarehouseExcel.java

@@ -0,0 +1,67 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel.price;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 价格 Excel实体类
+ *
+ * @author chao
+ * @since 2024-04-19
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataPriceCategoryWarehouseExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty(value = "客户名称", index = 0)
+	private String client;
+	@ExcelProperty(value = "品牌", index = 1)
+	private String brand;
+	@ExcelProperty(value = "计价方式", index = 2)
+	private String costType;
+	@ExcelProperty(value = "品类", index = 3)
+	private String category;
+	@ExcelProperty(value = "30天内", index = 4)
+	private String withinThirtyPrice;
+	@ExcelProperty(value = "30-60天", index = 5)
+	private String betweenThirtySixtyPrice;
+	@ExcelProperty(value = "60天外", index = 6)
+	private String beyondSixtyPrice;
+	@ExcelProperty(value = "上限价格", index = 7)
+	private String maximumPrice;
+	@ExcelProperty(value = "操作/装卸费", index = 8)
+	private String operatePrice;
+	@ExcelProperty(value = "仓储管理费", index = 9)
+	private String warehouseManagementPrice;
+	@ExcelProperty(value = "仓储分货费", index = 10)
+	private String warehouseSortPrice;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceExcel.java

@@ -0,0 +1,86 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel.price;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 价格 Excel实体类
+ *
+ * @author chao
+ * @since 2024-04-19
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataPriceExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户名称
+	 */
+	@ExcelProperty(value = "客户名称", index = 0)
+	private String client;
+	/**
+	 * 品牌
+	 */
+	@ExcelProperty(value = "品牌", index = 1)
+	private String brand;
+	/**
+	 * 生效时间
+	 */
+	@ExcelProperty(value = "生效时间", index = 2)
+	private String effectiveTime;
+	/**
+	 * 到期时间
+	 */
+	@ExcelProperty(value = "到期时间", index = 3)
+	private String expiryTime;
+	/**
+	 * 模版名称
+	 */
+	@ExcelProperty(value = "模版名称", index = 4)
+	private String templateName;
+	/**
+	 * 向上判断件数
+	 */
+	@ExcelProperty(value = "向上判断件数", index = 5)
+	private String dispatchUpwardJudgment;
+
+	/**
+	 * 向上判断件数
+	 */
+	@ExcelProperty(value = "向上判断件数", index = 6)
+	private String dispatchUpwardJudgmentCost;
+
+	/**
+	 * 上楼费免费楼层
+	 */
+	@ExcelProperty(value = "上楼费免费楼层", index = 7)
+	private String dispatchStairsCarryingCharge;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceFullVehicleExcel.java

@@ -0,0 +1,60 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel.price;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 价格 Excel实体类
+ *
+ * @author chao
+ * @since 2024-04-19
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataPriceFullVehicleExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	@ExcelProperty(value = "客户名称", index = 0)
+	private String client;
+	@ExcelProperty(value = "品牌", index = 1)
+	private String brand;
+	@ExcelProperty(value = "发站", index = 2)
+	private String startName;
+	@ExcelProperty(value = "到站", index = 3)
+	private String endName;
+	@ExcelProperty(value = "发货单位", index = 4)
+	private String sendOrg;
+	@ExcelProperty(value = "类型", index = 5)
+	private String type;
+	@ExcelProperty(value = "车型", index = 6)
+	private String vehicleType;
+	@ExcelProperty(value = "整车计费（元/车）", index = 7)
+	private String price;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/price/BasicdataPriceGeneralExcel.java

@@ -0,0 +1,84 @@
+/*
+ *      Copyright (c) 2018-2028, Chill Zhuang All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without
+ *  modification, are permitted provided that the following conditions are met:
+ *
+ *  Redistributions of source code must retain the above copyright notice,
+ *  this list of conditions and the following disclaimer.
+ *  Redistributions in binary form must reproduce the above copyright
+ *  notice, this list of conditions and the following disclaimer in the
+ *  documentation and/or other materials provided with the distribution.
+ *  Neither the name of the dreamlu.net developer nor the names of its
+ *  contributors may be used to endorse or promote products derived from
+ *  this software without specific prior written permission.
+ *  Author: Chill 庄骞 (smallchill@163.com)
+ */
+package com.logpm.basicdata.excel.price;
+
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import lombok.Data;
+
+import java.io.Serializable;
+
+
+/**
+ * 价格 Excel实体类
+ *
+ * @author chao
+ * @since 2024-04-19
+ */
+@Data
+@ColumnWidth(25)
+@HeadRowHeight(20)
+@ContentRowHeight(18)
+public class BasicdataPriceGeneralExcel implements Serializable {
+
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * 客户名称
+	 */
+	@ExcelProperty(value = "客户名称", index = 0)
+	private String client;
+	/**
+	 * 品牌
+	 */
+	@ExcelProperty(value = "品牌", index = 1)
+	private String brand;
+	/**
+	 * 发站
+	 */
+	@ExcelProperty(value = "发站", index = 2)
+	private String startName;
+	/**
+	 * 到站
+	 */
+	@ExcelProperty(value = "到站", index = 3)
+	private String endName;
+	/**
+	 * 发货单位
+	 */
+	@ExcelProperty(value = "发货单位", index = 4)
+	private String sendOrg;
+	/**
+	 * 类型
+	 */
+	@ExcelProperty(value = "类型", index = 5)
+	private String type;
+	/**
+	 * 最低计费值
+	 */
+	@ExcelProperty(value = "最低计费值", index = 6)
+	private String minCost;
+	/**
+	 * 加算价格
+	 */
+	@ExcelProperty(value = "加算价格", index = 7)
+	private String addCost;
+
+}

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataPriceService.java

@@ -47,15 +47,6 @@ public interface IBasicdataPriceService extends BaseService<BasicdataPriceEntity
 	 */
 	IPage<BasicdataPricePageVO > selectBasicdataPricePage(IPage<BasicdataPricePageVO > page, BasicdataPricePageVO basicdataPrice);
 
-
-	/**
-	 * 导出数据
-	 *
-	 * @param queryWrapper
-	 * @return
-	 */
-	List<BasicdataPriceExcel> exportBasicdataPrice(Wrapper<BasicdataPriceEntity> queryWrapper);
-
 	Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo);
 
 	Boolean updatePrice(PriceVO vo);
@@ -77,5 +68,5 @@ public interface IBasicdataPriceService extends BaseService<BasicdataPriceEntity
      * @param file 需要上传的文件，类型为MultipartFile。
      * @return 返回上传结果，一般为上传成功或失败的信息。
      */
-    String upload(InputStream file);
+    String upload(MultipartFile file);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataPriceServiceImpl.java

@@ -23,9 +23,6 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.excel.EasyExcel;
-import com.alibaba.excel.ExcelReader;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.logpm.basicdata.entity.BasicdataPriceCategoryBasicEntity;
@@ -44,7 +41,12 @@ import com.logpm.basicdata.enums.PickupPricingTypeEnums;
 import com.logpm.basicdata.enums.ServiceTypeEnums;
 import com.logpm.basicdata.enums.TrunkLinePricingTypeEnums;
 import com.logpm.basicdata.enums.WarehousePricingTypeEnums;
-import com.logpm.basicdata.excel.BasicdataPriceExcel;
+import com.logpm.basicdata.excel.price.BasicdataPriceCategoryBasicExcel;
+import com.logpm.basicdata.excel.price.BasicdataPriceCategoryDispatchExcel;
+import com.logpm.basicdata.excel.price.BasicdataPriceCategoryWarehouseExcel;
+import com.logpm.basicdata.excel.price.BasicdataPriceExcel;
+import com.logpm.basicdata.excel.price.BasicdataPriceFullVehicleExcel;
+import com.logpm.basicdata.excel.price.BasicdataPriceGeneralExcel;
 import com.logpm.basicdata.mapper.BasicdataPriceMapper;
 import com.logpm.basicdata.service.IBasicdataPriceCategoryBasicService;
 import com.logpm.basicdata.service.IBasicdataPriceCategoryDispatchService;
@@ -74,13 +76,14 @@ import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.enums.BooleanZeroOneEnums;
 import org.springblade.common.model.IDict;
+//import org.springblade.core.excel.util.ExcelUtil;
+import org.springblade.core.excel.util.ExcelUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
@@ -137,13 +140,6 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		return page.setRecords(basicdataPriceVOS);
 	}
 
-
-	@Override
-	public List<BasicdataPriceExcel> exportBasicdataPrice(Wrapper<BasicdataPriceEntity> queryWrapper) {
-		List<BasicdataPriceExcel> basicdataPriceList = baseMapper.exportBasicdataPrice(queryWrapper);
-		return basicdataPriceList;
-	}
-
 	@Override
 	public Boolean basicUpdate(BasicdataPriceBasicUpdateVO vo) {
 		if (DateUtil.compare(vo.getEffectiveTime(), vo.getExpiryTime()) > 0) {
@@ -318,8 +314,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				List<BasicdataPriceRouteEntity> routeEntities = basicdataPriceRouteService.list(Wrappers.<BasicdataPriceRouteEntity>lambdaQuery()
 					.eq(BasicdataPriceRouteEntity::getPriceId, priceEntity.getId())
 					.eq(BasicdataPriceRouteEntity::getSendOrgId, param.getSendOrgId())
-					.eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartAreaId())
-					.eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndAreaId())
+					.eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartCountyId())
+					.eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndCountyId())
 					.eq(BasicdataPriceRouteEntity::getServiceType, ServiceTypeEnums.PICK_UP.getCode())
 				);
 				if (CollUtil.isNotEmpty(routeEntities)) {
@@ -347,8 +343,8 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 				List<BasicdataPriceRouteEntity> routeEntities = basicdataPriceRouteService.list(Wrappers.<BasicdataPriceRouteEntity>lambdaQuery()
 					.eq(BasicdataPriceRouteEntity::getPriceId, priceEntity.getId())
 					.eq(BasicdataPriceRouteEntity::getSendOrgId, param.getSendOrgId())
-					.eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartAreaId())
-					.eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndAreaId())
+					.eq(BasicdataPriceRouteEntity::getStartCountyId, param.getStartCountyId())
+					.eq(BasicdataPriceRouteEntity::getEndCountyId, param.getEndCountyId())
 					.eq(BasicdataPriceRouteEntity::getServiceType, ServiceTypeEnums.TRUNK_LINE.getCode())
 				);
 				if (CollUtil.isNotEmpty(routeEntities)) {
@@ -378,14 +374,23 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 	}
 
 	@Override
-	public String upload(InputStream file) {
+	public String upload(MultipartFile file) {
 		StringBuilder message = new StringBuilder();
-		ExcelReader build = null;
 		try {
-			build = EasyExcel.read(file).build();
 			// 从build中获取5个sheet的数据
+			List<BasicdataPriceExcel> priceExcels = ExcelUtil.read(file, 0, BasicdataPriceExcel.class);
+			List<BasicdataPriceCategoryBasicExcel> basicExcels = ExcelUtil.read(file, 1, BasicdataPriceCategoryBasicExcel.class);
+			List<BasicdataPriceCategoryDispatchExcel> dispatchExcels = ExcelUtil.read(file, 2, BasicdataPriceCategoryDispatchExcel.class);
+			List<BasicdataPriceCategoryWarehouseExcel> warehouseExcels = ExcelUtil.read(file, 3, BasicdataPriceCategoryWarehouseExcel.class);
+			List<BasicdataPriceGeneralExcel> generalExcels = ExcelUtil.read(file, 4, BasicdataPriceGeneralExcel.class);
+			List<BasicdataPriceFullVehicleExcel> fullVehicleExcels = ExcelUtil.read(file, 5, BasicdataPriceFullVehicleExcel.class);
+			// 校验数据
+			if (CollUtil.isNotEmpty(priceExcels)) {
 
-		}catch (Exception e){
+			}
+			// 保存数据
+
+		} catch (Exception e) {
 
 		}
 		return null;
@@ -479,7 +484,7 @@ public class BasicdataPriceServiceImpl extends BaseServiceImpl<BasicdataPriceMap
 		if (CollUtil.isNotEmpty(dispatchEntities)) {
 			// 将数据放到categoryBasicMap中
 			dispatchEntities.forEach(item -> {
-				Integer type = item.getServiceType();
+				Integer type = item.getType();
 				List<BasicdataPriceCategoryDispatchEntity> collect = categoryBasicMap.get(type);
 				if (ObjectUtil.isEmpty(collect)) {
 					collect = new ArrayList<>();

blade-service/logpm-factory-data/logpm-factory-data-base/src/main/resources/application.yml

@@ -39,4 +39,4 @@ xxl:
       ip: 127.0.0.1
       logpath: ../data/applogs/logpm-factory-data-xxljob/jobhandler
       logretentiondays: -1
-      port: 17019
+      port: 17018

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/OpenOrderServiceImpl.java

@@ -313,12 +313,11 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 		if(Objects.isNull(brandId)){
 			BasicdataBrandEntity basicdataBrandEntity = basicdataBrandClient.findEntityByName(brand);
 			if (!Objects.isNull(basicdataBrandEntity)) {
-				waybillEntity.setBrandId(basicdataBrandEntity.getId());
+				brandId = basicdataBrandEntity.getId();
 			}
-		}else{
-			waybillEntity.setBrandId(brandId);
 		}
 
+		waybillEntity.setBrandId(brandId);
 		waybillEntity.setBrand(brand);
 		waybillEntity.setOrderNo(openOrderDTO.getOrderCode());
 		waybillEntity.setDepartureWarehouseId(departureWarehouseId);
@@ -536,7 +535,7 @@ public class OpenOrderServiceImpl implements IOpenOrderService {
 
 		//判断是否是开单及入库的配置
 		Boolean aBoolean = basicdataOpenIncomingClient.checkOpenIncoming(warehouseId, brandId);
-		if (aBoolean) {
+		if (Boolean.TRUE.equals(aBoolean)) {
 			openOrderAsyncService.incomingPackageBatch(advanceIds, AuthUtil.getUserId(), Func.firstLong(AuthUtil.getDeptId()), AuthUtil.getTenantId(), AuthUtil.getNickName(), IncomingTypeEnum.OPEN_TO_IN.getCode());
 		}