PC取消零担配送BUG修复

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);