From 347ea50e85ebd60bf1b7338568c4751626d1b8ef Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Thu, 12 Dec 2024 18:59:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/DistributionReservationMapper.xml | 2 +- .../report/service/impl/WarehouseIndexServiceImpl.java | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 79da9167b..b04df26c8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -632,7 +632,7 @@ logpm_distribution_reservation_stocklist AS ldrs INNER JOIN logpm_distribution_stock_list AS ldsl ON ldrs.stocklist_id = ldsl.id AND ldsl.is_deleted = 0 INNER JOIN logpm_dis_stock_list_detail AS ldsld ON ldrs.reservation_id = ldsld.reservation_id AND ldsld.is_deleted = 0 AND ldsld.stock_package_status != 2 - ldrs.stocklist_id = ldsl.id + AND ldrs.stocklist_id = ldsl.id WHERE ldrs.is_deleted = 0 AND ldrs.reservation_id = #{reservationId} diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java index 0de77067e..b413e1153 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/service/impl/WarehouseIndexServiceImpl.java @@ -199,7 +199,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { for (Long warehouseId : indexDTO.getWarehouseIds()) { - String key = CacheNames.tenantKey(AuthUtil.getTenantId(), "openOrderIncome", "warehouseId:" + warehouseId); + String key = CacheNames.tenantKey(AuthUtil.getTenantId(), "openOrderIncome", "warehouseId:" + warehouseId); // 查询每个仓库的数据 IndexOpenOrderIncomeVO indexOpenOrderIncomeVO = bladeRedis.get(key); if (Objects.isNull(indexOpenOrderIncomeVO)) { @@ -498,13 +498,10 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { indexTrunklineHandOrderDataVO.setHandleNum(packageHandleNum + zeroHandleNum); indexTrunklineHandOrderDataVO.setHandleWeight(packageHandleWeight.add(zeroHandleWeight)); indexTrunklineHandOrderDataVO.setHandleVolume(packageHandleVolume.add(zeroHandleVolume)); - indexTrunklineHandOrderDataVO.setWarehouseName(getCacheWarehouseName(indexTrunklineHandOrderDataVO.getWarehouseId())); - - data.add(indexTrunklineHandOrderDataVO); bladeRedis.setEx(key, indexTrunklineHandOrderDataVO, 3600L); } - + data.add(indexTrunklineHandOrderDataVO); }); return data; } @@ -935,7 +932,7 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { carsStattisNumVO.setWarehouseId(warehouseId); carsStattisNumVO.setWarehouseName(getCacheWarehouseName(warehouseId)); - + bladeRedis.setEx(key, carsStattisNumVO, 3600L); } data.add(carsStattisNumVO); }