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; }