Merge remote-tracking branch 'origin/dist.1.2.0' into dist.1.2.0

blade-service-api/logpm-basic-api/src/main/java/com/logpm/basic/feign/IBasicCarModelClient.java

@@ -0,0 +1,19 @@
+package com.logpm.basic.feign;
+
+import org.springblade.common.constant.ModuleNameConstant;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(
+	value =  ModuleNameConstant.APPLICATION_BASIC_NAME
+)
+public interface IBasicCarModelClient {
+
+	String API_PREFIX = "carModel/client";
+
+
+
+	@GetMapping(API_PREFIX+"/getCarModelByCarNumber")
+	String getCarModelByCarNumber(@RequestParam("carModelName") String carNumber);
+}

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataVehicleClient.java

@@ -56,4 +56,6 @@ public interface IBasicdataVehicleClient {
 
 	@GetMapping(API_PREFIX + "/findCarListByName")
     List<JSONObject> findCarListByName(@RequestParam String carNumber);
+
+
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/feign/BasicCarModelClient.java

@@ -0,0 +1,24 @@
+package com.logpm.basic.feign;
+
+import com.logpm.basic.entity.BasicCarModelEntity;
+import com.logpm.basic.service.IBasicCarModelService;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
+
+@ApiIgnore()
+@RestController
+@AllArgsConstructor
+public class BasicCarModelClient implements IBasicCarModelClient{
+
+	private final IBasicCarModelService basicCarModelService;
+	@Override
+	public String getCarModelByCarNumber(String carNumber) {
+
+		BasicCarModelEntity carModelByCarNumber = basicCarModelService.getCarModelByCarNumber(carNumber);
+		if(carModelByCarNumber!=null){
+			return carModelByCarNumber.getVehicleModel();
+		}
+		return null;
+	}
+}

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicCarModelMapper.java

@@ -18,6 +18,7 @@ package com.logpm.basic.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.logpm.basic.entity.BasicCarModelEntity;
+import org.apache.ibatis.annotations.Param;
 
 
 /**
@@ -29,4 +30,5 @@ import com.logpm.basic.entity.BasicCarModelEntity;
 public interface BasicCarModelMapper extends BaseMapper<BasicCarModelEntity> {
 
 
+    BasicCarModelEntity getCarModelByCarNumber(@Param("carNumber") String carNumber);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/mapper/BasicCarModelMapper.xml

@@ -0,0 +1,11 @@
+<?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.basic.mapper.BasicCarModelMapper">
+
+
+    <select id="getCarModelByCarNumber" resultType="com.logpm.basic.entity.BasicCarModelEntity">
+        SELECT lbcm.* from logpm_basicdata_vehicle ldv LEFT JOIN logpm_basic_car_model lbcm on lbcm.id = ldv.vehicle_model_id
+        where ldv.vehicle_nub =#{carNumber} and ldv.is_deleted=0
+
+    </select>
+</mapper>

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/IBasicCarModelService.java

@@ -31,4 +31,11 @@ public interface IBasicCarModelService extends BaseService<BasicCarModelEntity>
 
 
 	String saveCarModel(BasicCarModelDTO basicCarModelDTO);
+
+	/**
+	 * 根据车辆车牌号码查询车辆类型
+	 * @param carNumber
+	 * @return
+	 */
+	BasicCarModelEntity getCarModelByCarNumber(String carNumber);
 }

blade-service/logpm-basic/src/main/java/com/logpm/basic/service/impl/BasicCarModelServiceImpl.java

@@ -83,4 +83,11 @@ public class BasicCarModelServiceImpl extends BaseServiceImpl<BasicCarModelMappe
 			return "保存失败";
 		}
 	}
+
+	@Override
+	public BasicCarModelEntity getCarModelByCarNumber(String carNumber) {
+
+
+		return baseMapper.getCarModelByCarNumber(carNumber);
+	}
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataVehicleClient.java

@@ -86,4 +86,5 @@ public class BasicdataVehicleClient implements IBasicdataVehicleClient {
 		return list;
 	}
 
+
 }

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

@@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basic.feign.IBasicCarModelClient;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
@@ -265,6 +266,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Autowired
 	private IWarehouseRetentionScanClient warehouseRetentionScanClient;
 
+	@Autowired
+	private IBasicCarModelClient iBasicCarModelClient;
+
 	@Override
 	public IPage<DistributionSignforVO> selectDistributionSignforPage(IPage<DistributionSignforVO> page, DistributionSignforVO distributionSignfor) {
 
@@ -3010,7 +3014,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 
 		// 获取车辆类型
-
+		String carModelType = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+		distributionLoadVO.setCarType(carModelType);
 
 		distributionLoadVO.setReservationCode(distributionReservationEntity.getReservationCode());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
@@ -3020,7 +3025,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		List<PackageData> data = new ArrayList<>();
 
 		for (DistributionLoadscanEntity distributionParcelListEntity : pushList) {
-
 			PackageData packageData = new PackageData();
 			packageData.setPackageCode(distributionParcelListEntity.getOrderPackageCode());
 			packageData.setPackageType(PackageTypeEnums.CMP);