diff --git a/YLErpWeb/Controllers/PricingController.cs b/YLErpWeb/Controllers/PricingController.cs index b0af74eb..c65dc87d 100644 --- a/YLErpWeb/Controllers/PricingController.cs +++ b/YLErpWeb/Controllers/PricingController.cs @@ -85,54 +85,6 @@ namespace YLErp.Web.Controllers return View(model); } - /// - /// 组合报价 - /// - [MyAuthorize("报价管理-结构化交易定价")] - public ActionResult Structure_DZ() - { - var otcTrade = new OtcOptionTradeFull() - { - TraderId = CurUser.UserId, - TraderName = CurUser.UserName, - BuySell = "卖出", - VolType = "交易", - TradeType = "香草期权", - OptionType = "看涨", - ExerciseMode = "European", - TradeDate = valuedateBLL.ValueDate, - UnderlyingInstrumentType = AppHelper.OtcConfig.StockFirst ? "Stock" : "CommodityFutures", - SettlementType = (int)SettlementTypeEnum.ClosePrice, - NoRiskRate = valuedateBLL.SystemDate.RiskFreeRate / 100, - ParticipationRate = 1, - AnnualizeFactor = 1, - MarginTemplateName = "系统默认", - CouponIncludeStartDate = false, - CouponUsePaymentDate = false - }; - - var model = new Models.PricingModel(CurUser, UserBLL.IsTradeOfCurrentLogin(CurUser.UserId)) { Trade = otcTrade }; - - if (model.NumOfSmoothingDaysCfg == "ONE") - { - model.Trade.NumOfSmoothingDays = 1; - } - //获取自定义结构信息 - var structureTypes = - new StructureService(CurUser) - .QueryStructureMap(StructureRangeEnum.BALCK_TRADE); - var structureTypeMap = new Dictionary>() { - { "气囊结构",new List() } - }; - foreach (var item in structureTypes) - { - structureTypeMap[item.Key] = item.Value; - } - ViewBag.StructureTypeMap = structureTypeMap; - - return View(model); - } - /// /// 组合报价导入 /// @@ -198,11 +150,6 @@ namespace YLErp.Web.Controllers ViewBag.ExtendInfoMap[item.Key] = item.Value; } - if (PS.Config.Is润和) - { - return View(nameof(Structure_DZ), model); - } - return View(nameof(Structure), model); }