Jaymr/zszq-trs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'glms/feature/1.4.2' into glms/feature/0812_zmr_divPower

Browse Source 
# Conflicts:
#	YLErpDAL/Modules/EodModule/BondPaymentService.cs
#	YLErpDAL/Modules/SwapModule/SwapDealService.cs
This commit is contained in:
张名锐
2026-08-20 16:21:13 +08:00
parent ff7e540084 286a834aa5
commit 582cb2c7c5
158 changed files with 7931 additions and 3252 deletions
Download Patch File Download Diff File Expand all files Collapse all files
YLErpDAL/Modules/TradeModule/DocGenerateModule/ConfirmationGenerateContext.cs
+2 -1
View File
@@ -34,6 +34,7 @@ using YLErp.Office.Converters;
using YLErp.Plugins.TradeDocGenerator;
using YLErp.Plugins.TradeDocGenerator.Abstracts;
using YLErp.QdpModule;
using YLErp.Modules.SwapModule;
namespace YLErp.Modules.TradeModule.DocGenerateModule
{
@@ -2864,7 +2865,7 @@ namespace YLErp.Modules.TradeModule.DocGenerateModule
}
public List<eod_swap_position> GetEodPositions(int tradeId, DateTime valueDate)
{
return DbContext.eod_swap_position.Where(x => x.SwapTradeId == tradeId && !x.Invalid && x.ValueDate == valueDate).AsNoTracking().ToList();
return DbContext.eod_swap_position.ActiveByTradeAndDate(tradeId, valueDate).AsNoTracking().ToList();
}
public List<SwapFlowDeal> GetSwapFlowDeals(int tradeId)