From bfe3c0e6d732aa229ebc71fa4b270fa553446735 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 27 Dec 2023 19:27:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E8=AE=A1=E5=88=92=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4=E8=AE=A2=E5=8D=95=E9=85=8D=E9=80=81=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DistributionDeliveryListServiceImpl.java        | 9 ++++++---
 1 file changed, 6 insertions(+), 3 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 b26415b73..a6d09c71e 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
@@ -3098,7 +3098,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 									DistributionParcelListEntity parcelListEntity = distributionParcelListService.getById(reservationPackageEntity.getParceListId());
 									parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 									distributionParcelListService.updateById(parcelListEntity);
-									distributionAsyncService.checkStockArticleReservationStatus(parcelListEntity);
+//									distributionAsyncService.checkStockArticleReservationStatus(parcelListEntity);
 								});
 							} else {
 								//查找该订单没有进行包件选择的操作，  但是存在newOrder列表中  视为该订单保持计划选择
@@ -3217,6 +3217,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							log.error("###########################reservation_stockaticle的isZeroz字段维护错误,reservation_stockarticleID:{}", reservationStockarticleEntity.getId());
 							new RuntimeException("服务器正忙...");
 						}
+						DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(n.get(0).getStockArticleId());
+						distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(),myCurrentWarehouse.getId());
 					});
 				}
 				//重新维护预约信息
@@ -3258,8 +3260,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 						distributionAsyncService.checkStockArticleReservationStatus(parcelListEntity);
 					});
 					DistributionStockArticleEntity stockArticleEntity = distributionStockArticleService.getById(e.getStockArticleId());
-					stockArticleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(Func.copy(stockArticleEntity, DistributionStockArticleDTO.class)));
-					distributionStockArticleService.updateById(stockArticleEntity);
+					distributionStockArticleService.maintenanceOrderInfo(stockArticleEntity.getOrderCode(),myCurrentWarehouse.getId());
+//					stockArticleEntity.setReservationStatus(distributionReservationPackageService.judgmentStatus(Func.copy(stockArticleEntity, DistributionStockArticleDTO.class)));
+//					distributionStockArticleService.updateById(stockArticleEntity);
 					//修改预约状态和包件状态
 				} else if (e.getIsZero().equals(IsOrNoConstant.yes.getValue())) {
 					//零担