From 31edee9f132849a2a5e0171a25b4194062cf6b6b Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 19 Aug 2024 11:43:35 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85PC=E7=AD=BE=E6=94=B6BUG?=
 =?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   | 10 +++++++++-
 .../impl/DistributionStockArticleServiceImpl.java      |  1 +
 2 files changed, 10 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 b7e7036b9..516d8e0a0 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
@@ -1089,7 +1089,15 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		String driverPhone = "";
 		String vehicleNub = "";
 		Long loadingId = null;
-		List<DistributionDeliverySelfVO> deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
+
+
+		List<DistributionDeliverySelfVO> deliverySelfInfo = null;
+		if (deliveryListEntity.getKind().equals(ServiceConstant.DELIVERLIST_KIND_SELF)) {
+			 deliverySelfInfo = distributionDeliverySelfMapper.getDeliverySelfInfo(deliveryListEntity.getId());
+		} else {
+			DistributionDeliveryTripartiteVO deliveryTripartiteInfo = distributionDeliveryTripartiteMapper.getDeliveryTripartiteInfo(deliveryListEntity.getId());
+			BeanUtils.copyProperties(deliverySelfInfo, deliveryTripartiteInfo);
+		}
 		//查询该车次负责司机
 		for (DistributionReservationZeroPackageEntity reservationZeroPackageEntity : reservationZeroPackageEntities) {
 			//查询订单
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 1af746af2..f7657239b 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1939,6 +1939,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 			DistributionStockArticleEntity stockArticleEntity = this.findStockArticleByOrderCodeAndWarehouseId(s, warehouseId);
 			DistributionStockArticleEntity t = new DistributionStockArticleEntity();
 			if (Func.isEmpty(stockArticleEntity)) {
+				t.setId(stockArticleEntity.getId());
 				log.error(method + "订单不存在orderCode:{}", s);
 				throw new RuntimeException("订单不存在");
 			}