From 494e4c2f509e8f56ec9e1d48269248d51caa0b81 Mon Sep 17 00:00:00 2001 From: gongpei Date: Tue, 14 Oct 2025 17:26:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=B8=8D=E8=83=BD=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=88=90=E4=BA=A4=E6=94=B6=E7=9B=8A=E7=8E=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/SwapModule/SwapTradeService.cs | 2 ++ YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx | Bin 18140 -> 18358 bytes YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml | 4 ++++ YLErpWeb/Views/SwapTrade2/TradeView.cshtml | 2 +- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/YLErpDAL/Modules/SwapModule/SwapTradeService.cs b/YLErpDAL/Modules/SwapModule/SwapTradeService.cs index e2d6fc5e..b04c8b49 100644 --- a/YLErpDAL/Modules/SwapModule/SwapTradeService.cs +++ b/YLErpDAL/Modules/SwapModule/SwapTradeService.cs @@ -579,6 +579,7 @@ namespace YLErp.Modules.SwapModule dbTrade.trade_extend = req.trade_extend; dbTrade.swap_positions = req.swap_positions; dbTrade.MetaDic = req.MetaDic; + dbTrade.InitYtm = req.swap_positions.FirstOrDefault(p => p.InitYtm > 0)?.InitYtm ?? 0m; InnerSaveTrade(false, dbTrade, changsStr, changeConfirmStatus); return dbTrade; @@ -1380,6 +1381,7 @@ namespace YLErp.Modules.SwapModule position.FloatRateUnderlyingCode = swap.FloatRateUnderlyingCode; position.interest_rest_days = swap.interest_rest_days; position.interest_rule = swap.interest_rule; + position.InitYtm = swap.InitYtm; if (position.id == 0) { DbContext.swap_position.Add(position); diff --git a/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx b/YLErpWeb/App_Docs/导出模板/结算报告模板.xlsx index 94662a2f96dcb6ca0d9c5d2a4fa9ac4d7b1de706..ce65897f23e66938d54bfe4ccda2436951b7186f 100644 GIT binary patch delta 10954 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 delta 10738 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 diff --git a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml index 51641ed9..b991654a 100644 --- a/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml +++ b/YLErpWeb/Views/SwapTrade2/TradeEdit.cshtml @@ -396,6 +396,7 @@ 标的代码 期初标的交割全价% 期初标的交割净价% + 期初标的成交收益率% 数量 交易费用后付 @@ -425,6 +426,9 @@ + + + {{item.underlying!=null?item.underlying.QuoteUnitString:''}} diff --git a/YLErpWeb/Views/SwapTrade2/TradeView.cshtml b/YLErpWeb/Views/SwapTrade2/TradeView.cshtml index 0e737aae..6e68cac3 100644 --- a/YLErpWeb/Views/SwapTrade2/TradeView.cshtml +++ b/YLErpWeb/Views/SwapTrade2/TradeView.cshtml @@ -384,7 +384,7 @@ @(((item.PosiNetNoFeePrice ?? 0) * multiplier).OtcFormat(OtcFormatFlag.umprice)) - @((item.InitYtm * multiplier).OtcFormat(OtcFormatFlag.marginRateP)) + @((item.InitYtm * multiplier).OtcFormat(OtcFormatFlag.umprice)) @item.PosiQuantity.OtcFormat(OtcFormatFlag.StockEqvNotional)