Merge branch 'dev' into pre-production

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());
 
-// 获取车辆类型
+		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
-		BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+			// 获取车辆类型
-		if (nc != null) {
+			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-			distributionLoadVO.setCarType(nc.getVehicleModel());
+			if (nc != null) {
-			distributionLoadVO.setCarTypeId(nc.getId());
+				distributionLoadVO.setCarType(nc.getVehicleModel());
+				distributionLoadVO.setCarTypeId(nc.getId());
+			}
 		}
 
+
 		DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
 		if (!Func.isEmpty(byId)) {
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
@@ -3119,13 +3122,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 
-		// 获取车辆类型
+
-		BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
-		if (nc != null) {
+			// 获取车辆类型
-			distributionLoadVO.setCarType(nc.getVehicleModel());
+			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-			distributionLoadVO.setCarTypeId(nc.getId());
+			if (nc != null) {
+				distributionLoadVO.setCarType(nc.getVehicleModel());
+				distributionLoadVO.setCarTypeId(nc.getId());
+			}
 		}
 
+
 		distributionLoadVO.setReservationCode(distributionReservationEntity.getReservationCode());
 		distributionLoadVO.setTrainNumber(distributionDeliveryListEntity.getTrainNumber());
 		distributionLoadVO.setReservationId(distributionReservationEntity.getId());
@@ -6958,13 +6965,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
 		}
 
-		// 获取车辆类型
+		if(StringUtil.isNotBlank(distributionLoadscanEntity.getVehicleName())){
-		BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
+			// 获取车辆类型
-		if (nc != null) {
+			BasicCarModelEntity nc = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-			distributionLoadVO.setCarType(nc.getVehicleModel());
+			if (nc != null) {
-			distributionLoadVO.setCarTypeId(nc.getId());
+				distributionLoadVO.setCarType(nc.getVehicleModel());
+				distributionLoadVO.setCarTypeId(nc.getId());
+			}
 		}
 
+
+
 		nodeFanoutMsg.setMain(distributionLoadVO);
 
 		List<PackageData> data = new ArrayList<>();