签收调整

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

@@ -487,7 +487,7 @@ public class DistributionDeliveryListController extends BladeController {
 
 	@PostMapping("/cancelDelivery")
 	@ApiOperationSupport(order = 2)
-	@ApiOperation(value = "PC签收包件")
+	@ApiOperation(value = "PC取消包件")
 	public R cancelDelivery(@Valid @RequestBody DistrilbutionAppsignforDTO distrilbutionloadingscanDTO) {
 		R r = distributionDeliveryListService.cancelDelivery(distrilbutionloadingscanDTO.getDeliveryId());
 		if (r.isSuccess()){

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

@@ -6868,14 +6868,15 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		);
 		log.info(">>>>>>>>>>>>>>> 车次状态维护3 代码执行 list={}",list);
 
-		if (!list.isEmpty()) {
+		if (list.size()>0) {
 			//查看所有的签收信息是否均已完成
 			boolean anyMatch = list.stream().allMatch(s -> s.getSigningStatus().equals(SignforStatusConstant.yiqianshou.getValue()));
 			log.info(">>>>>>>>>>>>>>> 车次状态维护4 代码执行 anyMatch={}",anyMatch);
-
 			if (anyMatch) {
 				deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
 			}
+		}else {
+			log.error(method + "查询配送单签收信息错误，deliveryId:{}", deliveryId);
 		}
 
 		this.updateById(deliveryListEntity);