From 465f42407196b217370792c51d18714ada43784b Mon Sep 17 00:00:00 2001
From: "pref_mail@163.com" <123456>
Date: Wed, 27 Dec 2023 13:52:16 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 blade-service-api/logpm-distribution-api/pom.xml            | 6 ++++++
 .../service/impl/DistributionDeliveryListServiceImpl.java   | 2 +-
 .../service/impl/DistributionStockArticleServiceImpl.java   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/logpm-distribution-api/pom.xml b/blade-service-api/logpm-distribution-api/pom.xml
index 86ba95620..617f19a4c 100644
--- a/blade-service-api/logpm-distribution-api/pom.xml
+++ b/blade-service-api/logpm-distribution-api/pom.xml
@@ -20,6 +20,12 @@
             <version>3.2.0.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>logpm-aftersales-api</artifactId>
+            <version>3.2.0.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 
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 f989cfee6..2e5801755 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
@@ -603,7 +603,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 //				str.append("包件装车");
 //				loadingNum.getAndAdd(loadscanEntity.getPackageNub());
 //				distributionAsyncService.checkLoadingByPackage(parcelListEntity, loadscanEntity.getDeliveryId(), loadscanEntity.getReservationId());
-			} else if (parcelListEntityList.size() == 0) {
+			} else if (parcelListEntityList.isEmpty()) {
 				//查找出该包件信息
 				DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getOrderPackageCode, distrilbutionloadingscanDTO.getBarcode()));
 				List<DistributionReservationEntity> reservationEntityList = distributionDeliveryListMapper.selectReservationByDeliveryListId(distrilbutionloadingscanDTO.getDeliveryId());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
index 604f0ed7a..4e3f5c98e 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java
@@ -1407,7 +1407,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 					stockArticleEntity.setOrderStatus("20");
 				}
 			}else{
-				if(signNum == totalNumber){
+				if(signNum.equals(totalNumber) ){
 					stockArticleEntity.setOrderStatus("80");
 				}else{
 					stockArticleEntity.setOrderStatus("70");