From ef9f5a494c0b52eb75dec2b5bc5fd3de8cb67d55 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 22 Jul 2024 23:33:54 +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=E8=AE=A2=E5=8D=95BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
index deaa58f1a..07e9dbd37 100644
--- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
+++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java
@@ -2943,6 +2943,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 	}
 
 	@Override
+	@Transactional
 	public void maintenanceCancelBillLading(List<Long> ids) {
 		List<Long> orderIds = new ArrayList<>();
 		List<Long> packageIds = new ArrayList<>();
@@ -2971,7 +2972,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService {
 					reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue());
 					Integer quantity = reservationZeroPackageEntity.getQuantity();
 					distributionParcelNumberService.update(Wrappers.<DistributionParcelNumberEntity>update().lambda()
-						.setSql("delivery_quantity -", quantity)
+						.setSql("delivery_quantity = delivery_quantity - "+quantity)
 						.eq(DistributionParcelNumberEntity::getParcelListId,reservationZeroPackageEntity.getParcelListId())
 						.eq(DistributionParcelNumberEntity::getStockArticleId,reservationZeroPackageEntity.getStockArticleId())
 					);
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 6d3917ad0..ec257bc76 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
@@ -2211,6 +2211,9 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 						}
 
 					}
+					if (deliveryQuantity == 0){
+						stockArticleEntity.setReservationStatus(OrderReservationStatusConstant.yiyueyue.getValue());
+					}
 					if (signingQuantity == 0) {
 						stockArticleEntity.setOrderStatus(OrderStatusConstant.ruku.getValue());
 					} else {