From c91dea9f5b60c9dcec76efbbf21f2ac26d29e1e9 Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Sun, 13 Oct 2024 15:41:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E5=A2=9E=E5=8A=A0=E6=9C=AC?=
 =?UTF-8?q?=E5=9C=B0=E6=89=93=E5=8D=B0=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/BusinessPreOrderServiceImpl.java        | 7 ++++++-
 .../com/logpm/trunkline/feign/ExtractedDataClient.java   | 9 +++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
index 4139a2dba..061b45ade 100644
--- a/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
+++ b/blade-service/logpm-business/src/main/java/com/logpm/business/service/impl/BusinessPreOrderServiceImpl.java
@@ -31,6 +31,7 @@ import com.logpm.trunkline.feign.ITrunklineAdvanceDetailClient;
 import com.logpm.warehouse.feign.IWarehouseTrayTypeClient;
 import com.logpm.warehouse.vo.TrayTypeDataVO;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Nullable;
 import org.springblade.common.annotations.ChangeAsync;
 import org.springblade.common.constant.IncomingTypeEnum;
@@ -52,6 +53,7 @@ import java.util.stream.Collectors;
 
 @Service
 @AllArgsConstructor
+@Slf4j
 public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrderMapper, BusinessPreOrderEntity> implements IBusinessPreOrderService {
 
 
@@ -407,6 +409,8 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 
 		BusinessPreOrderEntity selectD = null;
 		// 检查包件是否入库
+		log.info("list:{}", list);
+		log.info("orderPackageCode:{}", orderPackageCode);
 		for (BusinessPreOrderEntity distributionBusinessPreOrderEntity : list) {
 
 			if (distributionBusinessPreOrderEntity.getOrderPackageCode().equals(orderPackageCode)) {
@@ -415,6 +419,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 				break;
 			}
 		}
+		log.info("selectD1:{}", selectD);
 		// 全仓查询
 		if (selectD == null) {
 			LambdaQueryWrapper<BusinessPreOrderEntity> queryWrapper2 = new LambdaQueryWrapper<>();
@@ -437,7 +442,7 @@ public class BusinessPreOrderServiceImpl extends BaseServiceImpl<BusinessPreOrde
 
 			}
 		}
-
+		log.info("selectD2:{}", selectD);
 		if (selectD == null) {
 			// 暂存单查询
 			TrunklineAdvanceDetailEntity entityByOrderPackageCode = trunklineAdvanceDetailClient.findEntityByOrderPackageCode(orderPackageCode);
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java
index 490b31964..7371e88ef 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/feign/ExtractedDataClient.java
@@ -61,13 +61,18 @@ public class ExtractedDataClient implements IExtractedDataClient {
 
 		List<WarehouseWayBillDetail> warehouseWayBillDetails = warehouseWaybillDetailClient.findByWaybillId(byWaybillNo.getId());
 
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>warehouseWayBillDetails ：{}", warehouseWayBillDetails);
+
 		List<TrunklineWaybillOrderEntity> trunklineWaybillOrderEntities = trunklineWaybillOrderClient.findListByWaybillNo(byWaybillNo.getWaybillNo());
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>trunklineWaybillOrderEntities ：{}", trunklineWaybillOrderEntities);
 
 		List<TrunklineWaybillPackageEntity> trunklineWaybillPackageEntities = trunklineWaybillPackageClient.findListByWaybillIds(waybillIds);
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>trunklineWaybillPackageEntities ：{}", trunklineWaybillPackageEntities);
 
 		// 暂存单ID集合
 		List<Long> collect = trunklineWaybillOrderEntities.stream().map(TrunklineWaybillOrderEntity::getAdvanceId).distinct().collect(Collectors.toList());
-		if(!collect.isEmpty()){
+		log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>collect {}>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", collect);
+		if (!collect.isEmpty()) {
 			List<TrunklineAdvanceEntity> trunklineAdvanceEntities = trunklineAdvanceClient.findListByIds(collect);
 			List<TrunklineAdvanceDetailVO> trunklineAdvanceDetailEntities = trunklineAdvanceDetailClient.findListByAdvanceIds(collect);
 			// 获取暂存单明细
@@ -78,12 +83,12 @@ public class ExtractedDataClient implements IExtractedDataClient {
 			List<TrunklineWaybillTrackEntity> list = trunklineWaybillTrackService.list(queryWrapper);
 			TrunklineWaybillTrackEntity trunklineWaybillTrackEntity = list.get(0);
 			CompletableFuture.supplyAsync(() -> {
+				log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>推送商家端运单 站存单  暂存单明细>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>");
 				asyncService.saveOtherData(tenantId, byWaybillNo, trunklineAdvanceDetailEntities, trunklineAdvanceEntities, trunklineWaybillPackageEntities, trunklineWaybillOrderEntities, warehouseWayBillDetails, trunklineWaybillTrackEntity);
 				return null;
 			});
 		}
 
 
-
 	}
 }