diff --git a/FKGees/Context.cs b/FKGees/Context.cs index 1141731..23c5d67 100644 --- a/FKGees/Context.cs +++ b/FKGees/Context.cs @@ -3,8 +3,8 @@ public class Context { public string SymbolMag { get; set; } - public DateTime StatDate { get; set; } = DateTime.Today - TimeSpan.FromDays(1000); - public DateTime EndDate { get; set; } = DateTime.Today.Add(TimeSpan.FromDays(1)); + public DateTime StatDate { get; set; } = DateTime.Today - TimeSpan.FromDays(1); + public DateTime EndDate { get; set; } = DateTime.Today - TimeSpan.FromSeconds(1); public List PaymentForms { get; set; } = new(); public string RegistersFileName { get; set; } public string DecretsFileName { get; set; } diff --git a/FKGees/DocsDefinitions/Registers/Fa.cs b/FKGees/DocsDefinitions/Registers/Fa.cs index 960720b..94a3ebe 100644 --- a/FKGees/DocsDefinitions/Registers/Fa.cs +++ b/FKGees/DocsDefinitions/Registers/Fa.cs @@ -83,7 +83,8 @@ public class Fa : IRegistersDefinition item.zb5 = ((dok.Rozbicie(500)?.NettoMag ?? 0) + (dok.Rozbicie(500)?.PodatekMag ?? 0)).AsString(); item.zb3 = ((dok.Rozbicie(300)?.NettoMag ?? 0) + (dok.Rozbicie(300)?.PodatekMag ?? 0)).AsString(); item.zbr = dok.RozbicieDok.Sum(x => x.PodatekMag ?? 0 + x.NettoMag ?? 0).AsString(); - + item.NrKsef = item.NrKsef = dok.TekstDok.FirstOrDefault(x => x.Znaczenie == 311) + ?.Tekst ?? string.Empty; result.Add(item); } diff --git a/FKGees/DocsDefinitions/Registers/Fz.cs b/FKGees/DocsDefinitions/Registers/Fz.cs index f99664b..f420745 100644 --- a/FKGees/DocsDefinitions/Registers/Fz.cs +++ b/FKGees/DocsDefinitions/Registers/Fz.cs @@ -81,6 +81,8 @@ public class Fz : IRegistersDefinition item.zb5 = ((dok.Rozbicie(500)?.Netto ?? 0) + (dok.Rozbicie(500)?.Podatek ?? 0)).AsString(); item.zb3 = ((dok.Rozbicie(300)?.Netto ?? 0) + (dok.Rozbicie(300)?.Podatek ?? 0)).AsString(); item.zbr = dok.RozbicieDok.Sum(x => x.Podatek + x.Netto).AsString(); + item.NrKsef = item.NrKsef = dok.TekstDok.FirstOrDefault(x => x.Znaczenie == 311) + ?.Tekst ?? string.Empty; result.Add(item); } diff --git a/FKGees/Models/RegistersResult.cs b/FKGees/Models/RegistersResult.cs index ca47bb0..4cc6ea9 100644 --- a/FKGees/Models/RegistersResult.cs +++ b/FKGees/Models/RegistersResult.cs @@ -73,5 +73,6 @@ public class RegistersResult public string zb5 { get; set; } = string.Empty; public string zb3 { get; set; } = string.Empty; public string zbr { get; set; } = string.Empty; - + public string NrKsef { get; set; } = string.Empty; + } \ No newline at end of file