From 60f834f8deb6fa4d8402660e7038d2c282f58f0d Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Fri, 22 Dec 2023 18:37:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=87=E5=91=98=E5=A4=8D=E6=A0=B8bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 83d5cc2d7..dc6534b03 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
@@ -62,6 +62,7 @@ import org.springblade.common.constant.loading.LoadingStatusConstant;
 import org.springblade.common.constant.orderpackage.*;
 import org.springblade.common.constant.reservation.*;
 import org.springblade.common.constant.signing.SignforDriverSigningStatusConstant;
+import org.springblade.common.constant.signing.SignforStatusConstant;
 import org.springblade.common.exception.CustomerException;
 import org.springblade.common.serviceConstant.ServiceConstant;
 import org.springblade.common.utils.CommonUtil;
@@ -309,6 +310,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		DistributionSignforEntity distributionSignfor = this.getById(id);
 		BladeUser user = AuthUtil.getUser();
 		distributionSignfor.setExamineUserId(user.getUserId());
+		distributionSignfor.setSigningStatus(SignforStatusConstant.yiqianshou.getValue());
 		distributionSignfor.setExamineUserName(user.getNickName());
 		this.updateById(distributionSignfor);
 		distributionAsyncService.sendReviewFactory(id,myCurrentWarehouse.getId());

From 12aec59ce581c690ba6cda6f2edf8f8fd5d77b94 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Sat, 23 Dec 2023 12:14:15 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=A8=E9=80=81=E6=A2=A6=E5=A4=A9?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BC=82=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/service/impl/DistributionAsyncServiceImpl.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index f62121e7f..e03fdcc4f 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -1386,6 +1386,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 	@Override
+	@Async
 	public void sendFactory(DistributionParcelListEntity distributionParcelListEntity,String signingTime,Long reservationId,String reservationCode,Long warehouseId) {
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(distributionParcelListEntity.getStockArticleId());
 		if (Func.isNotEmpty(stockArticleEntity)){
@@ -1406,6 +1407,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 
 	@Override
 	@Transactional
+	@Async
 	public void sendReviewFactory(Long signingId,Long warehouseId) {
 		String brands= "梦天";//可追加
 

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 3/3] =?UTF-8?q?1.=E5=95=86=E9=85=8D=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E7=AD=BE=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;