From 02eddcfa769662a9eb9b106313aada7a779e4291 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 19 Mar 2024 10:29:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E6=89=B9=E9=87=8F=E7=AD=BE?=
 =?UTF-8?q?=E6=94=B6=E5=8C=85=E4=BB=B6=E4=B8=8B=E6=9E=B6BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/DistributionStockupController.java      |  2 --
 .../service/impl/DistributionSignforServiceImpl.java   | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
index e7a32c2fb..e124a2a36 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockupController.java
@@ -208,8 +208,6 @@ public class DistributionStockupController extends BladeController {
 		//查询计划包件的EXCEL列表数据
 		List<DistributionStockupPackageListDetailExcel> listExcel = distributionStockupService.exportStockUptDetail(list);
 		MyExcelUtil.export(response,listExcel,"备货清单");
-
-
 	}
 
 	/**
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 eed7f773c..423f47dd0 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
@@ -4261,6 +4261,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		}
 			String signingTime = simpleDateFormat.format(new Date());
 			List<Long> packageIds = new ArrayList<>();
+			List<String> packageCodes = new ArrayList<>();
 			List<String> orderCodes = new ArrayList<>();
 			if (Func.isNotEmpty(parcelListEntityList)) {
 				loadingPackageNum+=parcelListEntityList.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
@@ -4342,6 +4343,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					distributionAsyncService.sendFactory(parcelListEntity, simpleDateFormat.format(new Date()), reservationEntity.getId(), reservationEntity.getReservationCode(), myCurrentWarehouse.getName(), user.getNickName());
 					packageIds.add(parcelListEntity.getId());
 					orderCodes.add(parcelListEntity.getOrderCode());
+					packageCodes.add(parcelListEntity.getOrderPackageCode());
 				}
 				//批量维护订单信息
 				if (Func.isNotEmpty(orderCodes)) {
@@ -4355,6 +4357,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 					//批量推送
 					distributionAsyncService.sendReviewFactory(distributionSignforEntity.getId(), myCurrentWarehouse.getName(), myCurrentWarehouse.getId());
 				}
+
+				if (Func.isNotEmpty(packageCodes)) {
+					distributionAsyncService.handlPakcage(packageIds, myCurrentWarehouse.getId());
+					//批量下架
+					String collected = packageCodes.stream().distinct().collect(Collectors.joining(","));
+					log.info(method+"司机批量签收进行包件下架:{}",collected);
+					warehouseUpdownTypeClient.downDeliveryPackage(collected, myCurrentWarehouse.getId());
+				}
 			}
 
 			//维护客户信息状态