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

blade-biz-common/src/main/java/org/springblade/common/constant/driver/DriverApprovedDrivingModelConstant.java

@@ -0,0 +1,43 @@
+package org.springblade.common.constant.driver;
+/*
+ *  logisticsplatform-service
+ *  @Author   Diss
+ *  @Create   2024/1/12  15:32
+ */
+
+/**
+ * ApprovedDrivingModel
+ */
+public enum DriverApprovedDrivingModelConstant {
+	//准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2
+	A1("A1", "1"),
+	A2("A2", "2"),
+	A3("A3", "3"),
+	B1("B1", "4"),
+	B2("B2", "5"),
+	C1("C1", "6"),
+	C2("C2", "7");
+	private String name;
+	private String value;
+
+	DriverApprovedDrivingModelConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

blade-biz-common/src/main/java/org/springblade/common/constant/driver/DriverBankTypeConverter.java

@@ -0,0 +1,48 @@
+package org.springblade.common.constant.driver;
+/*
+ *  logisticsplatform-service
+ *  @Author   Diss
+ *  @Create   2024/1/12  15:34
+ */
+
+/**
+ * BankType
+ */
+public enum DriverBankTypeConverter {
+	//银行类型;1-工商银行,2-建设银行,3-农业银行,4-邮政银行,5-中国银行,6-交通银行,7-其他
+	ICBC("工商银行","1"),
+	//2-建设银行
+	CCB("建设银行","2"),
+	//3-农业银行
+	ABC("农业银行","3"),
+	//4-邮政银行
+	POST("邮政银行","4"),
+	//5-中国银行
+	BANK("中国银行","5"),
+	//6-交通银行
+	JHB("交通银行","6"),
+	//7-其他
+	OTHER("其他","7");
+	private String name;
+	private String value;
+	DriverBankTypeConverter(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

blade-biz-common/src/main/java/org/springblade/common/constant/driver/DriverPositionTypeConstant.java

@@ -0,0 +1,36 @@
+package org.springblade.common.constant.driver;
+/*
+ *  logisticsplatform-service
+ *  @Author   Diss
+ *  @Create   2024/1/12  15:28
+ */
+
+public enum DriverPositionTypeConstant {
+	//职务类型;1-干线,2-配送
+	ganxian("干线", "1"),
+	peisong("配送", "2");
+	private String name;
+	private String value;
+
+	DriverPositionTypeConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+
+}

blade-biz-common/src/main/java/org/springblade/common/constant/driver/DriverTypeStatusConstant.java

@@ -0,0 +1,40 @@
+package org.springblade.common.constant.driver;
+/*
+ *  logisticsplatform-service
+ *  @Author   Diss
+ *  @Create   2024/1/12  15:19
+ */
+
+/**
+ * 司机类型的状态
+ */
+public enum DriverTypeStatusConstant {
+	//司机类型;1-自有,2-加盟,3-外调,4-临调
+	ziyou("自有", "1"),
+	jiamao("加盟", "2"),
+	waifang("外调", "3"),
+	lincha("临调", "4");
+	private String name;
+	private String value;
+
+	DriverTypeStatusConstant(String name, String value) {
+		this.name = name;
+		this.value = value;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getValue() {
+		return value;
+	}
+
+	public void setValue(String value) {
+		this.value = value;
+	}
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataCarrierEntity.java

@@ -207,5 +207,10 @@ public class BasicdataCarrierEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
+	/**
+	 * id
+	 */
+	@ApiModelProperty(value = "id")
+	private Long id;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataDriverArteryEntity.java

@@ -212,13 +212,13 @@ public class BasicdataDriverArteryEntity extends TenantEntity {
 	/**
 	 * 预留5
 	 */
-	@ApiModelProperty(value = "预留5")
+	@ApiModelProperty(value = "仓库ID")
 	private String warehouseId;
 
 	/**
 	 * 预留5
 	 */
-	@ApiModelProperty(value = "预留5")
+	@ApiModelProperty(value = "仓库名称")
 	private String warehouseName;
 
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataVehicleEntity.java

@@ -319,4 +319,6 @@ public class BasicdataVehicleEntity extends TenantEntity {
 	@ApiModelProperty(value = "预留5")
 	private String reserve5;
 
+	@ApiModelProperty(value = "id")
+	private Long id;
 }

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataWarehouseEntity.java

@@ -280,4 +280,10 @@ public class BasicdataWarehouseEntity extends TenantEntity {
 	@ApiModelProperty(value = "老系统id")
 	private Integer oldId;
 
+
+	/**
+	 *   对应id
+	 */
+	@ApiModelProperty(value = "仓库id")
+	public Long id;
 }

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionBillOrderPackVO.java

@@ -37,4 +37,8 @@ public class DistributionBillOrderPackVO {
 	private Date signForCreateTime; //签收时间
 	private Date clerkUpdateTime; //文员签收时间
 	private Date stockupCreateTime; //备货时间名称
+	/**
+	 * 服务类型
+	 */
+	private String outboundType;
 }

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

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.excel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.alibaba.excel.annotation.write.style.ContentRowHeight;
@@ -56,13 +57,6 @@ public class BasicdataDriverArteryExcel implements Serializable {
 	@ColumnWidth(40)
 	@ExcelProperty("司机手机号码")
 	private String phone;
-
-	/**
-	 * 车辆信息
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("车辆信息")
-	private String  bindVehicles;
 	/**
 	 * 司机类型;1-自有,2-加盟,3-外调,4-临调
 	 */
@@ -81,7 +75,12 @@ public class BasicdataDriverArteryExcel implements Serializable {
 	@ColumnWidth(40)
 	@ExcelProperty("准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2")
 	private Integer drivingType;
-
+	/**
+	 * 车辆信息
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("车辆信息")
+	private String  bindVehicles;
 	/**
 	 * 绑定车辆
 	 */
@@ -111,7 +110,13 @@ public class BasicdataDriverArteryExcel implements Serializable {
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("性别")
-	private Integer gender;
+	private String gender;
+	/**
+	 * 仓库
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("仓库")
+	private String warehouseName;
 	/**
 	 * 居住地址
 	 */
@@ -166,7 +171,12 @@ public class BasicdataDriverArteryExcel implements Serializable {
 	@ColumnWidth(40)
 	@ExcelProperty("道路经营许可证号")
 	private String roadOperationLicenseNub;
-
+	/**
+	 * 关联承运商Id
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("关联承运商")
+	private String carrierName;
 	/**
 	 * 运输协议
 	 */

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

@@ -17,13 +17,16 @@
 package com.logpm.basicdata.excel;
 
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 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;
+import java.util.Date;
 
 
 /**
@@ -41,7 +44,6 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 
-
 	/**
 	 * 司机姓名
 	 */
@@ -54,44 +56,48 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	@ColumnWidth(40)
 	@ExcelProperty("司机手机号码")
 	private String phone;
-
-	/**
-	 * 车辆信息
-	 */
-	@ColumnWidth(40)
-	@ExcelProperty("车辆信息")
-	private String  bindVehicles;
 	/**
 	 * 司机类型;1-自有,2-加盟,3-外调,4-临调
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("司机类型;1-自有,2-加盟,3-外调,4-临调")
-	private Integer type;
+	private String type;
 	/**
 	 * 职务类型;1-干线,2-配送
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("职务类型;1-干线,2-配送")
-	private Integer jobType;
+	private String jobType;
 	/**
 	 * 准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("准驾车型;1-A1,2-A2,3-A3,4-B1,5-B2,6-C1,7-C2")
-	private Integer drivingType;
+	private String drivingType;
-
+//	/**
+//	 * 车辆信息
+//	 */
+//	@ColumnWidth(40)
+//	@ExcelProperty("车辆信息")
+//	private String  bindVehicles;
+	/**
+	 * 绑定车辆
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("绑定车辆")
+	private String bindVehicle;
 	/**
 	 * 合同开始时间
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("合同开始时间")
-	private String contractStartTime;
+	private Date contractStartTime;
 	/**
 	 * 合同结束时间
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("合同结束时间")
-	private String contractEndTime;
+	private Date contractEndTime;
 	/**
 	 * 身份证号
 	 */
@@ -102,8 +108,14 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	 * 性别
 	 */
 	@ColumnWidth(40)
-	@ExcelProperty("性别")
+	@ExcelProperty("性别;1-男，2-女")
-	private Integer gender;
+	private String gender;
+	/**
+	 * 仓库
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("仓库")
+	private String warehouseName;
 	/**
 	 * 居住地址
 	 */
@@ -115,7 +127,7 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("银行类型;1-工商银行,2-建设银行,3-农业银行,4-邮政银行,5-中国银行,6-交通银行,7-其他")
-	private Integer bankType;
+	private String bankType;
 	/**
 	 * 银行卡号
 	 */
@@ -139,13 +151,13 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("驾驶证起始日期")
-	private String driverLicenseStartTime;
+	private Date driverLicenseStartTime;
 	/**
 	 * 驾驶证到期日期
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("驾驶证到期日期")
-	private String driverLicenseEndTime;
+	private Date driverLicenseEndTime;
 	/**
 	 * 从业资格证编号
 	 */
@@ -158,14 +170,18 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	@ColumnWidth(40)
 	@ExcelProperty("道路经营许可证号")
 	private String roadOperationLicenseNub;
-
+	/**
+	 * 关联承运商Id
+	 */
+	@ColumnWidth(40)
+	@ExcelProperty("关联承运商")
+	private String carrierName;
 	/**
 	 * 运输协议
 	 */
 	@ColumnWidth(40)
 	@ExcelProperty("运输协议")
 	private String transportationAgreement;
-
 	/**
 	 * 备注
 	 */
@@ -173,5 +189,24 @@ public class BasicdataDriverArteryImproterExcel implements Serializable {
 	@ExcelProperty("备注")
 	private String notes;
 
+	/**
+	 * 和实体类表对应的字段
+	 */
+	/**
+	 * 仓库ID
+	 */
+	@ExcelIgnore
+	private String warehouseId;
+	/**\
+	 * 关联承运商Id
+	 */
+	@ExcelIgnore
+	private Long carrierId;
+	/**
+	 * 用户id
+	 */
+	@ExcelIgnore
+	private Long userId;
+
 
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.java

@@ -58,4 +58,6 @@ public interface BasicdataDriverArteryMapper extends BaseMapper<BasicdataDriverA
 	List<BasicdataDriverArteryVO> selectBasicdataDictionary();
 
     List<BasicdataDriverArteryEntity> findDriverListByName(@Param("driverName") String driverName);
+
+	void updateIsdeletedByPhone(@Param("phone") String phone);
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataDriverArteryMapper.xml

@@ -46,6 +46,12 @@
         <result column="reserve4" property="reserve4"/>
         <result column="reserve5" property="reserve5"/>
     </resultMap>
+    <update id="updateIsdeletedByPhone">
+
+        UPDATE logpm_basicdata_driver_artery lbda
+        SET lbda.is_deleted = 1
+        WHERE lbda.phone = #{phone} AND lbda.is_deleted = 0
+    </update>
 
 
     <select id="selectBasicdataDriverArteryPage" resultType="com.logpm.basicdata.vo.BasicdataDriverArteryVO">
@@ -119,14 +125,19 @@
         lbda.bank_type bankType,
         lbda.bank_card_nub bankCardNub,
         lbda.driver_license_nub driverLicenseNub,
+        lbda.road_operation_license_nub roadOperationLicenseNub,
         lbda.driver_license_organ driverLicenseOrgan,
         lbda.driver_license_start_time driverLicenseStartTime,
         lbda.driver_license_end_time driverLicenseEndTime,
         lbda.employee_qualification_nub employeeQualificationNub,
         lbda.transportation_agreement transportationAgreement,
+        lbda.warehouse_name warehouseName,
+        lbda.residential_address residentialAddress,
+        lbc.carrier_name carrierName,
         (SELECT GROUP_CONCAT(brand_id SEPARATOR ',') from logpm_basicdata_drivermiddle lbd WHERE lbd.driver_id = lbda.id and lbd.is_deleted = 0) bindVehicles
         FROM
         logpm_basicdata_driver_artery lbda
+        JOIN logpm_basicdata_carrier lbc ON lbda.carrier_id = lbc.id  and lbc.is_deleted = 0
         <where>
             lbda.is_deleted = 0
             <if test="param.name != null ">and lbda.name like

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

@@ -18,33 +18,45 @@ package com.logpm.basicdata.service.impl;
 
 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.logpm.basicdata.dto.BasicdataDriverArteryDTO;
-import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
+import com.logpm.basicdata.entity.*;
-import com.logpm.basicdata.entity.BasicdataDrivermiddleEntity;
-import com.logpm.basicdata.entity.BasicdataVehicleEntity;
-import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataDriverArteryExcel;
 import com.logpm.basicdata.excel.BasicdataDriverArteryImproterExcel;
 import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import com.logpm.basicdata.mapper.BasicdataDriverArteryMapper;
 import com.logpm.basicdata.mapper.BasicdataDrivermiddleMapper;
 import com.logpm.basicdata.mapper.BasicdataVehicleMapper;
+import com.logpm.basicdata.service.IBasicdataCarrierService;
 import com.logpm.basicdata.service.IBasicdataDriverArteryService;
 import com.logpm.basicdata.service.IBasicdataVehicleService;
 import com.logpm.basicdata.vo.BasicdataDriverArteryVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springblade.common.constant.driver.DriverTypeStatusConstant;
+import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
+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.utils.Func;
+import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.entity.User;
+import org.springblade.system.feign.IUserClient;
+import org.springblade.system.feign.IUserSearchClient;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.alibaba.fastjson.JSONPatch.OperationType.copy;
+
 /**
  * 司机信息表 服务实现类
  *
@@ -66,6 +78,10 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 	private final BasicdataDrivermiddleServiceImpl basicdataDrivermiddleService;
 
 	private final IBasicdataWarehouseClient warehouseClient;
+	private final IUserClient userClient;
+	private final IBasicdataCarrierService basicdataCarrierService;
+	private final BasicdataDriverArteryMapper basicdataDriverArteryMapper;
+	private final BasicdataDrivermiddleServiceImpl basicdataDrivermiddleServiceImpl;
 
 	@Override
 	public IPage<BasicdataDriverArteryVO> selectBasicdataDriverArteryPage(IPage<BasicdataDriverArteryVO> page, BasicdataDriverArteryDTO basicdataDriverArtery) {
@@ -79,6 +95,7 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 		//basicdataDriverArteryList.forEach(basicdataDriverArtery -> {
 		//	basicdataDriverArtery.setTypeName(DictCache.getValue(DictEnum.YES_NO, BasicdataDriverArtery.getType()));
 		//});
+
 		return basicdataDriverArteryList;
 	}
 
@@ -134,17 +151,99 @@ public class BasicdataDriverArteryServiceImpl extends BaseServiceImpl<BasicdataD
 		return basicdataDriverArteryVOS;
 	}
 
+	/**
+	 * 导入
+	 *
+	 * @param data
+	 */
 	@Override
-	public void importDriverArtery(List<BasicdataDriverArteryImproterExcel> data) {
+	public void   importDriverArtery(List<BasicdataDriverArteryImproterExcel> data) {
-		ArrayList<BasicdataDriverArteryEntity> arrayList = new ArrayList<>();
+		log.info("传入参数>>>>>>>>>>>>>>>>>>>>>>>{}",data);
+		outerLoop:
 		for (BasicdataDriverArteryImproterExcel datum : data) {
+			List<BasicdataDrivermiddleEntity> driverMiddleEntity = new ArrayList<>();
+
+			//检查数据是否为空
+			if (ObjectUtils.isEmpty(datum.getPhone())|| ObjectUtils.isEmpty(datum.getName())|| ObjectUtils.isEmpty(datum.getWarehouseName())|| ObjectUtils.isEmpty(datum.getCarrierName())) {
+
+//				log.error("必填数据不能为空");
+//				continue;
+				throw new ServiceException("用户"+datum.getName() +"必填数据不能为空！");
+			}
+			if(!ObjectUtils.isEmpty(datum.getPhone())){
+				R<User> userR = userClient.userInfoByPhone("627683", datum.getPhone());
+				if (userR.getData() == null){
+//					log.error("未找到用户");
+//					continue;
+					throw new ServiceException("用户"+datum.getName() +"未找到用户！");
+				}else {
+					datum.setUserId(userR.getData().getId());
+				}
+			}
+			if (!ObjectUtils.isEmpty(datum.getBindVehicle())){
+				String[] car = datum.getBindVehicle().split(",");
+				for (String s : car) {
+					List<BasicdataVehicleEntity> carListByName = basicdataVehicleService.findCarListByName(s);
+
+					if (carListByName.isEmpty()){
+//						log.error("未找到可绑定的车辆");
+						throw new ServiceException("用户"+datum.getName() +"未找到可绑定的车辆！");
+					}else{
+						BasicdataDrivermiddleEntity basicdataDrivermiddleEntity = new BasicdataDrivermiddleEntity();
+						basicdataDrivermiddleEntity.setBrandId(carListByName.get(0).getId());
+						driverMiddleEntity.add(basicdataDrivermiddleEntity);
+					}
+				}
+			}
+			if (!ObjectUtils.isEmpty(datum.getCarrierName())){
+				//找到数据库内的承运商
+				List<BasicdataCarrierEntity> basicdataCarrierEntities = basicdataCarrierService.list(Wrappers.<BasicdataCarrierEntity>lambdaQuery().eq(BasicdataCarrierEntity::getCarrierName,datum.getCarrierName()));
+
+				if (ObjectUtils.isEmpty(basicdataCarrierEntities)){
+//					log.error("未找到承运商");
+//					continue;
+					throw new ServiceException("用户"+datum.getName() +"未找到承运商！");
+				}else{
+					datum.setCarrierId(basicdataCarrierEntities.get(0).getId());
+				}
+			}
+			if (!ObjectUtils.isEmpty(datum.getWarehouseName())){
+				//在数据库找到仓库名字对应
+				BasicdataWarehouseEntity byName = warehouseClient.findByName(datum.getWarehouseName());
+				if (ObjectUtils.isEmpty(byName)){
+//					log.error("未找到仓库");
+//					continue;
+					throw new ServiceException("用户"+datum.getName() +"未找到仓库！");
+				}else{
+					datum.setWarehouseId(String.valueOf(byName.getId()));
+				}
+			}
+			//根据手机号去重  如果有手机号相同 就删除老数据
+			if (ObjectUtils.isNotNull(datum) && ObjectUtils.isNotNull(datum.getPhone())) {
+				List<BasicdataDriverArteryEntity> basicdataVehicleEntities = baseMapper.selectList(new QueryWrapper<BasicdataDriverArteryEntity>().lambda()
+					.eq(BasicdataDriverArteryEntity::getPhone, datum.getPhone()));
+				if (!basicdataVehicleEntities.isEmpty()){
+					basicdataDriverArteryMapper.updateIsdeletedByPhone(datum.getPhone());
+				}
+			}
 			BasicdataDriverArteryEntity copy = Func.copy(datum, BasicdataDriverArteryEntity.class);
+			//连接到前端后取消注释
+			BladeUser user = AuthUtil.getUser();
+			copy.setTenantId(user.getTenantId());// 租户号
+			copy.setUserId(user.getUserId());    // 创建人
+			copy.setUpdateUser(user.getUserId());// 更新人
 			log.info("复制后>>>>>>>>>>>>{}",copy);
-			arrayList.add(copy);
+
+				this.save(copy);
+				//车辆和司机绑定关系
+			for (BasicdataDrivermiddleEntity basicdataDrivermiddleEntity : driverMiddleEntity) {
+				basicdataDrivermiddleEntity.setDriverId(copy.getId());
+				basicdataDrivermiddleServiceImpl.save(basicdataDrivermiddleEntity);
+			}
 		}
-		this.saveBatch(arrayList);
 	}
 
+
 	@Override
 	public List<BasicdataDriverArteryEntity> findDriverListByName(String driverName) {
 		return baseMapper.findDriverListByName(driverName);

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

@@ -151,6 +151,7 @@
     </select>
     <select id="getBillOrderPack" resultType="com.logpm.distribution.vo.DistributionBillOrderPackVO">
         SELECT
+        lds.outbound_type,
         ldpl.order_package_code orderPackageCode,
         ldpl.warehouse,
         ldpl.firsts,