From e5577e511ad1eb9b67c6669e80b5cf2ba50f6d5a Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 9 Jan 2024 22:04:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=B2=E7=AD=BE=E6=94=B6=E5=8C=85=E4=BB=B6?=
 =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java       | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 af897e7b6..e9c5c712b 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
@@ -1213,7 +1213,12 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				//判断客户
 				boolean flag = judgmentClient(distributionReservationEntity, parcelListEntity.getStockArticleId());
 				if (flag) {
-					return R.fail(3006, "异常签收");
+					if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
+						return Resp.scanFail("包件已签收", "包件已签收");
+					}else {
+
+						return R.fail(3006, "异常签收");
+					}
 				} else {
 					return Resp.scanFail("不满足签收条件", "不满足签收条件");
 				}