1.干线bug修复

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/service/impl/TrunklineCarsLoadServiceImpl.java

@@ -2682,13 +2682,13 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl<TrunklineCarsL
 		IPage<TrunklineCarsLoadScanVO> pageList = trunklineCarsLoadScanService.loadingDetail(page, loadCarsDTO);
 		List<TrunklineCarsLoadScanVO> records = pageList.getRecords();
 		//把records中type等于2的id放入一个集合
-		List<Long> scanLoadIds = records.stream().filter(item -> item.getType() == 2).map(TrunklineCarsLoadScanVO::getId).collect(Collectors.toList());
+		List<Long> scanLoadIds = records.stream().filter(item -> item.getType() == 2).map(TrunklineCarsLoadScanVO::getCarsLoadScanId).collect(Collectors.toList());
 		if(CollUtil.isNotEmpty(scanLoadIds)){
 			List<TrunklineScanZeroDetailVO> scanZeroDetailVOS = scanZeroDetailService.findListByCarsLoadScanIds(scanLoadIds);
 			//把scanZeroDetailVOS通过scanId进行分组
 			Map<Long, List<TrunklineScanZeroDetailVO>> scanZeroDetailVOMap = scanZeroDetailVOS.stream().collect(Collectors.groupingBy(TrunklineScanZeroDetailVO::getScanId));
 			records.forEach(item -> {
-				Long scanId = item.getId();
+				Long scanId = item.getCarsLoadScanId();
 				List<TrunklineScanZeroDetailVO> list = scanZeroDetailVOMap.get(scanId);
 				//把list中所有元素的goodsName用逗号拼起来
 				String loadingGoods = list.stream()