pdudek/FKGees
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Zwroty + rozb. #2

Browse Source
This commit is contained in:
Piotr Dudek 2024-07-23 18:19:46 +02:00
parent 9dfaad971c
commit efd2508f82
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
FKGees/DocsDefinitions/Decrets/Rozb.cs
View File

@ -8,8 +8,12 @@ public class Rozb : IDecretsDefinition
public string Type => "Rozb"; public string Type => "Rozb";
public List<Definition> Definitions { get; } = public List<Definition> Definitions { get; } =
[ [
new Definition("301-0-24", "WN", "[znr]"), new Definition("221-0-24", "WN", "[zvr]"), new Definition("210-1", "MA", "[zbr]"), new Definition("301-0-24", "WN", "[znr]"),
new Definition("301-0-24", "MA", "[zbr]"), new Definition("332-0-24", "WN", "[sbr]"), new Definition("343-0-24", "MA", "[svr]"), new Definition("221-0-24", "WN", "[zvr]"),
new Definition("210-1", "MA", "[zbr]"),
new Definition("301-0-24", "MA", "[zbr]"),
new Definition("332-0-24", "WN", "[sbr]"),
new Definition("343-0-24", "MA", "[svr]"),
new Definition("342-0-24", "MA", "[sbr]-[znr]"), new Definition("342-0-24", "MA", "[sbr]-[znr]"),
]; ];
@ -29,13 +33,14 @@ public class Rozb : IDecretsDefinition
foreach (var dok in toProcess) foreach (var dok in toProcess)
{ {
var opis = _pcmService.RozbNrFakturyKor(dok.DokId);
Definitions.ForEach(d => Definitions.ForEach(d =>
{ {
var item = dok.DecretKontr(); var item = dok.DecretKontr();
item.Data = dok.DataPom; item.Data = dok.DataPom;
item.DataWplywu = dok.Data; item.DataWplywu = dok.Data;
item.Nr = dok.NrDok; item.Nr = dok.NrDok;
//item.Opis = _pcmService.WzNrFaktury(dok.DokId); item.Opis = opis;
item.StronaKonta = d.AccountSide; item.StronaKonta = d.AccountSide;
item.KontoFk = d.Account; item.KontoFk = d.Account;
item.Kwota = Processvalue(dok, d.Expression) item.Kwota = Processvalue(dok, d.Expression)

3
FKGees/DocsDefinitions/Decrets/Zwroty.cs
View File

@ -33,13 +33,14 @@ public class Zwroty : IDecretsDefinition
foreach (var dok in toProcess) foreach (var dok in toProcess)
{ {
var opis = _pcmService.RozbNrFakturyKor(dok.DokId);
Definitions.ForEach(d => Definitions.ForEach(d =>
{ {
var item = dok.DecretKontr(); var item = dok.DecretKontr();
item.Data = dok.DataPom; item.Data = dok.DataPom;
item.DataWplywu = dok.Data; item.DataWplywu = dok.Data;
item.Nr = dok.NrDok; item.Nr = dok.NrDok;
//item.Opis = _pcmService.WzNrFaktury(dok.DokId); item.Opis = opis;
item.StronaKonta = d.AccountSide; item.StronaKonta = d.AccountSide;
item.KontoFk = d.Account; item.KontoFk = d.Account;
item.Kwota = Processvalue(dok, d.Expression) item.Kwota = Processvalue(dok, d.Expression)

21
FKGees/Services/PcmService.cs
View File

@ -26,7 +26,9 @@ public class PcmService
.ThenInclude(x => x.Dok) .ThenInclude(x => x.Dok)
.Include(x => x.DokKasa) .Include(x => x.DokKasa)
.ThenInclude(x => x.Kasa) .ThenInclude(x => x.Kasa)
.Where(x => typdok.Contains(x.TypDok) && x.Data >= dataOd && x.Data <= dataDo) .Where(x => typdok.Contains(x.TypDok)
&& x.Data >= dataOd && x.Data <= dataDo
&& x.Aktywny == 1)
.ToListAsync(); .ToListAsync();
return documents; return documents;
} }
@ -41,7 +43,9 @@ public class PcmService
.ThenInclude(x => x.Kontr) .ThenInclude(x => x.Kontr)
.Include(x => x.TekstDok) .Include(x => x.TekstDok)
.Include(x => x.RozbicieDok) .Include(x => x.RozbicieDok)
.Where(x => typdok.Contains(x.TypDok) && x.Data >= dataOd && x.Data <= dataDo) .Where(x => typdok.Contains(x.TypDok)
&& x.Data >= dataOd && x.Data <= dataDo
&& x.Aktywny == 1)
.ToListAsync(); .ToListAsync();
return documents; return documents;
} }
@ -58,6 +62,19 @@ public class PcmService
return dok?.RozliczanyDok.NrDok ?? string.Empty; return dok?.RozliczanyDok.NrDok ?? string.Empty;
} }
public string RozbNrFakturyKor(decimal dokId)
{
using var context = _dbContextFactory.CreateDbContext();
context.ChangeTracker.QueryTrackingBehavior = QueryTrackingBehavior.NoTracking;
var dok = context.Rozlicza
.Where(x => x.RozliczanyDokId == dokId)
.Include(x => x.Dok)
.FirstOrDefault();
return dok?.Dok.NrDok ?? string.Empty;
}
public async Task<List<FormaPlatnosci>> FormyPlatnosci() public async Task<List<FormaPlatnosci>> FormyPlatnosci()
{ {
await using var context = await _dbContextFactory.CreateDbContextAsync(); await using var context = await _dbContextFactory.CreateDbContextAsync();