From 23e37abd8a7195465a006d8112088b9f433c2f2b Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Mon, 8 Jul 2024 10:56:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=AD=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DistributionSignforServiceImpl.java | 3 ++- .../report/service/impl/WarehouseIndexServiceImpl.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index d6b6e5fb4..375838464 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3114,7 +3114,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + "trainNumber:" + deliveryListEntity.getTrainNumber() + "orderPackageCode:"); if (Func.isNotEmpty(a)) { - boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); + assert a != null; + boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any)); if (flag) { //正在操作，请稍后重试 throw new RuntimeException("该包件正在被操作,请稍后再试!!!"); 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 26ac20674..be1b2f5cb 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 @@ -186,11 +186,11 @@ public class WarehouseIndexServiceImpl implements IWarehouseIndexService { BladeUser user = AuthUtil.getUser(); String key = CacheNames.tenantKey(user.getTenantId(), user.getUserId() + "", "trunklineHandOrderData"); - IndexTrunklineHandOrderDataVO indexAllocationDataVO = bladeRedis.get(key); + IndexTrunklineHandOrderDataVO indexTrunklineHandOrderDataVO = bladeRedis.get(key); - if (Objects.isNull(indexAllocationDataVO)) { + if (Objects.isNull(indexTrunklineHandOrderDataVO)) { List warehouseIds = indexDTO.getWarehouseIds(); - IndexTrunklineHandOrderDataVO indexTrunklineHandOrderDataVO = new IndexTrunklineHandOrderDataVO(); + indexTrunklineHandOrderDataVO = new IndexTrunklineHandOrderDataVO(); if (warehouseIds.isEmpty()) { return indexTrunklineHandOrderDataVO; }