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 2e2a0193c..9b376d82f 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 @@ -1900,7 +1900,7 @@ public class TrunklineCarsLoadServiceImpl extends BaseServiceImpl loadingNumVOList = scanZeroDetailService.findGoodsLoadingNum(loadId,warehouseId,waybillNo,orderCode); //把loadingNumVOList转化成以goodsId作为key的Map Map map = loadingNumVOList.stream().collect(Collectors.toMap(GoodsLoadingNumVO::getGoodsId, Function.identity())); - List zeroPackageList = distributionParcelListClient.findPackageGoodsListByWaybillNo(waybillNo); + List zeroPackageList = distributionParcelListClient.findPackageGoodsListByWaybillNoAndWarehouseId(waybillNo,warehouseId); List ls = new ArrayList<>(); zeroPackageList.forEach(jsonObject -> { ZeroPackageVO javaObject = jsonObject.toJavaObject(ZeroPackageVO.class);