From e4529bdf30304f7340b25465415e36d162317b0d Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 9 Jan 2024 22:17:57 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E6=94=B6=E8=AF=AD=E9=9F=B3=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java         | 5 ++---
 1 file changed, 2 insertions(+), 3 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 e9c5c712b..508e0937d 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
@@ -1082,7 +1082,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				.eq(DistributionLoadscanEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()));
 			if (Func.isNotEmpty(loadscanEntity)) {
 				if (loadscanEntity.getSignforState().equals(2)) {
-					return Resp.scanFail("重复扫描", "重复扫描");
+					return Resp.scanFail("重复扫描", "包件已签收");
 				}
 				//存在装车记录，进行修改即可
 				//进行签收记录数据的维护
@@ -1216,8 +1216,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					if (parcelListEntity.getOrderPackageStatus().equals(OrderPackageStatusConstant.yiqianshou.getValue())){
 						return Resp.scanFail("包件已签收", "包件已签收");
 					}else {
-
-						return R.fail(3006, "异常签收");
+						return R.fail(3006, null);
 					}
 				} else {
 					return Resp.scanFail("不满足签收条件", "不满足签收条件");