异常拦截发车

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java

@@ -211,6 +211,16 @@ public class DistributionDeliveryAppController {
         return distributionDeliveryListService.loadingStart(distrilbutionloadingscanDTO);
 	}
 
+	@PostMapping("/cancelStart")
+	@ApiOperationSupport(order = 7)
+	@ApiOperation(value = "取消发车", notes = "传入DistrilbutionloadingscanDTO")
+	public R cancelStart(@Valid @RequestBody DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		if (null == distrilbutionloadingscanDTO.getDeliveryId() || null == distrilbutionloadingscanDTO.getLoadingId()){
+			return R.fail("参数不全");
+		}
+        return distributionDeliveryListService.cancelStart(distrilbutionloadingscanDTO);
+	}
+
 
 	/**
 	 * 配送管理 装车确认(一键确认)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java

@@ -448,6 +448,14 @@ public interface IDistributionDeliveryListService extends BaseService<Distributi
 	 */
 	void pushNotification(String warehouseIds , String reservationCode);
 
+	/**
+	 *  取消配送任务
+	 * @param distrilbutionloadingscanDTO
+	 * @return
+	 */
+	R cancelStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO);
+
+
 
 	/**
 	 * 查询签收预约客户包件信息

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

@@ -4552,8 +4552,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//统计该配送任务的库存品装车数
 		Integer abnormalPackageLoadingNum = distributionLoadscanMapper.statisticsAbnormalLoadingNum(distrilbutionloadingscanDTO.getDeliveryId());
 		if (abnormalPackageLoadingNum != 0) {
-			loadingCount += abnormalPackageLoadingNum;
-			builder.append("异常" + abnormalPackageLoadingNum + "件");
+//			loadingCount += abnormalPackageLoadingNum;
+//			builder.append("异常" + abnormalPackageLoadingNum + "件");
+			return Resp.scanFail("存在异常请复核", "存在异常请复核");
+
 		}
 
 		distributionAsyncService.sendTrunkineLog(distributionDeliveryListEntity.getId(), null, AuthUtil.getUser(), warehouseClient.getMyCurrentWarehouse(), 1);
@@ -7185,6 +7187,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 	}
 
+	@Override
+	public R cancelStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
+		return null;
+	}
+
 	@Override
 	@Transactional
 	public void maintenanceDeliveryInfo(Long deliveryId) {