From efd2508f8228305b10e7a0134015d3edb4975353 Mon Sep 17 00:00:00 2001
From: Piotr Dudek <pdudek@dusoft.pl>
Date: Tue, 23 Jul 2024 18:19:46 +0200
Subject: [PATCH] Zwroty + rozb. #2

---
 FKGees/DocsDefinitions/Decrets/Rozb.cs   | 11 ++++++++---
 FKGees/DocsDefinitions/Decrets/Zwroty.cs |  3 ++-
 FKGees/Services/PcmService.cs            | 21 +++++++++++++++++++--
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/FKGees/DocsDefinitions/Decrets/Rozb.cs b/FKGees/DocsDefinitions/Decrets/Rozb.cs
index 73d6c0f..b9904c2 100644
--- a/FKGees/DocsDefinitions/Decrets/Rozb.cs
+++ b/FKGees/DocsDefinitions/Decrets/Rozb.cs
@@ -8,8 +8,12 @@ public class Rozb : IDecretsDefinition
     public string Type => "Rozb";
     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", "MA", "[zbr]"), new Definition("332-0-24", "WN", "[sbr]"), new Definition("343-0-24", "MA", "[svr]"),
+        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", "MA", "[zbr]"),
+        new Definition("332-0-24", "WN", "[sbr]"),
+        new Definition("343-0-24", "MA", "[svr]"),
         new Definition("342-0-24", "MA", "[sbr]-[znr]"),
     ];
     
@@ -29,13 +33,14 @@ public class Rozb : IDecretsDefinition
 
         foreach (var dok in toProcess)
         {
+            var opis = _pcmService.RozbNrFakturyKor(dok.DokId);
             Definitions.ForEach(d =>
             {
                 var item = dok.DecretKontr();
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                //item.Opis = _pcmService.WzNrFaktury(dok.DokId);
+                item.Opis = opis;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Processvalue(dok, d.Expression)
diff --git a/FKGees/DocsDefinitions/Decrets/Zwroty.cs b/FKGees/DocsDefinitions/Decrets/Zwroty.cs
index 30ef61b..11e3fca 100644
--- a/FKGees/DocsDefinitions/Decrets/Zwroty.cs
+++ b/FKGees/DocsDefinitions/Decrets/Zwroty.cs
@@ -33,13 +33,14 @@ public class Zwroty : IDecretsDefinition
 
         foreach (var dok in toProcess)
         {
+            var opis = _pcmService.RozbNrFakturyKor(dok.DokId);
             Definitions.ForEach(d =>
             {
                 var item = dok.DecretKontr();
                 item.Data = dok.DataPom;
                 item.DataWplywu = dok.Data;
                 item.Nr = dok.NrDok;
-                //item.Opis = _pcmService.WzNrFaktury(dok.DokId);
+                item.Opis = opis;
                 item.StronaKonta = d.AccountSide;
                 item.KontoFk = d.Account;
                 item.Kwota = Processvalue(dok, d.Expression)
diff --git a/FKGees/Services/PcmService.cs b/FKGees/Services/PcmService.cs
index e38525d..8839bc7 100644
--- a/FKGees/Services/PcmService.cs
+++ b/FKGees/Services/PcmService.cs
@@ -26,7 +26,9 @@ public class PcmService
             .ThenInclude(x => x.Dok)
             .Include(x => x.DokKasa)
             .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();
         return documents;
     }
@@ -41,7 +43,9 @@ public class PcmService
             .ThenInclude(x => x.Kontr)
             .Include(x => x.TekstDok)
             .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();
         return documents;
     }
@@ -58,6 +62,19 @@ public class PcmService
         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()
     {
         await using var context = await _dbContextFactory.CreateDbContextAsync();