From 3fdaa632a55fa1512f1cd6b5083acd21f450d8df Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <pref_mail@163.com>
Date: Thu, 26 Sep 2024 19:11:30 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java        | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
index 1de92b35c..8568c5dc8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java
@@ -8345,7 +8345,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 										if (isSatisfy) {
 											//本车次的异常装车
 											DistributionLoadscanEntity distributionLoadscanEntity = loadscanEntityList.get(0);
-											if (distributionLoadscanEntity.getIsAbnormalSigning().equals("2")) {
+											if (distributionLoadscanEntity.getIsAbnormalSigning().equals(2)) {
 												//进行异常签收的标识
 												//存在装车数据
 												distributionLoadscanEntity.setSigningTime(simpleDateFormat.format(new Date()));
@@ -9256,10 +9256,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		}
 		//查询当前异常包件锁关联的订单信息
 		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(parcelListEntity.getStockArticleId());
-		if (Objects.isNull(parcelListEntity)) {
-			return Resp.scanFail("订单信息错误", "订单信息错误");
-		}
-		//查询是否在本车次进行异常装车
+        //查询是否在本车次进行异常装车
 		List<DistributionLoadscanEntity> loadscanEntityList = distributionLoadscanService.list(Wrappers.<DistributionLoadscanEntity>query().lambda()
 			.eq(DistributionLoadscanEntity::getOrderPackageCode, barcode)
 			.eq(DistributionLoadscanEntity::getWarehouseId, myCurrentWarehouse.getId())
@@ -9395,7 +9392,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		if (!packageLockIds.isEmpty()) {
 			List<Long> a = bladeRedis.get("warehouseId:" + myCurrentWarehouse.getId() + ":trainNumber:" + deliveryList.getTrainNumber() + ":orderPackageIds:");
 			if (!Objects.isNull(a)) {
-				boolean flag = a.stream().anyMatch(any -> packageLockIds.contains(any));
+				boolean flag = a.stream().anyMatch(packageLockIds::contains);
 				if (flag) {
 					//正在操作，请稍后重试
 					throw new CustomerException("该包件正在被操作,请稍后再试!!!");