From 68766485c0a6f7507a84cc3b64f5bf76bcf21e3a Mon Sep 17 00:00:00 2001 From: xiaqingwen Date: Wed, 19 Jun 2024 15:12:07 +0800 Subject: [PATCH] =?UTF-8?q?#TRS-ZS-142=20=E6=8A=A5=E9=80=81=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E5=AD=97=E6=AE=B5=E5=A1=AB=E5=86=99=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=80=BC=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Framework/YLErp.Core/DBModels/Consts/ConsReport.cs | 2 +- .../TradeModule/DealModule/TradeConfirmService.cs | 11 ++++++----- YLErpWeb/Controllers/tradeController.cs | 14 +++++++++++++- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs b/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs index 1e5559e7..e0ada4a3 100644 --- a/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs +++ b/Framework/YLErp.Core/DBModels/Consts/ConsReport.cs @@ -1646,7 +1646,7 @@ namespace YLErp.DBModels.Consts { _performanceCollRangeMapDisplay = new ExpandoDictionary(new Dictionary() { - {"仅本笔交易","0"}, + {"仅限本笔交易","0"}, {"本笔交易对应主协议框架下的所有交易(在附件中上传履约担保协议)","1"}, {"其他情况下多笔交易(在附件中上传履约担保协议)","2"}, }); diff --git a/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs b/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs index 28490f99..6a47e59b 100644 --- a/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs +++ b/YLErpDAL/Modules/TradeModule/DealModule/TradeConfirmService.cs @@ -401,14 +401,15 @@ namespace YLErp.Modules.TradeModule.DealModule trade_Report.FillingPartyRole = td.OpponentRole == "乙方" ? "甲方" : "乙方"; trade_Report.PerformanceGuarantee = "部分担保"; trade_Report.PerformanceCollProvider = marginDiretion==(int)SwapDirectionEnum.收取? "乙方" : "甲方"; - trade_Report.IsUsePerformanceColl = "是"; - trade_Report.PerformanceExplain = "以交易确认书约定为准"; + trade_Report.IsUsePerformanceColl = "否"; + trade_Report.PerformanceExplain = "详见交易确认书。"; trade_Report.IsPerformanceCollInterest = "否"; trade_Report.PerformanceCollType = "现金"; - trade_Report.PerformanceCollRange = "仅本笔交易"; - trade_Report.RecoveryPerformanceColl = 2; + trade_Report.PerformanceCollRange = "仅限本笔交易"; + trade_Report.InitialPerformanceColl = 5; + trade_Report.RecoveryPerformanceColl = 5; trade_Report.UnwindPerformanceColl = 10; - trade_Report.EodPerformanceColl = 2; + trade_Report.EodPerformanceColl = 5; trade_Report.SetOpt(OptUser); var tradeauditing = new TradeAuditLog { diff --git a/YLErpWeb/Controllers/tradeController.cs b/YLErpWeb/Controllers/tradeController.cs index 144a2320..8016beca 100644 --- a/YLErpWeb/Controllers/tradeController.cs +++ b/YLErpWeb/Controllers/tradeController.cs @@ -8879,8 +8879,20 @@ namespace YLErp.Web.Controllers isreport = yldb.sac_report_notes.Where(O => O.InfoTag.Contains(infoTag)).Any(); if (isreport == true) break; } - + ViewBag.isreport = isreport; + #region 初始化默认值 TRS-ZS-142 + trade_Report.PerformanceGuarantee = "部分担保"; + trade_Report.IsUsePerformanceColl = "否"; + trade_Report.PerformanceExplain = "详见交易确认书。"; + trade_Report.IsPerformanceCollInterest = "否"; + trade_Report.InitialPerformanceColl = 5; + trade_Report.RecoveryPerformanceColl = 5; + trade_Report.UnwindPerformanceColl = 10; + trade_Report.EodPerformanceColl = 5; + trade_Report.PerformanceCollType = "现金"; + trade_Report.PerformanceCollRange = "仅限本笔交易"; + #endregion return View(trade_Report); }