Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -3114,7 +3114,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		if (!packageLockIds.isEmpty()) {
 			List<Long> 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("该包件正在被操作,请稍后再试!!!");

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<Long> warehouseIds = indexDTO.getWarehouseIds();
-			IndexTrunklineHandOrderDataVO indexTrunklineHandOrderDataVO = new IndexTrunklineHandOrderDataVO();
+			 indexTrunklineHandOrderDataVO = new IndexTrunklineHandOrderDataVO();
 			if (warehouseIds.isEmpty()) {
 				return indexTrunklineHandOrderDataVO;
 			}