This commit is contained in:
mmrbnjd
2024-05-30 15:08:36 +03:30
parent 85a72bc1ad
commit 579ccf78d6
15 changed files with 1182 additions and 179 deletions

View File

@@ -20,12 +20,17 @@ namespace Back.Services
_checkPermission = checkPermission;
}
public async Task<InvoiceDTO> GetInvoice(int CompanyID, int ID)
public async Task<InvoiceDTO?> GetInvoice(int CompanyID, int ID, bool notloaddelete = true)
{
#region AdvancedSearch
var invok = _invoiceRepo
.Get(w => w.CompanyID == CompanyID && !w.IsDeleted && w.ID == ID);
.Get(w => w.CompanyID == CompanyID && w.ID == ID);
if (notloaddelete)
{
invok = invok
.Where(w => !w.IsDeleted);
}
#endregion
//-----------------------
@@ -37,7 +42,7 @@ namespace Back.Services
//.Include(inc => inc.pattern)
.Select(s => new InvoiceDTO()
{
IsDeleted=s.IsDeleted,
PatternID = s.PatternID,
PatternTitle = s.pattern.Title,
CustomerID = s.CustomerID,
@@ -92,7 +97,7 @@ namespace Back.Services
{
#region AdvancedSearch
var invok = _invoiceRepo
.Get(w => w.CompanyID == CompanyID && !w.IsDeleted && !w.BillReference.HasValue);
.Get(w => w.CompanyID == CompanyID && !w.IsDeleted/* && !w.BillReference.HasValue*/);
if (itemSerch.InvoiceID != null)
invok = invok.Where(w => w.ID == itemSerch.InvoiceID);
@@ -105,6 +110,9 @@ namespace Back.Services
if (itemSerch.Title != null)
invok = invok.Where(w => w.Title.Contains(itemSerch.Title));
if (itemSerch.refInvoiceID != null)
invok = invok.Where(w => w.BillReference==itemSerch.refInvoiceID);
//foreach (InputObj item in inputObjs)
// invok = invok.Where(ExMethod.GetFunc<Customer>(item.Param, item.Value));
@@ -118,7 +126,7 @@ namespace Back.Services
//.Include(inc => inc.pattern)
.Select(s => new InvoiceGridDTO()
{
CustomerID = s.CustomerID,
CustomerName = s.Customer.FullName,
ID = s.ID,
@@ -129,7 +137,7 @@ namespace Back.Services
tdis = s.tdis,
tvam = s.tvam,
Udate = s.Udate.ShamciToFormatShamci(),
BillReference = s.BillReference
})
.Paging(itemSerch.PageIndex, itemSerch.PageSize);
}
@@ -137,6 +145,11 @@ namespace Back.Services
{
return await _invoiceRepo.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();
}
public async Task<bool> checkFatherInvoiceByInvoiceID(int CompanyID, int InvoiceID)
{
return await _invoiceRepo.Get(w => w.BillReference == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted).AnyAsync();
}
public async Task<int> AddInvoice(Invoice invoice, bool calculate = true)
{
@@ -147,16 +160,34 @@ namespace Back.Services
{
if (await _checkPermission.ExtensionofAccess(invoice.CompanyID.Value, 3, "-1"))
{
var item = await _invoiceRepo.AddAsync(invoice);
return item.ID;
try
{
var item = await _invoiceRepo.AddAsync(invoice);
return item.ID;
}
catch (Exception ex )
{
return -1;
}
}
return -1;
}
else
{
var item = await _invoiceRepo.AddAsync(invoice);
return item.ID;
try
{
var item = await _invoiceRepo.AddAsync(invoice);
return item.ID;
}
catch (Exception ex)
{
return -1;
}
}
}
@@ -172,6 +203,7 @@ namespace Back.Services
{
return await _invoiceRepo
.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted)
.Include(inc=>inc.invoiceDetails)
.FirstOrDefaultAsync();
}
public async Task<bool> DeleteInvoice(Invoice item)