达沃特修改暂存

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -501,7 +501,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 			baseMapper.selectById(delivery.getId());//查询原始单据
 			if (delivery.getDeliveryType().equals(DeliveryEnum.TAKE.getType()) && delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType())) {//发货
 				throw new RuntimeException("已收货请勿重复收货");
-			} else if (delivery.getDeliveryType().equals(DeliveryEnum.REVOCATION.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.REVOCATION.getType()))//撤销发货
+			} else if (delivery.getDeliveryType().equals(DeliveryEnum.REVOCATION.getType()) && !delivery.getDeliveryStatus().equals(DeliveryStatusEnum.HAVWARRIVED.getType()))//撤销发货
 			{
 				throw new RuntimeException("已撤销收货请勿重复撤销收货");
 			}