From 409ab2350ce72a2b4e1f9e145a34fff1ac096873 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 4 Apr 2024 20:00:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=9B=B6=E6=8B=85=E5=8C=85=E4=BB=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IDistributionParcelListService.java       |  6 +++
 .../DistributionParcelListServiceImpl.java    | 43 +++++++++++++++++++
 .../DistributionReservationServiceImpl.java   |  4 +-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
index ed2deaa7d..ba3f51c33 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java
@@ -203,4 +203,10 @@ public interface IDistributionParcelListService extends BaseService<Distribution
 	 * @param warehouseId
 	 */
     void maintenanceZeroPackageInfo(Long parcelListId, Long warehouseId);
+
+	/**
+	 * 维护零担包件信息状态
+	 * @param parcelListId
+	 */
+    void maintenanceZerpPackageInfo(Long parcelListId);
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index bdb9d1b13..88b3d9166 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -1126,4 +1126,47 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 
 	}
 
+	/**
+	 * @param parcelListId
+	 */
+	@Override
+	public void maintenanceZerpPackageInfo(Long parcelListId) {
+		DistributionParcelNumberEntity distributionParcelNumberEntity = distributionParcelNumberService.getOne(Wrappers.<DistributionParcelNumberEntity>query().lambda()
+			.eq(DistributionParcelNumberEntity::getParcelListId, parcelListId)
+		);
+		if (Func.isNotEmpty(distributionParcelNumberEntity)){
+			DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
+			int totalQuantity = distributionParcelNumberEntity.getQuantity();
+			int handledQuantity = distributionParcelNumberEntity.getHandQuantity();
+			int deliveryQuantity = distributionParcelNumberEntity.getDeliveryQuantity();
+			int outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity();
+			int signinQuantity = distributionParcelNumberEntity.getSigninQuantity();
+			if (totalQuantity > 0){
+				parcelListEntity.setId(parcelListId);
+				if ((deliveryQuantity + outboundQuantity) == 0){
+					parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
+
+				}else if ((deliveryQuantity + outboundQuantity) == totalQuantity){
+					parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue());
+				}
+				if (outboundQuantity == 0){
+					parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue());
+				}else if (outboundQuantity == totalQuantity){
+					parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
+					parcelListEntity.setOrderPackageReservationStatus(OrderPackageStatusConstant.yichuku.getValue());
+				}
+
+				if (signinQuantity == totalQuantity){
+					parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
+				}
+				this.updateById(parcelListEntity);
+
+
+			}
+
+		}
+
+
+	}
+
 }
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
index b688213d0..c067c8ea4 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java
@@ -2673,8 +2673,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 //							parcelNumberEntity.setHandQuantity(parcelNumberEntity.getHandQuantity() + rzp.getQuantity());
 							parcelNumberEntity.setDeliveryQuantity(parcelNumberEntity.getDeliveryQuantity() - rzp.getQuantity());
 							distributionParcelNumberService.updateById(parcelNumberEntity);
-							distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity);
+//							distributionAsyncService.checkZeroStockArticleReservationStatus(parcelNumberEntity);
 						}
+
+						distributionParcelListService.maintenanceZerpPackageInfo(rzp.getParcelListId());
 					});
 
 				} else {

From 6d5923eea38474f72b3bb179520c3deef05ef247 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Thu, 4 Apr 2024 20:01:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8F=96=E6=B6=88=E9=85=8D=E9=80=81?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4=E9=9B=B6=E6=8B=85=E5=8C=85=E4=BB=B6=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionParcelListServiceImpl.java       | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
index 88b3d9166..cf01390c8 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java
@@ -1142,6 +1142,9 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 			int outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity();
 			int signinQuantity = distributionParcelNumberEntity.getSigninQuantity();
 			if (totalQuantity > 0){
+				if (handledQuantity == totalQuantity){
+					parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue());
+				}
 				parcelListEntity.setId(parcelListId);
 				if ((deliveryQuantity + outboundQuantity) == 0){
 					parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
@@ -1156,6 +1159,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
 					parcelListEntity.setOrderPackageReservationStatus(OrderPackageStatusConstant.yichuku.getValue());
 				}
 
+
 				if (signinQuantity == totalQuantity){
 					parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue());
 				}