From e250136e8ecc56aee6859df95b3666a0c4ff5d62 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 11 Jan 2024 10:25:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A3=85=E8=BD=A6=E5=8C=85=E4=BB=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD=E3=80=81=E9=85=8D=E9=80=81=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=AD=BE=E6=94=B6=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionDeliveryInfoMapper.xml   | 1 +
 .../service/impl/DistributionDeliveryListServiceImpl.java    | 5 +++++
 .../service/impl/DistributionReservationServiceImpl.java     | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
index 8da37d894..9b0b91b4b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryInfoMapper.xml
@@ -91,6 +91,7 @@
         lds.loadedin_number inventoryNub,
         lds.reservation_id reservationId,
         lds.received_quantity receivedQuantity,
+        lds.is_have_abnormal_package isHaveAbnormalPackage,
         (SELECT
        ldss.forklift_name
         FROM
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 6170fa191..894a03aa8 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
@@ -599,6 +599,11 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 			BeanUtils.copyProperties(distributionDeliveryTripartiteEntity, distributionDeliverySelfEntity);
 		}
 		if (distrilbutionloadingscanDTO.getType() == 1) {
+			if (!Objects.isNull(parcelList)){
+				if (OrderPackageLoadingStatusConstant.yizhuangche.getValue().equals(parcelList.getOrderPackageLoadingStatus())){
+					return Resp.scanFail("操作失败", "包件已装车");
+				}
+			}
 			List<DistributionParcelListEntity> distributionParcelListEntities = distributionDeliveryListMapper.selectPackageListByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
 			if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 				//在客户列表进行装车
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index 92bb04932..4a02c15a6 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -3538,7 +3538,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 		if (signStatus){
 			reservationEntity.setSigningStatus(ReservationSigningStatusConstant.yiqianshou.getValue());
 		}else {
-			//判断是否都为完成装车
+			//判断是否都为完成签收
 			Integer signingNum =  distributionLoadscanMapper.selectSigningNumByReservationId(reservationId);
 			//判断当前客户是否签收完成了
 			if (signingNum > 0){