From 763886b1fada5c2b1860f33be7097fd7c2676e9b Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 22 Oct 2024 20:48:48 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E8=BF=90=E5=8D=95bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../distribution/feign/DistributionParcelListClient.java  | 7 ++++++-
 .../service/impl/TrunklineCarsLoadServiceImpl.java        | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
index 265f16375..d9cc09f20 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionParcelListClient.java
@@ -377,7 +377,12 @@ public class DistributionParcelListClient implements IDistributionParcelListClie
 
 	@Override
 	public void updatePackageStatus(List<String> orderPackageCodes, Long warehouseId, String packageStatus) {
-		distributionParcelListService.updatePackageStatus(orderPackageCodes, warehouseId, packageStatus);
+
+		//把orderPackageCodes每500条进行分组
+		List<List<String>> orderPackageCodeList = CollUtil.split(orderPackageCodes, 500);
+		orderPackageCodeList.forEach(orderPackageCodeList1 -> {
+			distributionParcelListService.updatePackageStatus(orderPackageCodeList1, warehouseId, packageStatus);
+		});
 
 		List<DistributionParcelListEntity> list = distributionParcelListService.findListByOrderPackageCode(orderPackageCodes, warehouseId);
 		//把list中的orderCode放入一个set
diff --git a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
index 67171a45e..ea23548c5 100644
--- a/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
+++ b/blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java
@@ -7041,6 +7041,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		return R.success("更新成功");
 	}
 
+	@Transactional(rollbackFor = Exception.class)
 	@Override
 	public R manualLoading(LoadCarsDTO loadCarsDTO, String remark) {
 		Long loadId = loadCarsDTO.getLoadId();
@@ -7218,7 +7219,12 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 			}
 		});
 
-		distributionParcelListClient.updatePackageStatus(orderPackageCodes, warehouseId, "60");
+		try{
+			distributionParcelListClient.updatePackageStatus(orderPackageCodes, warehouseId, "60");
+		}catch (Exception e){
+			log.error("更新状态失败",e);
+			throw new CustomerException("更新状态失败");
+		}
 
 		trunklineCarsLoadScanService.saveBatch(addCarsLoadScanList);