1.干线-bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/controller/TripartiteTransferController.java

@@ -377,12 +377,6 @@ public class TripartiteTransferController {
 				log.warn(method+"配载id为空 loadId={}",loadId);
 				return R.fail(400,"配载id为空");
 			}
-
-			if(Objects.isNull(assistantId)){
-				log.warn(method+"副驾id为空 assistantId={}",assistantId);
-				return R.fail(400,"副驾id为空");
-			}
-
 			if(Objects.isNull(driverId)){
 				log.warn(method+"司机id为空 driverId={}",driverId);
 				return R.fail(400,"司机id为空");
@@ -397,18 +391,10 @@ public class TripartiteTransferController {
 				return R.fail(400,"司机电话为空");
 			}
 
-			if(Objects.isNull(carId)){
-				log.warn(method+"车辆id为空 carId={}",carId);
-				return R.fail(400,"车辆id为空");
-			}
 			if(StringUtil.isBlank(chargeType)){
 				log.warn(method+"分摊方式为空 chargeType={}",chargeType);
 				return R.fail(400,"分摊方式为空");
 			}
-			if(StringUtil.isBlank(carNumber)){
-				log.warn(method+"车牌号为空 carNumber={}",carNumber);
-				return R.fail(400,"车牌号为空");
-			}
 
 			if(StringUtil.isBlank(loadType)){
 				log.warn(method+"配载类型为空 loadType={}",loadType);

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -1074,25 +1074,27 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 
 			Long carsLoadLineId = carsLoadLineDTO.getId();
-			if(1 == updateType){
+			if(!Objects.isNull(updateType)){
-				TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(carsLoadLineId);
+				if(1 == updateType){
-				loadLineEntity.setSort(sort);
+					TrunklineCarsLoadLineEntity loadLineEntity = trunklineCarsLoadLineService.getById(carsLoadLineId);
-				trunklineCarsLoadLineService.updateById(loadLineEntity);
+					loadLineEntity.setSort(sort);
-			}else if(2 == updateType){
+					trunklineCarsLoadLineService.updateById(loadLineEntity);
-				TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity();
+				}else if(2 == updateType){
-				BeanUtil.copy(carsLoadLineDTO,carsLoadLineEntity);
+					TrunklineCarsLoadLineEntity carsLoadLineEntity = new TrunklineCarsLoadLineEntity();
-				carsLoadLineEntity.setId(null);
+					BeanUtil.copy(carsLoadLineDTO,carsLoadLineEntity);
-				carsLoadLineEntity.setLoadId(loadId);
+					carsLoadLineEntity.setId(null);
-				carsLoadLineEntity.setNodeStatus("0");
+					carsLoadLineEntity.setLoadId(loadId);
-				if(sort == 1){
+					carsLoadLineEntity.setNodeStatus("0");
-					carsLoadLineEntity.setNodeStatus("10");
+					if(sort == 1){
+						carsLoadLineEntity.setNodeStatus("10");
+					}
+					carsLoadLineEntity.setSignStatus("0");
+					carsLoadLineEntity.setUnloadStatus("0");
+					carsLoadLineEntity.setLoadingStatus("0");
+					carsLoadLineEntity.setIsTermination("0");
+					trunklineCarsLoadLineService.save(carsLoadLineEntity);
+					carsLoadLineId = carsLoadLineEntity.getId();
 				}
-				carsLoadLineEntity.setSignStatus("0");
-				carsLoadLineEntity.setUnloadStatus("0");
-				carsLoadLineEntity.setLoadingStatus("0");
-				carsLoadLineEntity.setIsTermination("0");
-				trunklineCarsLoadLineService.save(carsLoadLineEntity);
-				carsLoadLineId = carsLoadLineEntity.getId();
 			}
 
 			List<TrunklineCarsOrderDTO> addList = carsLoadLineDTO.getAddList();