From 350843e1dde0e934447ff33666632eea53640bd4 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Fri, 11 Oct 2024 11:25:59 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E8=BD=A6=E7=89=8C?=
 =?UTF-8?q?=E7=9A=84=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionSignforServiceImpl.java  | 45 +++++++++++--------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 5e9c8e768..70fffea76 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -3050,13 +3050,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 
-// 获取车辆类型
-		BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-		if (nc != null) {
-			distributionLoadVO.setCarType(nc.getVehicleModel());
-			distributionLoadVO.setCarTypeId(nc.getId());
+		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
+			// 获取车辆类型
+			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+			if (nc != null) {
+				distributionLoadVO.setCarType(nc.getVehicleModel());
+				distributionLoadVO.setCarTypeId(nc.getId());
+			}
 		}
 
+
 		DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
 		if (!Func.isEmpty(byId)) {
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
@@ -3119,17 +3122,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 
-		//获取装车表的车辆
-		if(StringUtil.isBlank(distributionLoadscanEntity.getVehicleName())){
-			return null;
-		}
-		// 获取车辆类型
-		BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-		if (nc != null) {
-			distributionLoadVO.setCarType(nc.getVehicleModel());
-			distributionLoadVO.setCarTypeId(nc.getId());
+
+		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
+			// 获取车辆类型
+			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+			if (nc != null) {
+				distributionLoadVO.setCarType(nc.getVehicleModel());
+				distributionLoadVO.setCarTypeId(nc.getId());
+			}
 		}
 
+
 		distributionLoadVO.setReservationCode(distributionReservationEntity.getReservationCode());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 		distributionLoadVO.setReservationId(distributionReservationEntity.getId());
@@ -6962,13 +6965,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
 		}
 
-		// 获取车辆类型
-		BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-		if (nc != null) {
-			distributionLoadVO.setCarType(nc.getVehicleModel());
-			distributionLoadVO.setCarTypeId(nc.getId());
+		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
+			// 获取车辆类型
+			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+			if (nc != null) {
+				distributionLoadVO.setCarType(nc.getVehicleModel());
+				distributionLoadVO.setCarTypeId(nc.getId());
+			}
 		}
 
+
+
 		nodeFanoutMsg.setMain(distributionLoadVO);
 
 		List<PackageData> data = new ArrayList<>();