From 54eaade729de70f9d7d7f35e03ab4845aa519be9 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 24 Sep 2024 14:03:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E8=A3=85=E8=BD=A6=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java      | 10 +++++++++-
 .../service/impl/DistributionSignforServiceImpl.java   |  2 +-
 2 files changed, 10 insertions(+), 2 deletions(-)

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 f4772ebfa..5dfe92b09 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
@@ -8069,6 +8069,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (Objects.isNull(myCurrentWarehouse)) {
 			return R.fail(403, "未授权!!!");
 		}
+		//查询是否存在签收数据
+		Integer signingNum = distributionLoadscanMapper.selectSigningNumByReservationId(distrilbutionloadingscanDTO.getReservationId());
+		if (signingNum > 0){
+			return Resp.scanFail("当前车次存在签收数据","当前车次存在签收数据");
+		}
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
 		if (DeliveryStatusConstant.yiwancheng.getValue().equals(distributionDeliveryListEntity.getDeliveryStatus())) {
@@ -8134,6 +8139,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	private void deletedAbnormalData(Long deliveryId) {
 		distributionLoadscanAbnormalService.remove(Wrappers.<DistributionLoadscanAbnormalEntity>update().lambda()
 			.eq(DistributionLoadscanAbnormalEntity::getDeliveryListId, deliveryId)
+			.eq(DistributionLoadscanAbnormalEntity::getAbnormalType, LoadingAbnormalTypeConstant.zhuangcheyichang.getValue())
 		);
 
 	}
@@ -8713,7 +8719,6 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		switch (type) {
 			case 1:
-
 				if (Objects.isNull(distrilbutionloadingscanDTO.getBarcode())) {
 					log.error(method + "参数缺失Barcode");
 					return Resp.fail("参数缺失,请联系管理员");
@@ -8821,6 +8826,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					log.error(method + "参数缺失ParcelListDTOS");
 					return Resp.fail("参数缺失,请联系管理员");
 				}
+				if (DeliveryStartStatusConstant.yifache.equals(deliveryListEntity.getIsStart())) {
+					return Resp.scanFail("已发车无法进行零担装车", "已发车无法进行零担装车");
+				}
 				List<DistributionParcelNumberDTO> parcelListDTOS = distrilbutionloadingscanDTO.getParcelListDTOS();
 				boolean flag = parcelListDTOS.stream().allMatch(d -> d.getLoadingNum() < 0);
 				if (flag) {
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
index 68c8b1272..69edb9dcd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java
@@ -7610,7 +7610,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					DistributionReservationPackageEntity  planPackage = distributionReservationPackageService.getPlanPackageByReservationAndCode(reservationId,barcode);
 					if (!Objects.isNull(planPackage)){
 						if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) {
-							return Resp.scanFail("包件未装车", "包件未装车");
+							return Resp.scanFail("包件未装车,无法签收", "包件未装车,无法签收");
 						}
 						List<DistributionLoadscanAbnormalEntity> abnormalEntities = distributionLoadscanAbnormalService.list(Wrappers.<DistributionLoadscanAbnormalEntity>query().lambda()
 								.eq(DistributionLoadscanAbnormalEntity::getPackageCode, barcode)