From 51d2f8c2a2140fa545e6590c6d2726d42930c63e Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Sat, 23 Dec 2023 17:18:03 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=95=86=E9=85=8D=E5=BC=82=E5=B8=B8=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=8F=AA=E5=88=A4=E5=AE=9A=E5=95=86=E5=9C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java           | 3 ++-
 1 file changed, 2 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 dc6534b03..d6853a19e 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
@@ -833,7 +833,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		switch (distributionReservationEntity.getDeliveryType()){
 			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.getConsigneePerson().equals(distributionReservationEntity.getConsignee()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())){
+				if (stockArticleEntity.getConsigneeUnit().equals(distributionReservationEntity.getReceivingUnit()) && stockArticleEntity.getMallName().equals(distributionReservationEntity.getMallName())){
 					return true;
 				}else {
 					return false;