fix:增加签收作业节点推送车辆信息和ID

blade-biz-common/src/main/java/org/springblade/common/model/DistributionSignforVO.java

@@ -28,10 +28,14 @@ public class DistributionSignforVO implements Serializable {
 	private String vehicleId;
 
 	/**
-	 * 车辆类型
+	 * 车辆类型  数据来源于 logpm_basic_car_model 的vehicle_model
 	 */
 	private String carType;
 
+	/**
+	 * 车辆类型ID 数据来源于 logpm_basic_car_model 的ID
+	 */
+	private Long carTypeId;
 	/**
 	 * 签收车次
 	 */

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

@@ -1,5 +1,6 @@
 package com.logpm.basic.feign;
 
+import com.logpm.basic.entity.BasicCarModelEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -15,5 +16,5 @@ public interface IBasicCarModelClient {
 
 
 	@GetMapping(API_PREFIX+"/getCarModelByCarNumber")
-	String getCarModelByCarNumber(@RequestParam("carModelName") String carNumber);
+	BasicCarModelEntity getCarModelByCarNumber(@RequestParam("carModelName") String carNumber);
 }

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

@@ -13,11 +13,11 @@ public class BasicCarModelClient implements IBasicCarModelClient{
 
 	private final IBasicCarModelService basicCarModelService;
 	@Override
-	public String getCarModelByCarNumber(String carNumber) {
+	public BasicCarModelEntity getCarModelByCarNumber(String carNumber) {
 
 		BasicCarModelEntity carModelByCarNumber = basicCarModelService.getCarModelByCarNumber(carNumber);
 		if(carModelByCarNumber!=null){
-			return carModelByCarNumber.getVehicleModel();
+			return carModelByCarNumber;
 		}
 		return null;
 	}

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

@@ -28,6 +28,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.entity.BasicCarModelEntity;
 import com.logpm.basic.feign.IBasicCarModelClient;
 import com.logpm.basicdata.entity.BasicdataClientUserEntity;
 import com.logpm.basicdata.entity.BasicdataDriverArteryEntity;
@@ -907,7 +908,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 		Integer isStrictLoading = 0;
 		WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-		if (!Objects.isNull(warehouseConfig.getIsStrictLoading())){
+		if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
 			isStrictLoading = warehouseConfig.getIsStrictLoading();
 		}
 		String[] split = distrilbutionloadingscanDTO.getBarcodes().split(",");
@@ -943,7 +944,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						//更新签收人
 						Integer i = distributionSignforMapper.updateSignUser(loadscaninvnEntity.getDeliveryId(), loadscaninvnEntity.getReservationId(), user);
 					} else {
-						if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
+						if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())) {
 							return R.fail("操作失败,存在未装车包件");
 						}
 						//不存在装车数据，需要进行装车数据的补录
@@ -1474,7 +1475,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		int d = 0;
 		SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.sss");
 		if (Func.isEmpty(loadscanEntity)) {
-			if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
+			if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())) {
 				return R.fail("操作失败,存在未装车包件");
 			}
 			a = distributionParcelNumberDTO.getHandQuantity() - reservationZeroPackageEntities.getQuantity();
@@ -1500,7 +1501,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			unLoadscanEntity.setScanStatus(LoadingStatusConstant.buluzhuangche.getValue());
 			unLoadscanEntity.setIsInsert(2);
-			unLoadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId()+"");
+			unLoadscanEntity.setLoadingId(distributionDeliverySelfEntity.getId() + "");
 			unLoadscanEntity.setOrderId(reservationZeroPackageEntities.getStockArticleId());
 			unLoadscanEntity.setPackageId(reservationZeroPackageEntities.getParcelListId());
 			unLoadscanEntity.setReservationId(reservationId);
@@ -1548,8 +1549,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			jsonObject.put("remark", "文员签收");
 			jsonObjects.add(jsonObject);
 		} else {
-			if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
-				if (loadscanEntity.getPackageNub() < reservationZeroPackageEntities.getQuantity()){
+			if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())) {
+				if (loadscanEntity.getPackageNub() < reservationZeroPackageEntities.getQuantity()) {
 					return R.fail("装车未完成,无法完成签收");
 				}
 			}
@@ -3024,6 +3025,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleName(distributionLoadscanEntity.getVehicleName());
 		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());
+		}
+
 		DistributionReservationEntity byId = distributionReservationService.getById(distributionLoadscanEntity.getReservationId());
 		if (!Func.isEmpty(byId)) {
 			distributionLoadVO.setReservationCode(byId.getReservationCode());
@@ -3080,8 +3089,11 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		distributionLoadVO.setVehicleId(distributionLoadscanEntity.getVehicleId());
 
 		// 获取车辆类型
-		String carModelType = iBasicCarModelClient.getCarModelByCarNumber(distributionLoadscanEntity.getVehicleName());
-		distributionLoadVO.setCarType(carModelType);
+		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());
@@ -3197,8 +3209,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //		}
 			Integer isStrictLoading = 0;
 			WarehouseConfigEntity warehouseConfig = warehouseConfigClient.getWarehouseConfig(myCurrentWarehouse.getId());
-			if (!Objects.isNull(warehouseConfig.getIsStrictLoading())){
-				 isStrictLoading = warehouseConfig.getIsStrictLoading();
+			if (!Objects.isNull(warehouseConfig.getIsStrictLoading())) {
+				isStrictLoading = warehouseConfig.getIsStrictLoading();
 			}
 
 			DistributionReservationEntity distributionReservationEntity = distributionReservationMapper.selectById(distrilbutionloadingscanDTO.getReservationId());
@@ -3299,7 +3311,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						}
 						aaa.add(trunklinePackageTrackLog);
 					} else {
-						if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())){
+						if (isStrictLoading == Integer.parseInt(IsOrNoConstant.yes.getValue())) {
 							return R.fail("操作失败,存在未装车包件");
 						}
 						//这里装车的数据需要进行补录
@@ -6881,6 +6893,13 @@ 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());
+		}
+
 		nodeFanoutMsg.setMain(distributionLoadVO);
 
 		List<PackageData> data = new ArrayList<>();
@@ -7846,7 +7865,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 						if (OrderPackageReservationStatusConstant.yiyueyue.getValue().equals(parcelListEntity.getOrderPackageReservationStatus())) {
 							return Resp.scanFail("当前包件存在配送计划", "当前包件存在配送计划");
 						}
-						if (deliveryListEntity.getKind().equals("2")){
+						if (deliveryListEntity.getKind().equals("2")) {
 							return Resp.scanFail("外协无法异常签收", "外协无法异常签收");
 						}
 						return R.fail(3006, null);
@@ -8231,7 +8250,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 
 //		String str = checkSignNum(distrilbutionloadingscanDTO);
 		Integer integer = distributionSignforMapper.signforNum(distrilbutionloadingscanDTO.getReservationId());
-		return Resp.scanSuccess(integer+"件", integer+"件");
+		return Resp.scanSuccess(integer + "件", integer + "件");
 	}
 
 	@Override