Compare commits
No commits in common. "e9ae63ccbe5529f5600731ec6ba55fda9dcaed86" and "bb764b4d125f574fbbd66658369834bc79bea4db" have entirely different histories.
e9ae63ccbe
...
bb764b4d12
@ -1,5 +1,4 @@
|
|||||||
using Domain.Dtos.Sales;
|
using Domain.Dtos.Sales;
|
||||||
using Domain.Generics;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Servicio de dominio para la gestión de consultas de Delivery Note (Remito Ventas).
|
/// Servicio de dominio para la gestión de consultas de Delivery Note (Remito Ventas).
|
||||||
@ -7,21 +6,6 @@ using Domain.Generics;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public interface IDeliveryNoteDom
|
public interface IDeliveryNoteDom
|
||||||
{
|
{
|
||||||
/// <summary>
|
|
||||||
/// Busca Delivery Notes con filtros y paginación.
|
|
||||||
/// </summary>
|
|
||||||
Task<PagedResult<DeliveryNoteSummaryDto>> SearchAsync(
|
|
||||||
int? customerId,
|
|
||||||
string? customerText,
|
|
||||||
string? deliveryNoteNumber,
|
|
||||||
int? quoteId,
|
|
||||||
string? quoteNumber,
|
|
||||||
DateTime? issueDateFrom,
|
|
||||||
DateTime? issueDateTo,
|
|
||||||
string? status,
|
|
||||||
int page = 1,
|
|
||||||
int pageSize = 50);
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Obtiene un Delivery Note por su identificador único.
|
/// Obtiene un Delivery Note por su identificador único.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@ -1,6 +1,5 @@
|
|||||||
using Core.Interfaces;
|
using Core.Interfaces;
|
||||||
using Domain.Dtos.Sales;
|
using Domain.Dtos.Sales;
|
||||||
using Domain.Generics;
|
|
||||||
using Models.Interfaces;
|
using Models.Interfaces;
|
||||||
|
|
||||||
namespace Core.Services
|
namespace Core.Services
|
||||||
@ -9,34 +8,6 @@ namespace Core.Services
|
|||||||
{
|
{
|
||||||
private readonly IPhSDeliveryNoteRepository _deliveryNoteRepository = deliveryNoteRepository;
|
private readonly IPhSDeliveryNoteRepository _deliveryNoteRepository = deliveryNoteRepository;
|
||||||
|
|
||||||
public Task<PagedResult<DeliveryNoteSummaryDto>> SearchAsync(
|
|
||||||
int? customerId,
|
|
||||||
string? customerText,
|
|
||||||
string? deliveryNoteNumber,
|
|
||||||
int? quoteId,
|
|
||||||
string? quoteNumber,
|
|
||||||
DateTime? issueDateFrom,
|
|
||||||
DateTime? issueDateTo,
|
|
||||||
string? status,
|
|
||||||
int page = 1,
|
|
||||||
int pageSize = 50)
|
|
||||||
{
|
|
||||||
page = page <= 0 ? 1 : page;
|
|
||||||
pageSize = pageSize <= 0 ? 50 : pageSize;
|
|
||||||
|
|
||||||
return _deliveryNoteRepository.SearchAsync(
|
|
||||||
customerId,
|
|
||||||
string.IsNullOrWhiteSpace(customerText) ? null : customerText.Trim(),
|
|
||||||
string.IsNullOrWhiteSpace(deliveryNoteNumber) ? null : deliveryNoteNumber.Trim(),
|
|
||||||
quoteId,
|
|
||||||
string.IsNullOrWhiteSpace(quoteNumber) ? null : quoteNumber.Trim(),
|
|
||||||
issueDateFrom,
|
|
||||||
issueDateTo,
|
|
||||||
string.IsNullOrWhiteSpace(status) ? null : status.Trim(),
|
|
||||||
page,
|
|
||||||
pageSize);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task<DeliveryNoteDto?> GetDtoByIdAsync(int id)
|
public Task<DeliveryNoteDto?> GetDtoByIdAsync(int id)
|
||||||
{
|
{
|
||||||
if (id <= 0)
|
if (id <= 0)
|
||||||
|
|||||||
@ -1,18 +0,0 @@
|
|||||||
namespace Domain.Dtos.Sales
|
|
||||||
{
|
|
||||||
public class DeliveryNoteSummaryDto
|
|
||||||
{
|
|
||||||
public int Id { get; set; }
|
|
||||||
public string DeliveryNoteNumber { get; set; } = string.Empty;
|
|
||||||
public int? QuoteId { get; set; }
|
|
||||||
public string? QuoteNumber { get; set; }
|
|
||||||
public DateTime IssueDate { get; set; }
|
|
||||||
public int CustomerId { get; set; }
|
|
||||||
public string CustomerName { get; set; } = string.Empty;
|
|
||||||
public string Status { get; set; } = string.Empty;
|
|
||||||
public string? Observations { get; set; }
|
|
||||||
public int PrintCount { get; set; }
|
|
||||||
public DateTime CreatedAt { get; set; }
|
|
||||||
public DateTime? ModifiedAt { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
namespace Domain.Generics
|
|
||||||
{
|
|
||||||
public class DeliveryNoteSearchParams : PagedRequest
|
|
||||||
{
|
|
||||||
public string? DeliveryNoteNumber { get; set; }
|
|
||||||
public int? CustomerId { get; set; }
|
|
||||||
public string? CustomerText { get; set; }
|
|
||||||
public int? QuoteId { get; set; }
|
|
||||||
public string? QuoteNumber { get; set; }
|
|
||||||
public DateTime? IssueDateFrom { get; set; }
|
|
||||||
public DateTime? IssueDateTo { get; set; }
|
|
||||||
public string? Status { get; set; }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,22 +1,9 @@
|
|||||||
using Domain.Dtos.Sales;
|
using Domain.Dtos.Sales;
|
||||||
using Domain.Generics;
|
|
||||||
|
|
||||||
namespace Models.Interfaces
|
namespace Models.Interfaces
|
||||||
{
|
{
|
||||||
public interface IPhSDeliveryNoteRepository
|
public interface IPhSDeliveryNoteRepository
|
||||||
{
|
{
|
||||||
Task<PagedResult<DeliveryNoteSummaryDto>> SearchAsync(
|
|
||||||
int? customerId,
|
|
||||||
string? customerText,
|
|
||||||
string? deliveryNoteNumber,
|
|
||||||
int? quoteId,
|
|
||||||
string? quoteNumber,
|
|
||||||
DateTime? issueDateFrom,
|
|
||||||
DateTime? issueDateTo,
|
|
||||||
string? status,
|
|
||||||
int page = 1,
|
|
||||||
int pageSize = 50);
|
|
||||||
|
|
||||||
Task<DeliveryNoteDto?> GetDtoByIdAsync(int id);
|
Task<DeliveryNoteDto?> GetDtoByIdAsync(int id);
|
||||||
Task<DeliveryNoteDto?> GetDtoByDeliveryNoteNumberAsync(string deliveryNoteNumber);
|
Task<DeliveryNoteDto?> GetDtoByDeliveryNoteNumberAsync(string deliveryNoteNumber);
|
||||||
Task<IEnumerable<DeliveryNoteDto>> GetDtosByQuoteIdAsync(int quoteId);
|
Task<IEnumerable<DeliveryNoteDto>> GetDtosByQuoteIdAsync(int quoteId);
|
||||||
|
|||||||
@ -1,7 +1,5 @@
|
|||||||
using Domain.Dtos.Sales;
|
using Domain.Dtos.Sales;
|
||||||
using Domain.Generics;
|
|
||||||
using Microsoft.EntityFrameworkCore;
|
using Microsoft.EntityFrameworkCore;
|
||||||
using Models.Helpers;
|
|
||||||
using Models.Interfaces;
|
using Models.Interfaces;
|
||||||
using Models.Models;
|
using Models.Models;
|
||||||
|
|
||||||
@ -11,77 +9,6 @@ namespace Models.Repositories
|
|||||||
{
|
{
|
||||||
private readonly PhronCareOperationsHubContext _context = context;
|
private readonly PhronCareOperationsHubContext _context = context;
|
||||||
|
|
||||||
public async Task<PagedResult<DeliveryNoteSummaryDto>> SearchAsync(
|
|
||||||
int? customerId,
|
|
||||||
string? customerText,
|
|
||||||
string? deliveryNoteNumber,
|
|
||||||
int? quoteId,
|
|
||||||
string? quoteNumber,
|
|
||||||
DateTime? issueDateFrom,
|
|
||||||
DateTime? issueDateTo,
|
|
||||||
string? status,
|
|
||||||
int page = 1,
|
|
||||||
int pageSize = 50)
|
|
||||||
{
|
|
||||||
var query = _context.PhSDeliveryNotes
|
|
||||||
.AsNoTracking()
|
|
||||||
.Include(x => x.Customer)
|
|
||||||
.Include(x => x.Quote)
|
|
||||||
.AsQueryable();
|
|
||||||
|
|
||||||
if (customerId.HasValue)
|
|
||||||
query = query.Where(x => x.CustomerId == customerId.Value);
|
|
||||||
else if (!string.IsNullOrWhiteSpace(customerText))
|
|
||||||
query = query.Where(x => x.Customer.Name.Contains(customerText));
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(deliveryNoteNumber))
|
|
||||||
query = query.Where(x => x.Deliverynotenumber.Contains(deliveryNoteNumber));
|
|
||||||
|
|
||||||
if (quoteId.HasValue)
|
|
||||||
query = query.Where(x => x.QuoteId == quoteId.Value);
|
|
||||||
else if (!string.IsNullOrWhiteSpace(quoteNumber))
|
|
||||||
query = query.Where(x => x.Quote != null && x.Quote.Quotenumber.Contains(quoteNumber));
|
|
||||||
|
|
||||||
if (issueDateFrom.HasValue)
|
|
||||||
query = query.Where(x => x.Issuedate >= issueDateFrom.Value);
|
|
||||||
|
|
||||||
if (issueDateTo.HasValue)
|
|
||||||
query = query.Where(x => x.Issuedate <= issueDateTo.Value);
|
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(status))
|
|
||||||
query = query.Where(x => x.Status == status);
|
|
||||||
|
|
||||||
query = query
|
|
||||||
.OrderByDescending(x => x.Issuedate)
|
|
||||||
.ThenByDescending(x => x.Id);
|
|
||||||
|
|
||||||
var pagedEntities = await query.ToPagedResultAsync(page, pageSize);
|
|
||||||
|
|
||||||
var dtos = pagedEntities.Items.Select(x => new DeliveryNoteSummaryDto
|
|
||||||
{
|
|
||||||
Id = x.Id,
|
|
||||||
DeliveryNoteNumber = x.Deliverynotenumber,
|
|
||||||
QuoteId = x.QuoteId,
|
|
||||||
QuoteNumber = x.Quote?.Quotenumber,
|
|
||||||
IssueDate = x.Issuedate,
|
|
||||||
CustomerId = x.CustomerId,
|
|
||||||
CustomerName = x.Customer?.Name ?? string.Empty,
|
|
||||||
Status = x.Status,
|
|
||||||
Observations = x.Observations,
|
|
||||||
PrintCount = x.Printcount,
|
|
||||||
CreatedAt = x.Createdat,
|
|
||||||
ModifiedAt = x.Modifiedat
|
|
||||||
}).ToList();
|
|
||||||
|
|
||||||
return new PagedResult<DeliveryNoteSummaryDto>
|
|
||||||
{
|
|
||||||
Items = dtos,
|
|
||||||
TotalItems = pagedEntities.TotalItems,
|
|
||||||
Page = pagedEntities.Page,
|
|
||||||
PageSize = pagedEntities.PageSize
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task<DeliveryNoteDto?> GetDtoByIdAsync(int id)
|
public async Task<DeliveryNoteDto?> GetDtoByIdAsync(int id)
|
||||||
{
|
{
|
||||||
var entity = await _context.PhSDeliveryNotes
|
var entity = await _context.PhSDeliveryNotes
|
||||||
|
|||||||
@ -1,6 +1,4 @@
|
|||||||
using Core.Interfaces;
|
using Domain.Dtos.Sales;
|
||||||
using Domain.Dtos.Sales;
|
|
||||||
using Domain.Generics;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
@ -17,42 +15,6 @@ namespace phronCare.API.Controllers.Sales
|
|||||||
_deliveryNoteService = deliveryNoteService ?? throw new ArgumentNullException(nameof(deliveryNoteService));
|
_deliveryNoteService = deliveryNoteService ?? throw new ArgumentNullException(nameof(deliveryNoteService));
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpGet("search")]
|
|
||||||
public async Task<ActionResult<PagedResult<DeliveryNoteSummaryDto>>> Search(
|
|
||||||
[FromQuery] int? customerId,
|
|
||||||
[FromQuery] string? customerText,
|
|
||||||
[FromQuery] string? deliveryNoteNumber,
|
|
||||||
[FromQuery] int? quoteId,
|
|
||||||
[FromQuery] string? quoteNumber,
|
|
||||||
[FromQuery] DateTime? issueDateFrom,
|
|
||||||
[FromQuery] DateTime? issueDateTo,
|
|
||||||
[FromQuery] string? status,
|
|
||||||
[FromQuery] int page = 1,
|
|
||||||
[FromQuery] int pageSize = 50)
|
|
||||||
{
|
|
||||||
try
|
|
||||||
{
|
|
||||||
var result = await _deliveryNoteService.SearchAsync(
|
|
||||||
customerId,
|
|
||||||
customerText,
|
|
||||||
deliveryNoteNumber,
|
|
||||||
quoteId,
|
|
||||||
quoteNumber,
|
|
||||||
issueDateFrom,
|
|
||||||
issueDateTo,
|
|
||||||
status,
|
|
||||||
page,
|
|
||||||
pageSize);
|
|
||||||
|
|
||||||
return Ok(result);
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
|
||||||
{
|
|
||||||
var methodName = MethodBase.GetCurrentMethod()?.Name ?? "UnknownMethod";
|
|
||||||
return StatusCode(500, $"{methodName} Message: {ex.Message}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
[HttpGet("{id:int}")]
|
[HttpGet("{id:int}")]
|
||||||
public async Task<ActionResult<DeliveryNoteDto>> GetById(int id)
|
public async Task<ActionResult<DeliveryNoteDto>> GetById(int id)
|
||||||
{
|
{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user