From 6480a6f51e1e8be6c9b37b4581c01dcc7848be29 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 29 Jan 2024 15:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7BUG=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=81=E5=8C=85=E4=BB=B6=E8=8A=82=E7=82=B9=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/AftersalesWorkOrderServiceImpl.java   |  3 ++-
 .../controller/DistributionParcelListController.java   |  8 ++++++++
 .../service/IDistributionParcelListService.java        |  7 +++++++
 .../impl/DistributionParcelListServiceImpl.java        | 10 ++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
index b18f8d93a..472981270 100644
--- a/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
+++ b/blade-service/logpm-aftersales/src/main/java/com/logpm/aftersales/service/impl/AftersalesWorkOrderServiceImpl.java
@@ -1985,6 +1985,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 		List<AftersalesCustomerMallEntity> aftersalesCustomerMallList = aftersalesCustomerMallMapper.getByWarehouseCode(myCurrentWarehouse.getId().toString());
 		if (aftersalesCustomerMallList.isEmpty()){
 			log.info("没有客服信息！！！");
+			return;
 		}
 		AftersalesCustomerMallEntity finalChoice = null; //最终 确定的AftersalesCustomerMallEntity
 		for (AftersalesCustomerMallEntity aftersalesCustomerMallEntity : aftersalesCustomerMallList) {
@@ -1993,7 +1994,7 @@ public class AftersalesWorkOrderServiceImpl extends BaseServiceImpl<AftersalesWo
 				break;
 			}
 		}
-		// 如果存在条件为1的项，则使用创建时间最早的作为选择
+		// 如果存在条件为1的项，则使用创建时 间最早的作为选择
 
 				if (finalChoice == null) {
 					AftersalesCustomerMallEntity lastCustomerMall = aftersalesCustomerMallList.get(0);
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
index dffa4350b..8af795a05 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionParcelListController.java
@@ -252,4 +252,12 @@ public class DistributionParcelListController extends BladeController  {
 		ExcelUtil.export(response, "包件明细数据" + DateUtil.time(), "包件明细表", list, DistributionParcelListExcel.class);
 	}
 
+	@GetMapping("/searchNode")
+	@ApiOperationSupport(order = 9)
+	@ApiOperation(value = "导出包件明细数据", notes = "传入paramMap")
+	public R searchNode(@ApiIgnore @RequestParam String packageCode) {
+		R r = distributionParcelListService.searchNode(packageCode);
+		return r;
+	}
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
index 20ecd7fe8..68af6135a 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
@@ -186,4 +186,11 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 * @return
 	 */
 	Integer restorePakcageByIds(List<Long> packageIds);
+
+	/**
+	 * 查询包件节点
+	 * @param packageCode
+	 * @return
+	 */
+	R searchNode(String packageCode);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 561615268..674bd48bd 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -931,4 +931,14 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 		return baseMapper.restorePakcageByIds(packageIds);
 	}
 
+	/**
+	 * @param packageCode
+	 * @return
+	 */
+	@Override
+	public R searchNode(String packageCode) {
+
+		return null;
+	}
+
 }