PC取消零担配送

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java

@@ -1408,14 +1408,14 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			}
 			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;
-
-
-
+			deliveryListEntity.setDeliveryNumber(newDeliveryNumber);
+			deliveryListEntity.setOrderNumber(newOrderDeliveryNumber);
+			deliveryListEntity.setCustomersNumber(newCustomersNumber);
+			distributionDeliveryListService.updateById(deliveryListEntity);
 		} else {
 			log.error(method + "查询原计划零担信息错误reservationId:{},ids:{}", distrilbutionloadingscanDTO.getReservationId(), list);
 			return R.fail("计划查询错误");
@@ -4819,19 +4819,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 			distributionSignforEntity.setDriverRemarks(distributionSignfor.getDriverRemarks());
 		}
 		this.updateById(distributionSignforEntity);
-//		LambdaUpdateWrapper<DistributionSignforEntity> set = new UpdateWrapper<DistributionSignforEntity>().lambda()
-////			.eq(DistributionSignforEntity::getId, distributionSignforEntity.getId())
-////			.set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures())
-////			.set(StringUtils.isNotBlank(distributionSignfor.getSigningType()), DistributionSignforEntity::getSigningType, distributionSignfor.getSigningType())
-////			.set(DistributionSignforEntity::getLoadedinNumber, loadingInventoryNum)
-////			.set(DistributionSignforEntity::getLoadedNumber, loadingPackageNum)
-////			.set(DistributionSignforEntity::getReceivedinQuantity, signingInventoryNum)
-////			.set(DistributionSignforEntity::getReceivedQuantity, signingPackageNum)
-////			.set(DistributionSignforEntity::getDriverSigning, 2)
-////			.set(!distributionSignfor.getIsClerk() && StringUtils.isNotBlank(distributionSignfor.getDriverRemarks()), DistributionSignforEntity::getDriverRemarks, distributionSignfor.getDriverRemarks())
-////			.set(DistributionSignforEntity::getDriverSigning, 2);
-////		boolean update = this.update(set);
-		//维护配送信息
 		return R.status(true);
 	}