diff --git a/FKGees/DocsDefinitions/Decrets/KpInne.cs b/FKGees/DocsDefinitions/Decrets/KpInne.cs index bca08ac..7b9ef07 100644 --- a/FKGees/DocsDefinitions/Decrets/KpInne.cs +++ b/FKGees/DocsDefinitions/Decrets/KpInne.cs @@ -6,7 +6,7 @@ public class KpInne : IDecretsDefinition public string Type => nameof(KpInne); public List Definitions { get; } = [ - new Definition("139-1-24", "WN", "[sbr]"), + new Definition("139-1-24", "WN", "[sbr]"), new Definition("100-1-24", "WN", "[sbr]") ]; @@ -28,7 +28,7 @@ public class KpInne : IDecretsDefinition Data = dok.DataPom, DataWplywu = dok.Data, Nr = dok.NrDok, - Opis = dok.TekstZaCo(), + Opis = dok.NrDok, StronaKonta = d.AccountSide, KontoFk = d.Account, Kwota = Math.Abs(dok.Zaplacono).AsString() diff --git a/FKGees/DocsDefinitions/Decrets/KpKaucjaZaOpakowania.cs b/FKGees/DocsDefinitions/Decrets/KpKaucjaZaOpakowania.cs index 87bfe57..7114f84 100644 --- a/FKGees/DocsDefinitions/Decrets/KpKaucjaZaOpakowania.cs +++ b/FKGees/DocsDefinitions/Decrets/KpKaucjaZaOpakowania.cs @@ -5,7 +5,7 @@ public class KpKaucjaZaOpakowania : IDecretsDefinition public int DocType => 51; public string Type => nameof(KpKaucjaZaOpakowania); public List Definitions { get; } = [ - new Definition("100-1-24", "WN", "[sbr]"), + new Definition("100-1-24", "WN", "[sbr]"), new Definition("139-1-24", "MA", "[sbr]") ]; @@ -26,7 +26,7 @@ public class KpKaucjaZaOpakowania : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/KpLotto.cs b/FKGees/DocsDefinitions/Decrets/KpLotto.cs index d9bd5c8..c3673eb 100644 --- a/FKGees/DocsDefinitions/Decrets/KpLotto.cs +++ b/FKGees/DocsDefinitions/Decrets/KpLotto.cs @@ -6,7 +6,7 @@ public class KpLotto : IDecretsDefinition public string Type => nameof(KpLotto); public List Definitions { get; } = [ - new Definition("100-1-24", "WN", "[sbr]"), + new Definition("100-1-24", "WN", "[sbr]"), new Definition("249-0-22", "MA", "[sbr]") ]; @@ -28,7 +28,7 @@ public class KpLotto : IDecretsDefinition Data = dok.DataPom, DataWplywu = dok.Data, Nr = dok.NrDok, - Opis = dok.TekstZaCo(), + Opis = dok.NrDok, StronaKonta = d.AccountSide, KontoFk = d.Account, Kwota = Math.Abs(dok.Zaplacono).AsString() diff --git a/FKGees/DocsDefinitions/Decrets/KpPaysafe.cs b/FKGees/DocsDefinitions/Decrets/KpPaysafe.cs index 3540a5c..bce1990 100644 --- a/FKGees/DocsDefinitions/Decrets/KpPaysafe.cs +++ b/FKGees/DocsDefinitions/Decrets/KpPaysafe.cs @@ -6,7 +6,7 @@ public class KpPaysafe : IDecretsDefinition public string Type => nameof(KpPaysafe); public List Definitions { get; } = [ - new Definition("139-1-24", "WN", "[sbr]"), + new Definition("139-1-24", "WN", "[sbr]"), new Definition("100-1-24", "MA", "[sbr]") ]; @@ -28,7 +28,7 @@ public class KpPaysafe : IDecretsDefinition Data = dok.DataPom, DataWplywu = dok.Data, Nr = dok.NrDok, - Opis = dok.TekstZaCo(), + Opis = dok.NrDok, StronaKonta = d.AccountSide, KontoFk = d.Account, Kwota = Math.Abs(dok.Zaplacono).AsString() diff --git a/FKGees/DocsDefinitions/Decrets/KpRachunki.cs b/FKGees/DocsDefinitions/Decrets/KpRachunki.cs index 6fbe0db..b32907c 100644 --- a/FKGees/DocsDefinitions/Decrets/KpRachunki.cs +++ b/FKGees/DocsDefinitions/Decrets/KpRachunki.cs @@ -6,7 +6,7 @@ public class KpRachunki : IDecretsDefinition public string Type => nameof(KpRachunki); public List Definitions { get; } = [ - new Definition("100-1-24", "WN", "[sbr]"), + new Definition("100-1-24", "WN", "[sbr]"), new Definition("249-0-24", "MA", "[sbr]") ]; @@ -28,7 +28,7 @@ public class KpRachunki : IDecretsDefinition Data = dok.DataPom, DataWplywu = dok.Data, Nr = dok.NrDok, - Opis = dok.TekstZaCo(), + Opis = dok.NrDok, StronaKonta = d.AccountSide, KontoFk = d.Account, Kwota = Math.Abs(dok.Zaplacono).AsString() diff --git a/FKGees/DocsDefinitions/Decrets/KwBony.cs b/FKGees/DocsDefinitions/Decrets/KwBony.cs index 033bcaa..fa45662 100644 --- a/FKGees/DocsDefinitions/Decrets/KwBony.cs +++ b/FKGees/DocsDefinitions/Decrets/KwBony.cs @@ -6,10 +6,10 @@ public class KwBony : IDecretsDefinition public string Type => nameof(KwBony); public List Definitions { get; } = [ - new Definition("100-1-24", "MA", "[sbr]"), + new Definition("100-1-24", "MA", "[sbr]"), new Definition("234-0-01", "WN", "[sbr]") ]; - + public Task> Process(IReadOnlyList documents) { var result = new List(); @@ -26,7 +26,7 @@ public class KwBony : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/KwInne.cs b/FKGees/DocsDefinitions/Decrets/KwInne.cs index 8354442..101cf3e 100644 --- a/FKGees/DocsDefinitions/Decrets/KwInne.cs +++ b/FKGees/DocsDefinitions/Decrets/KwInne.cs @@ -6,15 +6,15 @@ public class KwInne : IDecretsDefinition public string Type => nameof(KwInne); public List Definitions { get; } = [ - new Definition("305-60-24", "WN", "[sbr]"), + new Definition("305-60-24", "WN", "[sbr]"), new Definition("100-1-24", "MA", "[sbr]") ]; - + public Task> Process(IReadOnlyList documents) { var result = new List(); - var toProcess = documents.Where(x => x.TypDok == DocType + var toProcess = documents.Where(x => x.TypDok == DocType && x.NrDok.StartsWith("KW") && x.Tekst1() == Constants.KwTekstyDod[nameof(KwInne)]); @@ -26,7 +26,7 @@ public class KwInne : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/KwLotto.cs b/FKGees/DocsDefinitions/Decrets/KwLotto.cs index 0fe6a32..458e6ef 100644 --- a/FKGees/DocsDefinitions/Decrets/KwLotto.cs +++ b/FKGees/DocsDefinitions/Decrets/KwLotto.cs @@ -6,10 +6,10 @@ public class KwLotto : IDecretsDefinition public string Type => nameof(KwLotto); public List Definitions { get; } = [ - new Definition("249-0-22", "WN", "[sbr]"), + new Definition("249-0-22", "WN", "[sbr]"), new Definition("100-1-24", "MA", "[sbr]") ]; - + public Task> Process(IReadOnlyList documents) { var result = new List(); @@ -26,7 +26,7 @@ public class KwLotto : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/KwOpakowania.cs b/FKGees/DocsDefinitions/Decrets/KwOpakowania.cs index 238cffc..90cebf0 100644 --- a/FKGees/DocsDefinitions/Decrets/KwOpakowania.cs +++ b/FKGees/DocsDefinitions/Decrets/KwOpakowania.cs @@ -5,7 +5,7 @@ public class KwOpakowania : IDecretsDefinition public int DocType => 51; public string Type => nameof(KwOpakowania); public List Definitions { get; } = [ - new Definition("139-1-24", "WN", "[sbr]"), + new Definition("139-1-24", "WN", "[sbr]"), new Definition("100-1-24", "MA", "[sbr]") ]; @@ -25,7 +25,7 @@ public class KwOpakowania : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/KwPomylkaKasjera.cs b/FKGees/DocsDefinitions/Decrets/KwPomylkaKasjera.cs index 43c1b21..e82d6b2 100644 --- a/FKGees/DocsDefinitions/Decrets/KwPomylkaKasjera.cs +++ b/FKGees/DocsDefinitions/Decrets/KwPomylkaKasjera.cs @@ -6,15 +6,15 @@ public class KwPomylkaKasjera : IDecretsDefinition public string Type => nameof(KwPomylkaKasjera); public List Definitions { get; } = [ - new Definition("305-60-24", "WN", "[sbr]"), + new Definition("305-60-24", "WN", "[sbr]"), new Definition("100-1-24", "MA", "[sbr]") ]; - + public Task> Process(IReadOnlyList documents) { var result = new List(); - var toProcess = documents.Where(x => x.TypDok == DocType + var toProcess = documents.Where(x => x.TypDok == DocType && x.NrDok.StartsWith("KW") && x.Tekst1() == Constants.KwTekstyDod[nameof(KwPomylkaKasjera)]); @@ -26,7 +26,7 @@ public class KwPomylkaKasjera : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/KwUtarg.cs b/FKGees/DocsDefinitions/Decrets/KwUtarg.cs index c07fb1c..c51904d 100644 --- a/FKGees/DocsDefinitions/Decrets/KwUtarg.cs +++ b/FKGees/DocsDefinitions/Decrets/KwUtarg.cs @@ -6,15 +6,15 @@ public class KwUtarg : IDecretsDefinition public string Type => nameof(KwUtarg); public List Definitions { get; } = [ - new Definition("139-0-01", "WN", "[sbr]"), + new Definition("139-0-01", "WN", "[sbr]"), new Definition("100-1-24", "MA", "[sbr]") ]; - + public Task> Process(IReadOnlyList documents) { var result = new List(); - var toProcess = documents.Where(x => x.TypDok == DocType + var toProcess = documents.Where(x => x.TypDok == DocType && x.NrDok.StartsWith("KW") && x.Tekst1() == Constants.KwTekstyDod[nameof(KwUtarg)]); @@ -26,7 +26,7 @@ public class KwUtarg : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Math.Abs(dok.Zaplacono).AsString(); diff --git a/FKGees/DocsDefinitions/Decrets/Przecena.cs b/FKGees/DocsDefinitions/Decrets/Przecena.cs index c847277..5a0d945 100644 --- a/FKGees/DocsDefinitions/Decrets/Przecena.cs +++ b/FKGees/DocsDefinitions/Decrets/Przecena.cs @@ -5,9 +5,9 @@ public class Przecena : IDecretsDefinition public int DocType => 18; public string Type => "Pc"; public List Definitions { get; } = - [ + [ new Definition("342-0-24", "MA", "[snr]-[znr]"), - new Definition("343-0-24", "MA", "[sbr]-[snr]"), + new Definition("343-0-24", "MA", "[sbr]-[snr]"), new Definition("332-0-24", "WN", "[sbr]") ]; @@ -26,11 +26,11 @@ public class Przecena : IDecretsDefinition item.Data = dok.DataPom; item.DataWplywu = dok.Data; item.Nr = dok.NrDok; - item.Opis = dok.TekstZaCo(); + item.Opis = dok.NrDok; item.StronaKonta = d.AccountSide; item.KontoFk = d.Account; item.Kwota = Processvalue(dok, d.Expression).AsString(); - + result.Add(item); }); }