From e67fdca085e59a79a82e57281d49bd128e696ab4 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 4 Apr 2024 02:11:54 +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

---
 .../DistrilbutionBillLadingServiceImpl.java   | 29 ++++++++++++-------
 1 file changed, 18 insertions(+), 11 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 c91766f8c..aba7cbe7a 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
@@ -336,11 +336,25 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			}
 			//修改订单数据
 			if (!distrilbutionBillLading.getStockArticleList().isEmpty()) {
-				boolean order = getOrder(distrilbutionBillLading.getStockArticleList(), distrilbutionBillLading.getId());
-				if (!order) {
-					throw new ServiceException("修改失败！！");
+//				boolean order = getOrder(distrilbutionBillLading.getStockArticleList(), distrilbutionBillLading.getId());
+//				if (!order) {
+//					throw new ServiceException("修改失败！！");
+//				}
+				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 {
+						throw new ServiceException("修改失败！！");
+
+					}
 				}
+
+
 			}
+
 		/*	else{
 				updateOrder(distrilbutionBillLading);
 			}
@@ -453,14 +467,7 @@ 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();