From 8f69f58e1328243603db18798a40e99a387701d6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 31 Jan 2024 18:12:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E7=AD=BE=E6=94=B6=E8=AF=AD?=
 =?UTF-8?q?=E9=9F=B3=E6=8F=90=E7=A4=BA=E3=80=81=E5=BC=82=E5=B8=B8=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=95=86=E9=85=8D=E5=8F=96=E6=B6=88=E5=95=86=E5=9C=BA?=
 =?UTF-8?q?=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/mapper/DistributionParcelListMapper.xml      | 1 -
 .../service/impl/DistributionSignforServiceImpl.java          | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
index 21bf99be3..9aab6aacc 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionParcelListMapper.xml
@@ -1325,5 +1325,4 @@
         WHERE
         ldla.package_code = #{orderPackageCode} AND ldpl.warehouse_id = #{warehouseId} AND ldla.auditing_status = 2
     </select>
-
 </mapper>
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 c11948f4b..d98d3963b 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
@@ -1670,7 +1670,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 							return R.fail(3006, null);
 						}
 					} else {
-						return Resp.scanFail("不满足签收条件", "不满足签收条件");
+						return Resp.scanFail("不属于当前签收客户", "不属于当前签收客户");
 					}
 				}
 			} else {
@@ -1877,7 +1877,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			case "1":
 				//商配
 //				if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit()) && stockArticleEntity.getConsigneePerson().equals(distributionReservationEntity.getConsignee()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())){
-				if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())) {
+				if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit())) {
 					return true;
 				} else {
 					return false;