From 2584408a7c078f1dafc2ce2ac8356688c9cb97f3 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 17 Jun 2024 17:32:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=8B=A6=E6=88=AA=E5=8F=91?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DistributionDeliveryAppController.java            | 10 ++++++++++
 .../service/IDistributionDeliveryListService.java     |  8 ++++++++
 .../impl/DistributionDeliveryListServiceImpl.java     | 11 +++++++++--
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
index aa68290f2..1ea9cc63f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionDeliveryAppController.java
+++ b/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);
+	}
+
 
 	/**
 	 * 配送管理 装车确认(一键确认)
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
index ad0d129c7..37f34e209 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionDeliveryListService.java
+++ b/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);
+
+
 
 	/**
 	 * 查询签收预约客户包件信息
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index b776b11f7..1f409a562 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/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) {