达沃特需求更改

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

@@ -519,7 +519,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 	}
 
 	@Override
-	@Transactional(rollbackFor = Exception.class)
+	@Transactional(rollbackFor = Exception.class,timeout = 1200000)
 	@GlobalTransactional
 	public void comfire(Delivery delivery) {
 		//防重校验
@@ -571,7 +571,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 		}
 
 
-		if (select.getDeliveryStatus() == null || "已收货".equals(select.getDeliveryStatus())) {
+		if (select.getDeliveryStatus() == null || DeliveryStatusEnum.REVOCATION.getType().equals(select.getDeliveryStatus())) {
 			throw new SecurityException("此单据已收货或者不存在,禁止重复操作");
 		}