1.干线bug修复

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);