From 4e989039f348fcf1a9233117ab8c309c460f73c6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 4 Apr 2024 02:04:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E6=8F=90=E4=BF=AE=E6=94=B9=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistrilbutionBillLadingServiceImpl.java | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index 4f38a765d..c91766f8c 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -453,6 +453,14 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			} else {
 				updateStockBill(distrilbutionBillLading);
 			}
+			List<DistributionStockArticleEntity> stockArticleList = distrilbutionBillLading.getStockArticleList();
+			if (Func.isNotEmpty(stockArticleList)){
+				String orderCodes = stockArticleList.stream().map(DistributionStockArticleEntity::getOrderCode).collect(Collectors.joining(","));
+				List<Long> collect = stockArticleList.stream().map(DistributionStockArticleEntity::getWarehouseId).distinct().collect(Collectors.toList());
+				if (!collect.isEmpty() && collect.size() == 1){
+					distributionStockArticleService.maintenanceOrderInfo(orderCodes,collect.get(0));
+				}
+			}
 		} else {
 			//设置lockey
 			String lockKey = "lock:" + distrilbutionBillLading.getStockArticleId();
@@ -1274,14 +1282,6 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						}
 					}
 				}
-				DistributionStockArticleEntity stockArticleEntity = collect.get(i.getStockArticleId()).get(0);
-				if (Func.isNotEmpty(stockArticleEntity)){
-					distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(),stockArticleEntity.getWarehouseId());
-				}else {
-					log.error("#########################修改自提单维护订单数据错误orderId:{}",i.getStockArticleId());
-					throw new RuntimeException("修改自提单维护订单数据错误");
-				}
-
 			});
 			if (!longs.isEmpty()) {
 //				distributionZeroPackageService.deleteLogic(longs);