Merge branch 'dev' into pre-production

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

@@ -3050,12 +3050,15 @@ 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) {
 				distributionLoadVO.setCarType(nc.getVehicleModel());
 				distributionLoadVO.setCarTypeId(nc.getId());
 			}
+		}
+
 
 		DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
 		if (!Func.isEmpty(byId)) {
@@ -3119,12 +3122,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 
+
+		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());
@@ -6958,12 +6965,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
 		}
 
+		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);