From 8a35ab32479e63cc4d478a03692ec00bc5b766b5 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Fri, 18 Oct 2024 23:05:01 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=B9=B2=E7=BA=BF=E8=A3=85=E8=BD=A6=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=8C=E5=8D=B8=E8=BD=A6=E8=AF=A6=E6=83=85=E9=9B=B6?= =?UTF-8?q?=E6=8B=85=E6=94=B6=E8=B4=A7=E5=8D=95=E4=BD=8D=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trunkline/service/impl/TrunklineCarsLoadServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 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 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);