From e26df8026e907962e047ce491e79c2c869e03c4f Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 16 Jul 2025 02:39:46 +0400 Subject: [PATCH 1/2] add new Description Option to financialStatment create and edit --- .../FinancialStatmentApplication.cs | 1 + .../InstitutionContract/js/EditTransaction.js | 33 ++++++++++--------- .../js/FinancialStatment.js | 17 +++++----- 3 files changed, 28 insertions(+), 23 deletions(-) diff --git a/CompanyManagment.Application/FinancialStatmentApplication.cs b/CompanyManagment.Application/FinancialStatmentApplication.cs index a4ee6c50..d709c7c4 100644 --- a/CompanyManagment.Application/FinancialStatmentApplication.cs +++ b/CompanyManagment.Application/FinancialStatmentApplication.cs @@ -110,4 +110,5 @@ public class FinancialStatmentApplication : IFinancialStatmentApplication { return _financialStatmentRepository.GetDetailsByContractingPartyId(contractingPartyId); } + } \ No newline at end of file diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/EditTransaction.js b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/EditTransaction.js index 834251b9..1b6b1b5f 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/EditTransaction.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/EditTransaction.js @@ -9,11 +9,13 @@ $(document).ready(function () { - - - + + + - + + + ` ); const creditorOptions = $( @@ -23,10 +25,10 @@ $(document).ready(function () { - - - - + + + + @@ -74,11 +76,12 @@ let debtorOptions = $( - - - + + + - + + ` ); let creditorOptions = $( @@ -88,9 +91,9 @@ let creditorOptions = $( - - - + + + diff --git a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/FinancialStatment.js b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/FinancialStatment.js index 4c22da70..6e427c60 100644 --- a/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/FinancialStatment.js +++ b/ServiceHost/wwwroot/AssetsAdmin/page/InstitutionContract/js/FinancialStatment.js @@ -167,11 +167,12 @@ let debtorOptions = $( - - - + + + - + + ` ); let creditorOptions = $( @@ -181,10 +182,10 @@ let creditorOptions = $( - - - - + + + + From 042530b6e300814655d61cf3fac6c9a135086dd3 Mon Sep 17 00:00:00 2001 From: SamSys Date: Wed, 16 Jul 2025 03:39:33 +0400 Subject: [PATCH 2/2] Create Debt for stand from Excel --- .../IFinancialTransactionRepository.cs | 12 ++++ .../FinancialTransactionRepository.cs | 57 ++++++++++++++++++- 2 files changed, 68 insertions(+), 1 deletion(-) diff --git a/Company.Domain/FinancialTransactionAgg/IFinancialTransactionRepository.cs b/Company.Domain/FinancialTransactionAgg/IFinancialTransactionRepository.cs index 30813b5c..795a531a 100644 --- a/Company.Domain/FinancialTransactionAgg/IFinancialTransactionRepository.cs +++ b/Company.Domain/FinancialTransactionAgg/IFinancialTransactionRepository.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using _0_Framework.Application; using _0_Framework.Domain; using CompanyManagment.App.Contracts.FinancilTransaction; @@ -13,4 +14,15 @@ public interface IFinancialTransactionRepository : IRepository + /// ایجاد بدهی استند حضور غیاب برای اکسل + /// + /// + /// + /// + /// + /// + OperationResult CreateDebtFromExcel(long contractingPartyId, string transactionDate, double debt, + string description); } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/FinancialTransactionRepository.cs b/CompanyManagment.EFCore/Repository/FinancialTransactionRepository.cs index 90643126..2d77a5a4 100644 --- a/CompanyManagment.EFCore/Repository/FinancialTransactionRepository.cs +++ b/CompanyManagment.EFCore/Repository/FinancialTransactionRepository.cs @@ -1,8 +1,12 @@ -using System.Linq; +using System; +using System.Linq; +using System.Threading.Tasks; using _0_Framework.Application; using _0_Framework.InfraStructure; +using Company.Domain.FinancialStatmentAgg; using Company.Domain.FinancialTransactionAgg; using CompanyManagment.App.Contracts.FinancilTransaction; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database; namespace CompanyManagment.EFCore.Repository; @@ -49,4 +53,55 @@ public class FinancialTransactionRepository : RepositoryBase x.id == contractingPartyId); + + if (contractingParty == null) + return op.Failed("طرف حساب وجود ندارد"); + + var activeInstitutionContract = _context.InstitutionContractSet.FirstOrDefault(x => x.ContractingPartyId == contractingPartyId && + x.IsActiveString == "true" && x.ContractStartGr <= now && x.ContractEndGr >= now); + + if (activeInstitutionContract == null) + return op.Failed("قرارداد مالی فعال برای این طرف حساب وجود ندارد"); + + if (debt <= 0) + return op.Failed("مبلغ را وارد کنید"); + + #endregion + + + var descriptionOption = "بابت خرید استند حضور غیاب"; + var financialStatment = _context.FinancialStatments.FirstOrDefault(x => x.ContractingPartyId == contractingPartyId); + if (financialStatment != null) + { + + var transaction = new FinancialTransaction(financialStatment.id, now, now.ToFarsi(), + description, + "debt", descriptionOption, debt, 0, 0); + _context.FinancialTransactions.Add(transaction); + _context.SaveChanges(); + return op.Succcedded(); + } + else + { + var statement = new FinancialStatment(contractingPartyId, activeInstitutionContract.ContractingPartyName); + _context.FinancialStatments.Add(statement); + _context.SaveChanges(); + + var transaction = new FinancialTransaction(statement.id, now, now.ToFarsi(), + description, + "debt", descriptionOption, debt, 0, 0); + _context.FinancialTransactions.Add(transaction); + _context.SaveChanges(); + + return op.Succcedded(); + } + } } \ No newline at end of file