From 9a0876002a1d7c162c09f33c46e3da2ee7c777fd Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Wed, 24 Jul 2024 18:14:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=87=AA=E6=8F=90=E9=9B=B6?=
 =?UTF-8?q?=E6=8B=85=E7=8A=B6=E6=80=81=E7=BB=B4=E6=8A=A4BUG=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionStockArticleServiceImpl.java       | 2 +-
 .../service/impl/DistrilbutionBillLadingServiceImpl.java        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

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 ec257bc76..736ce1d78 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
@@ -2212,7 +2212,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 					}
 					if (deliveryQuantity == 0){
-						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.daiyuyue.getValue());
 					}
 					if (signingQuantity == 0) {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
index ddb2189c2..0cc97e1ee 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java
@@ -2074,6 +2074,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 					distributionReservationZeroPackageEntity.setParcelListId(zp.getParcelListId());
 					distributionReservationZeroPackageEntity.setStockArticleId(zp.getStockArticleId());
 					distributionReservationZeroPackageEntity.setType("3");
+					distributionReservationZeroPackageEntity.setReservationId(distrilbutionBillLading.getId());
 					distributionReservationZeroPackageEntity.setZeroPackageStatus("3");
 					distributionReservationZeroPackageEntity.setCategoryName(parcelListEntity.getFirsts());
 					log.info(">>>>>>>>>>>>>>>>>>>>>>>>零担品类增加计划数量getHandQuantity:{}getDeliveryQuantity:{}(zp.getHandQuantity() - zp.getDeliveryQuantity()):{}", zp.getHandQuantity(), zp.getDeliveryQuantity(), (zp.getHandQuantity() - zp.getDeliveryQuantity()));