From 48013a82e87fc065410baf33942208f0ac61adb6 Mon Sep 17 00:00:00 2001
From: PigBaoBei <2739175034@qq.com>
Date: Mon, 15 Apr 2024 19:22:36 +0800
Subject: [PATCH] =?UTF-8?q?PC=E5=8F=96=E6=B6=88=E9=9B=B6=E6=8B=85=E9=85=8D?=
 =?UTF-8?q?=E9=80=81BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DistributionSignforServiceImpl.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 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 03d4050bb..d3fa88085 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
@@ -1330,17 +1330,17 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 	@Override
 	public R cancelZeroPackage(DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		String method = "####################DistributionSignforImpl.cancelZeroPackage";
-		if (Func.isNotEmpty(distrilbutionloadingscanDTO.getZeroPackageIds())) {
+		if (Func.isEmpty(distrilbutionloadingscanDTO.getZeroPackageIds())) {
 			log.error(method + "ZeroPackageIds参数缺失");
 			return R.fail("请联系管理员维护!!!");
 		}
 
-		if (Func.isNotEmpty(distrilbutionloadingscanDTO.getReservationId())) {
+		if (Func.isEmpty(distrilbutionloadingscanDTO.getReservationId())) {
 			log.error(method + "ReservationId参数缺失");
 			return R.fail("请联系管理员维护!!!");
 		}
 
-		if (Func.isNotEmpty(distrilbutionloadingscanDTO.getDeliveryId())) {
+		if (Func.isEmpty(distrilbutionloadingscanDTO.getDeliveryId())) {
 			log.error(method + "DeliveryId参数缺失");
 			return R.fail("请联系管理员维护!!!");
 		}
@@ -1406,12 +1406,16 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 				reservationEntity.setReservationStatus(ReservationStatusConstant.yiquexiao.getValue());
 				consingee += 1;
 			}
+			reservationEntity.setReservationNum(reservationNum);
 			distributionReservationService.updateById(reservationEntity);
 			//维护整体配送任务状态
 			DistributionDeliveryListEntity deliveryListEntity = distributionDeliveryListService.getById(distrilbutionloadingscanDTO.getDeliveryId());
 			Integer newDeliveryNumber = deliveryListEntity.getDeliveryNumber() - num.get();
 			Integer newOrderDeliveryNumber = deliveryListEntity.getOrderNumber() - orderNum.get();
 			Integer newCustomersNumber = deliveryListEntity.getCustomersNumber() - consingee;
+			log.error(method + "取消零担维护配送信息newDeliveryNumber:{}", newDeliveryNumber);
+			log.error(method + "取消零担维护配送信息newOrderDeliveryNumber:{}", newOrderDeliveryNumber);
+			log.error(method + "取消零担维护配送信息newCustomersNumber:{}", newCustomersNumber);
 			deliveryListEntity.setDeliveryNumber(newDeliveryNumber);
 			deliveryListEntity.setOrderNumber(newOrderDeliveryNumber);
 			deliveryListEntity.setCustomersNumber(newCustomersNumber);