修复配送状态变更

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

@@ -4572,6 +4572,9 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 	public R loadingStart(DistrilbutionloadingscanDTO distrilbutionloadingscanDTO) {
 		//获取当前用户司机
 		DistributionDeliveryListEntity distributionDeliveryListEntity = distributionDeliveryListMapper.selectById(distrilbutionloadingscanDTO.getDeliveryId());
+		if (distributionDeliveryListEntity.getDeliveryStatus().equals("3")){
+			return Resp.scanFail("该任务已完结！","该任务已完结!");
+		}
 		String format = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
 		String loadingId = distrilbutionloadingscanDTO.getLoadingId();
 		Boolean b = false;
@@ -7114,6 +7117,8 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 		//查询配送内有效的客户信息
 		List<DistributionSignforEntity> signforEntities = baseMapper.selectSignforByDeliveryId(deliveryId);
 		boolean flag = signforEntities.stream().allMatch(s -> SignforStatusConstant.yiqianshou.getValue().equals(s.getSigningStatus()));
+		log.info(method+"维护配送状态>>>>>>>>>>>>deliveryId:{}",deliveryId);
+		log.info(method+"维护配送状态>>>>>>>>>>>>状态是否满足完成:{}",flag);
 		if (flag){
 			deliveryListEntity.setDeliveryStatus(DeliveryStatusConstant.yiwancheng.getValue());
 		}