From 5a2bd6c521c4671b99b6f7c298bc1537beb6a8c8 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sun, 17 Mar 2024 11:31:54 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=9B=B6=E6=8B=85=E6=97=A0?=
 =?UTF-8?q?=E8=A3=85=E8=BD=A6=E6=95=B0=E6=8D=AE=20=E5=A4=8D=E6=A0=B8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

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 86d17a8a2..eed7f773c 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
@@ -1483,17 +1483,23 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	}
 
 	private boolean judgmentSignIsHavePackage(Long reservationId) {
-		boolean flag = false;
+		boolean flag = true;
 		List<DistributionParcelListEntity> distributionParcelListEntities = distributionReservationMapper.selectPackageListByReservationId(reservationId);
 		List<DistributionParcelNumberDTO> distributionParcelNumberDTOS = distributionReservationMapper.selectZeroPackageListByReservationId(reservationId);
 		//判断计划内的包件是否都进行签收了
 		if (Func.isNotEmpty(distributionParcelListEntities)) {
 			flag = distributionParcelListEntities.stream().allMatch(p -> p.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue()));
+			if(!flag){
+				return flag;
+			}
 		}
 		//查询库存品是否都已完成签收
 		List<DisStockListDetailEntity> disStockListDetailEntities = distributionReservationMapper.selectInventoryListByReservation(reservationId);
 		if (Func.isNotEmpty(disStockListDetailEntities)) {
 			flag = disStockListDetailEntities.stream().allMatch(p -> p.getStockSignfoStatus().equals(InventorySigningStatusConstant.yiqianshou.getValue()));
+			if(!flag){
+				return flag;
+			}
 		}
 		if (Func.isNotEmpty(distributionParcelNumberDTOS)){
 			for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) {
@@ -1502,7 +1508,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				if(Objects.isNull(aBoolean)){
 					return false;
 				}else{
-					flag = aBoolean;
+					if(!aBoolean){
+						return false;
+					}
 				}
 			}
 		}