This commit is contained in:
mmrbnjd
2024-07-22 22:29:28 +03:30
parent f88a935418
commit 87aee3685b
8 changed files with 64 additions and 15 deletions

View File

@@ -223,7 +223,12 @@ namespace Back.Services
{
return await _invoiceRepo
.Get(w => w.ID == InvoiceID && w.CompanyID == CompanyID && !w.IsDeleted)
.Include(inc => inc.invoiceDetails)
.Include(inc => inc.invoiceDetails)
.ThenInclude(inc => inc.cODItem)
.ThenInclude(inc => inc.CODUnit)
.Include(inc => inc.Customer)
.Include(inc => inc.sentTax)
.Include(inc => inc.pattern)
.FirstOrDefaultAsync();
}
public async Task<bool> DeleteInvoice(Invoice item)

View File

@@ -130,14 +130,15 @@ namespace Back.Services
}).ToListAsync();
foreach (var invoicedetail in InvoiceItem.invoiceDetails)
{
foreach (_TaxPayer.Fild item in body)
var Bmodel = body.Clone();
foreach (_TaxPayer.Fild item in Bmodel)
{
var resval = invoicedetail.GetType().GetProperties().Where(w => w.Name == item.eName).Select(s => s.GetValue(invoicedetail)).FirstOrDefault();
item.Value = resval == null ? "" : resval.ToString().Split('.').Length == 2 ? ((decimal)resval).ToString("N0") : resval.ToString();
item.DefVals = item.InputBox == "fromdb" ? _codingRepo.Get(w => w.FildID == item.FildID).Select(ss => new _TaxPayer.Coding() { ID = ss.Code, Name = ss.Title }).ToList() : new List<_TaxPayer.Coding>();
item.Des = item.ModeID == 3 ? _specialConditionRepo.Get(w => w.FildID == item.FildID).Select(ss => ss.condition).ToArray() : null;
}
ret.Bodys.Add(new _TaxPayer.Filds() { ID = invoicedetail.ID, filds = body });
ret.Bodys.Add(new _TaxPayer.Filds() { ID = invoicedetail.ID, filds = Bmodel });
}
//-----------------payment
var pay = await invok.Where(w => w.Fild.Title == "P").Select(s => new _TaxPayer.Fild()