mmr/moadiran
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
mmrbnjd
2024-05-17 23:05:46 +03:30
parent 3ca7f9deb0
commit 5dac5f70f2
7 changed files with 231 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Back/Controllers/InvoiceController.cs
View File

@@ -26,7 +26,7 @@ namespace Back.Controllers
}
[HttpPost("GetAll")]
public async Task<ActionResult<PagingDto<InvoiceDTO>?>> GetAll([FromBody] ItemSerchGetInvoices itemSerch)
public async Task<ActionResult<PagingDto<InvoiceGridDTO>?>> GetAll([FromBody] ItemSerchGetInvoices itemSerch)
{
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
@@ -34,6 +34,16 @@ namespace Back.Controllers
return Ok(await _servInvoice.GetInvoices(user.RolUsers.First().CompanyID, itemSerch));
}
[HttpGet("Get/{ID}")]
public async Task<ActionResult<PagingDto<InvoiceGridDTO>?>> GetAll(int ID)
{
var claim = HttpContext.User.Claims.First(c => c.Type == "UserID");
var UserID = claim.Value;
var user = await _servUser.GetUserByUserID(Convert.ToInt32(UserID));
return Ok(await _servInvoice.GetInvoice(user.RolUsers.First().CompanyID, ID));
}
[HttpPost("Add")]
public async Task<ActionResult<int>> Add([FromBody] NUInvoiceDTO item)

58
Back/Services/servInvoice.cs
View File

@@ -20,25 +20,12 @@ namespace Back.Services
_checkPermission = checkPermission;
}
public async Task<PagingDto<InvoiceDTO>?> GetInvoices(int CompanyID, ItemSerchGetInvoices itemSerch)
public async Task<InvoiceDTO> GetInvoice(int CompanyID, int ID)
{
#region AdvancedSearch
var invok = _invoiceRepo
.Get(w => w.CompanyID == CompanyID && !w.IsDeleted);
.Get(w => w.CompanyID == CompanyID && !w.IsDeleted && w.ID==ID);
if (itemSerch.InvoiceID != null)
invok = invok.Where(w => w.ID == itemSerch.InvoiceID);
if (itemSerch.CustomerID != null)
invok = invok.Where(w => w.CustomerID == itemSerch.CustomerID);
if (itemSerch.invoiceType != null)
invok = invok.Where(w => w.invoiceType == itemSerch.invoiceType);
if (itemSerch.Title != null)
invok = invok.Where(w => w.Title.Contains(itemSerch.Title));
//foreach (InputObj item in inputObjs)
// invok = invok.Where(ExMethod.GetFunc<Customer>(item.Param, item.Value));
#endregion
//-----------------------
@@ -93,6 +80,47 @@ namespace Back.Services
trn = x.acn
}).ToList(),
})
.FirstOrDefaultAsync();
}
public async Task<PagingDto<InvoiceGridDTO>?> GetInvoices(int CompanyID, ItemSerchGetInvoices itemSerch)
{
#region AdvancedSearch
var invok = _invoiceRepo
.Get(w => w.CompanyID == CompanyID && !w.IsDeleted);
if (itemSerch.InvoiceID != null)
invok = invok.Where(w => w.ID == itemSerch.InvoiceID);
if (itemSerch.CustomerID != null)
invok = invok.Where(w => w.CustomerID == itemSerch.CustomerID);
if (itemSerch.invoiceType != null)
invok = invok.Where(w => w.invoiceType == itemSerch.invoiceType);
if (itemSerch.Title != null)
invok = invok.Where(w => w.Title.Contains(itemSerch.Title));
//foreach (InputObj item in inputObjs)
// invok = invok.Where(ExMethod.GetFunc<Customer>(item.Param, item.Value));
#endregion
//-----------------------
return await invok
.Include(inc => inc.invoiceDetails)
.Include(inc => inc.payments)
.Include(inc => inc.pattern)
.Select(s => new InvoiceGridDTO()
{
CustomerID = s.CustomerID,
CustomerName = s.Customer.FullName,
ID = s.ID,
invoiceTypeTitle = s.invoiceType.GetEnumDisplayName(),
Title = s.Title,
InvoicIssueDate = s.InvoicIssueDate.ShamciToFormatShamci(),
tbill = s.tbill,
tdis = s.tdis,
tvam = s.tvam,
Udate = s.Udate.ShamciToFormatShamci(),
})
.Paging(itemSerch.PageIndex, itemSerch.PageSize);
}
public async Task<bool> ExistInvoiceByInvoiceID(int CompanyID, int InvoiceID)