diff --git a/Framework/YLErp.Core/ConsGlobal.cs b/Framework/YLErp.Core/ConsGlobal.cs index f2c8181f..8e078bdf 100644 --- a/Framework/YLErp.Core/ConsGlobal.cs +++ b/Framework/YLErp.Core/ConsGlobal.cs @@ -135,7 +135,7 @@ namespace YLErp public const string Shibor = "Shibor"; public const string FixingRepoRate = "FixingRepoRate"; public const string OtherRate = "OtherRate"; - public const string BondYield = "BondYield"; //债券收益率 + public const string RateYield = "RateYield"; //利率收益率 public const string BondIndex = "BondIndex"; // 债券指数 //public const string OtherUnderlying = "OtherUnderlying"; @@ -172,7 +172,7 @@ namespace YLErp //case OtherUnderlying: return "其他标的"; case CreditBonds: return "信用债"; case OtherBonds: return "其它债券"; - case BondYield: return "债券收益率"; + case RateYield: return "利率收益率"; case BondIndex: return "债券指数"; default: return instType; } @@ -209,7 +209,7 @@ namespace YLErp //case "其他标的": return OtherUnderlying; case "信用债": return CreditBonds; case "其它债券": return OtherBonds; - case "债券收益率": return BondYield; + case "利率收益率": return RateYield; case "债券指数": return BondIndex; default: throw new ServiceException("资产类型不存在"); } @@ -271,7 +271,7 @@ namespace YLErp new SelectItem { Text = "汇率" ,Value = ExRate }, new SelectItem { Text = "Shibor" ,Value = Shibor}, new SelectItem { Text = "银行间回购定盘" ,Value = FixingRepoRate}, - new SelectItem { Text = "债券收益率" ,Value = BondYield}, + new SelectItem { Text = "利率收益率" ,Value = RateYield}, new SelectItem { Text = "债券指数" ,Value = BondIndex}, //new SelectItem { Text = "其他利率" ,Value = OtherRate}, //new SelectItem { Text = "其他标的" ,Value = OtherUnderlying} @@ -280,7 +280,7 @@ namespace YLErp public static IEnumerable FutureTypes() { - return new[] { CommodityFutures, StockIF, GoldFutures, TBFutures, OtherFutures, AbroadFutures, BondYield, BondIndex }; + return new[] { CommodityFutures, StockIF, GoldFutures, TBFutures, OtherFutures, AbroadFutures, RateYield, BondIndex }; } /// @@ -403,7 +403,7 @@ namespace YLErp case TBFutures: case OtherFutures: case AbroadFutures: - case BondYield: + case RateYield: case BondIndex: return CommodityFutures; case CommoditySpot: @@ -429,7 +429,7 @@ namespace YLErp public static string[] GetFutureTypes() { return new[] { CommodityFutures, StockIF, - GoldFutures, TBFutures, AbroadFutures, OtherFutures,BondYield,BondIndex }; + GoldFutures, TBFutures, AbroadFutures, OtherFutures,RateYield,BondIndex }; } ///