From 7e6b168aab83cc9dd953d14e963f2c4efb61ebd0 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Tue, 12 Mar 2024 16:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9B=B6=E6=8B=85=E5=8C=85=E4=BB=B6=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AA=E7=AD=BE=E6=94=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 b8f93f57a..4e13b943a 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
@@ -1008,7 +1008,8 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		//维护配送单信息
 		deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
 		distributionDeliveryListService.updateById(deliveryListEntity);
-
+		//维护客户状态
+		distributionReservationService.maintenanceReservationInfo(reservationId);
 		//查询计划和是否进行装车
 		return R.success("操作成功");
 	}
@@ -1029,7 +1030,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			return R.fail("请联系管理员");
 		}
 		//查询订单
-		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(reservationZeroPackageEntity.getStockArticleId());
 		String zeroPackageIds = distrilbutionloadingscanDTO.getZeroPackageIds();
 		Long reservationId = distrilbutionloadingscanDTO.getReservationId();
 		BladeUser user = AuthUtil.getUser();
@@ -1039,6 +1039,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			.eq(DistributionReservationZeroPackageEntity::getParcelListId, zeroPackageIds)
 			.ne(DistributionReservationZeroPackageEntity::getParcelListId, ReservationPackageStatusConstant.quxiao.getValue())
 		);
+		DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(reservationZeroPackageEntities.getStockArticleId());
 		if (Func.isEmpty(reservationZeroPackageEntities)){
 			log.error(method+"预约单异常reservationId:{}",reservationId);
 			return R.fail("请联系管理员");
@@ -1170,7 +1171,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionParcelNumberEntity.setOutboundQuantity(c);
 			distributionParcelNumberEntity.setDeliveryQuantity(d);
 		}
-		distributionParcelListService.maintenanceZeroPackageInfo(distributionParcelNumberEntity.getParcelListId(),p.getWarehouseId());
+		distributionParcelListService.maintenanceZeroPackageInfo(distributionParcelNumberEntity.getParcelListId(),stockArticleEntity.getWarehouseId());
 
 		distributionParcelNumberService.updateById(distributionParcelNumberEntity);
 		//维护订单
@@ -1180,10 +1181,9 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 		deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.peisongzhong.getValue());
 		distributionDeliveryListService.updateById(deliveryListEntity);
 		//维护客户状态
-		distributionAsyncService.maintenanceOrderStatus();
-
+		distributionReservationService.maintenanceReservationInfo(reservationId);
 		return R.success("操作成功");
-		;
+
 	}
 
 	private List<DeliveryNodeVo> handleStockUp(DistributionStockupEntity distributionStockupEntity) {