From 51286dfbd32c5d38789dea02b9b8345b14bf9990 Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 18 Mar 2025 17:38:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BFbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TrunklineCarsLoadServiceImpl.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 2f36fa9d7..775dce0a2 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
@@ -3355,7 +3355,19 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 
 			return signLoadScanByIds(scanLoadIds,warehouseId);
 		}else if("2".equals(deliveryType)){
-			List<Long> scanLoadIds = trunklineCarsLoadScanService.findAllIdListByLoadIdAndScanStatus(loadId,"2");
+			List<String> scanStatus = new ArrayList<>();
+			scanStatus.add("1");
+			scanStatus.add("2");
+
+			QueryWrapper<TrunklineCarsLoadScanEntity> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("load_id",loadId)
+				.in("scan_status",scanStatus);
+
+			List<TrunklineCarsLoadScanEntity> carsLoadScanEntityList = trunklineCarsLoadScanService.list(queryWrapper);
+			//把carsLoadScanEntityList中的id放入一个List
+			List<Long> scanLoadIds = carsLoadScanEntityList.stream()
+				.map(TrunklineCarsLoadScanEntity::getId)
+				.collect(Collectors.toList());
 
 			return signLoadScanByIds(scanLoadIds,warehouseId);