From 42ce2a29e7f0bf6977458e4060a898a13b7a8200 Mon Sep 17 00:00:00 2001 From: mmrbnjd Date: Fri, 9 Aug 2024 23:20:25 +0330 Subject: [PATCH] ... --- .../Persistence/SqlDbContext.cs | 1 - Back/Data/Models/Condition.cs | 16 --------- Back/Data/Models/Fild.cs | 1 - Back/Data/Models/InvoiceItem.cs | 7 +++- Back/Services/servTaxPayer.cs | 15 +++----- .../Pages/UserPanel/TaxPayerInvoiceItem.razor | 35 ++++++++++--------- 6 files changed, 29 insertions(+), 46 deletions(-) delete mode 100644 Back/Data/Models/Condition.cs diff --git a/Back/Data/Infrastructure/Persistence/SqlDbContext.cs b/Back/Data/Infrastructure/Persistence/SqlDbContext.cs index a0c8b93..6776274 100644 --- a/Back/Data/Infrastructure/Persistence/SqlDbContext.cs +++ b/Back/Data/Infrastructure/Persistence/SqlDbContext.cs @@ -50,7 +50,6 @@ namespace TaxPayer.Infrastructure.Persistence public DbSet Promotions { get; set; } public DbSet PromotionDetails { get; set; } public DbSet CreditDocuments { get; set; } - public DbSet Conditions { get; set; } #endregion //public override Task SaveChangesAsync(CancellationToken cancellationToken = new CancellationToken()) //{ diff --git a/Back/Data/Models/Condition.cs b/Back/Data/Models/Condition.cs deleted file mode 100644 index e02f182..0000000 --- a/Back/Data/Models/Condition.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel.DataAnnotations.Schema; - -namespace Back.Data.Models -{ - public class Condition - { - public int ID { get; set; } - public int fildID { get; set; } - public string condition { get; set; } - - - //----------nav - [ForeignKey("fildID")] - public Fild fild { get; set; } - } -} diff --git a/Back/Data/Models/Fild.cs b/Back/Data/Models/Fild.cs index 14bfa34..139d6c4 100644 --- a/Back/Data/Models/Fild.cs +++ b/Back/Data/Models/Fild.cs @@ -16,7 +16,6 @@ namespace Back.Data.Models #region Navigation public virtual ICollection FildModeInPatterns { get; set; } public virtual ICollection Codings { get; set; } - public virtual ICollection Conditions { get; set; } [NotMapped] public ICollection specialConditions { get; set; } #endregion diff --git a/Back/Data/Models/InvoiceItem.cs b/Back/Data/Models/InvoiceItem.cs index 5413aba..33034cc 100644 --- a/Back/Data/Models/InvoiceItem.cs +++ b/Back/Data/Models/InvoiceItem.cs @@ -1,5 +1,6 @@ using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; +using System.Reflection.Metadata.Ecma335; namespace Back.Data.Models { @@ -25,7 +26,10 @@ namespace Back.Data.Models public string? mu { get { return cODItem != null ? cODItem.CODUnit.UnitTaxID : null; } } //میزان ارز [MaxLength(18)] - public decimal? cfee { get { return exr==null || exr==0 ? null : fee / exr; } } + public decimal? cfee { get { return + invoice?.pattern?.inp == 2 ? _cfee + : invoice?.pattern?.inp == 1 && exr != null && exr != 0 ? fee / exr + : null ; } } //مبلغ مالیات بر ارزش افزوده [MaxLength(18)] public decimal? vam { get @@ -128,6 +132,7 @@ namespace Back.Data.Models //شناسه یکتای ثبت قرارداد حق العمل کاری [MaxLength(12)] public string? bsrn { get; set; } + public decimal? _cfee { get; set; } #endregion #region Navigation diff --git a/Back/Services/servTaxPayer.cs b/Back/Services/servTaxPayer.cs index d60e41d..e470134 100644 --- a/Back/Services/servTaxPayer.cs +++ b/Back/Services/servTaxPayer.cs @@ -111,7 +111,7 @@ namespace Back.Services var head = await invok.Where(w => w.Fild.Title == "H").Select(s => new _TaxPayer.Fild() { FildID = s.FildID, - eName = s.Fild.Name == "indatim" ? "InvoicIssueDate" : s.Fild.Name == "Indati2m" ? "InvoiceDate" : s.Fild.Name == "cdcd" ? "CottageDateOfCustomsDeclaration" : s.Fild.Name, + eName = s.Fild.Name == "indatim" ? "InvoicIssueDate" : s.Fild.Name == "Indati2m" ? "InvoiceDate" : s.Fild.Name == "cdcd" ? "CottageDateOfCustomsDeclaration" : s.Fild.Name, fName = s.Fild.Type, ModeID = s.FildModeID, ModeTitle = s.FildMode.Title, @@ -131,7 +131,7 @@ namespace Back.Services var body = await invok.Where(w => w.Fild.Title == "B").Select(s => new _TaxPayer.Fild() { FildID = s.FildID, - eName = s.Fild.Name, + eName = s.Fild.Name == "cfee" ? "_cfee" : s.Fild.Name, fName = s.Fild.Type, ModeID = s.FildModeID, ModeTitle = s.FildMode.Title, @@ -144,17 +144,12 @@ namespace Back.Services var Bmodel = body.Clone(); foreach (_TaxPayer.Fild item in Bmodel) { - if (item.InputBox=="") - { - - } - else - { + 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; - } + } @@ -197,7 +192,7 @@ namespace Back.Services } // سریال صورتحساب - var innoS=await _invoiceRepo.Get(w => w.CompanyID == InvoiceItem.CompanyID).Select(s => s.inno).ToListAsync(); + var innoS=await _invoiceRepo.Get(w => w.CompanyID == InvoiceItem.CompanyID && !string.IsNullOrEmpty(w.inno)).Select(s => s.inno).ToListAsync(); var result = Enumerable.Range(1, 1000000000) .Except(innoS.Select(t => t).ToList().Select(int.Parse).ToList()).FirstOrDefault(); InvoiceItem.inno = result.ToString("0000000000"); diff --git a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor index 6c6093c..5eadeae 100644 --- a/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor +++ b/TaxPayerFull/Pages/UserPanel/TaxPayerInvoiceItem.razor @@ -127,33 +127,36 @@ else if (item.eName.ToLower() == "inty") { var bill = BillTypes.Where(w => w.ID == Convert.ToInt32(item.Value)).Select(s => s.Title).FirstOrDefault(); - if (bill != null) - { - item.Value = bill; - } + + + } else if (item.eName.ToLower() == "inp") { - var patt = Patterns.Where(w => w.ID == Convert.ToInt32(item.Value)).Select(s => s.Title).FirstOrDefault(); - if (patt != null) - { - item.Value = patt; - } + patt=item.Value; + var _patt = Patterns.Where(w => w.ID == Convert.ToInt32(item.Value)).Select(s => s.Title).FirstOrDefault(); + + } else if (item.eName.ToLower() == "ins") { InvoiceType foo = (InvoiceType)Enum.Parse(typeof(InvoiceType), item.Value); - item.Value = foo.GetEnumDisplayName(); + + } else if (item.eName.ToLower() == "tob") { CustomerType foo = (CustomerType)Enum.Parse(typeof(CustomerType), item.Value); - item.Value = foo.GetEnumDisplayName(); - + + + } + else + { + + } - @@ -244,12 +247,9 @@ else } - else if (itemB.InputBox == "autofild") + else if (itemB.InputBox == "autofild" || (itemB.eName.ToLower() == "_cfee" && patt != "2")) { - - - } else { @@ -307,6 +307,7 @@ else @code { + string patt = ""; private List>? Patterns = new List>(); private List>? BillTypes = new List>(); private Modal modal = default!;