Merge branch 'dev' of http://47.108.105.48:3000/java_project/logisticsplatform-service into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionDeliveryListController.java

@@ -526,11 +526,11 @@ public class DistributionDeliveryListController extends BladeController {
 	@ApiOperation(value = "PC取消包件")
 	public R cancelDelivery(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		R r = distributionDeliveryListService.cancelDelivery(distrilbutionloadingscanDTO.getDeliveryId());
-		if (r.isSuccess()){
+//		if (r.isSuccess()){
 			//取消成功，维护配送单状态和数量
-			distributionDeliveryListService.maintenanceDeliveryNum(distrilbutionloadingscanDTO.getDeliveryId());
-			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
-		}
+//			distributionDeliveryListService.maintenanceDeliveryNum(distrilbutionloadingscanDTO.getDeliveryId());
+//			distributionDeliveryListService.maintenanceDeliveryInfo(distrilbutionloadingscanDTO.getDeliveryId());
+//		}
 		return r;
 	}