From 5d580960d8096f1cb67bd7a5860465659623443c Mon Sep 17 00:00:00 2001
From: yexuzhong <120511780@qq.com>
Date: Fri, 31 Jul 2026 10:35:25 +0800
Subject: [PATCH] =?UTF-8?q?#EQD-6669=20=E5=9B=BD=E8=81=94=E6=B0=91?=
 =?UTF-8?q?=E7=94=9F-=E6=9C=9F=E6=9D=83=E5=B8=8C=E8=85=8A=E5=80=BC?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=AD=A5=E9=95=BF=E5=92=8C=E7=BB=86=E8=8A=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=88=E5=AE=9A=E4=BB=B7=E5=BC=95=E6=93=8E?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Framework/YLErp.Core/ConsGlobal.cs            |  25 ++++--
 Framework/YLErp.Core/YLErp.Core.csproj        |   2 +-
 .../BLL/Calculation/V2/ValueCalculator.cs     |   4 +-
 YLErpDAL/Model/EodPositionRisks.cs            |  23 +++++-
 .../Models/OptionCalcParam.cs                 |   4 +-
 .../OptionTradeAnalysisService.cs             |   4 +-
 .../DataProviderModule/EodPriceProvider.cs    |   8 +-
 .../EodModule/EodPositionRisksQueryService.cs |  37 ++++++++-
 .../EodModule/GLMSGreeksHandleService.cs      |  28 +++++++
 .../SettlementModule/EodCheckSettlePrice.cs   |  53 ++++++------
 .../OrderModule/TradeSavePreHandler.cs        |  10 +--
 YLErpDAL/YLErpDAL.csproj                      |   2 +-
 .../导出模板/日终持仓风险-Spv_国联.xlsx       | Bin 0 -> 11411 bytes
 .../App_Docs/导出模板/日终持仓风险_国联.xlsx  | Bin 0 -> 11419 bytes
 YLErpWeb/Views/trade/EodPositionRisks.cshtml  |   5 +-
 YLErpWeb/YLErpWeb.csproj                      |  16 ++--
 .../Scripts/app/eod/EodPositionRisks.js       |  78 +++++++++++++++++-
 17 files changed, 236 insertions(+), 63 deletions(-)
 create mode 100644 YLErpDAL/Modules/EodModule/GLMSGreeksHandleService.cs
 create mode 100644 YLErpWeb/App_Docs/导出模板/日终持仓风险-Spv_国联.xlsx
 create mode 100644 YLErpWeb/App_Docs/导出模板/日终持仓风险_国联.xlsx

diff --git a/Framework/YLErp.Core/ConsGlobal.cs b/Framework/YLErp.Core/ConsGlobal.cs
index 049817e7..f2c8181f 100644
--- a/Framework/YLErp.Core/ConsGlobal.cs
+++ b/Framework/YLErp.Core/ConsGlobal.cs
@@ -1,4 +1,4 @@
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 using YLErp.Models;
 
 namespace YLErp
@@ -135,6 +135,9 @@ 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 BondIndex = "BondIndex"; // 债券指数
+
             //public const string OtherUnderlying = "OtherUnderlying";
 
 
@@ -169,6 +172,8 @@ namespace YLErp
                     //case OtherUnderlying: return "其他标的";
                     case CreditBonds: return "信用债";
                     case OtherBonds: return "其它债券";
+                    case BondYield: return "债券收益率";
+                    case BondIndex: return "债券指数";
                     default: return instType;
                 }
             }
@@ -204,6 +209,8 @@ namespace YLErp
                     //case "其他标的": return OtherUnderlying;
                     case "信用债": return CreditBonds;
                     case "其它债券": return OtherBonds;
+                    case "债券收益率": return BondYield;
+                    case "债券指数": return BondIndex;
                     default: throw new ServiceException("资产类型不存在");
                 }
             }
@@ -264,6 +271,8 @@ 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 = BondIndex},
                     //new SelectItem { Text = "其他利率" ,Value = OtherRate},
                     //new SelectItem { Text = "其他标的" ,Value = OtherUnderlying}
                 };
@@ -271,7 +280,7 @@ namespace YLErp
 
             public static IEnumerable<string> FutureTypes()
             {
-                return new[] { CommodityFutures, StockIF, GoldFutures, TBFutures, OtherFutures, AbroadFutures };
+                return new[] { CommodityFutures, StockIF, GoldFutures, TBFutures, OtherFutures, AbroadFutures, BondYield, BondIndex };
             }
 
             /// <summary>
@@ -371,8 +380,12 @@ namespace YLErp
             /// 类型转换为计算所用类型
             /// </summary>
             [MethodImpl(MethodImplOptions.AggressiveInlining)]
-            public static string ConvertCalcType(string instType)
+            public static string ConvertCalcType(string instType,bool pringScene = false)
             {
+                if (pringScene && PS.Config.Company == Configuration.CompanyEnum.国联)
+                {
+                    return Bonds;
+                }
                 switch (instType)
                 {
                     case Stock:
@@ -390,6 +403,8 @@ namespace YLErp
                     case TBFutures:
                     case OtherFutures:
                     case AbroadFutures:
+                    case BondYield:
+                    case BondIndex:
                         return CommodityFutures;
                     case CommoditySpot:
                     case GoldSpot:
@@ -414,7 +429,7 @@ namespace YLErp
             public static string[] GetFutureTypes()
             {
                 return new[] { CommodityFutures, StockIF,
-                    GoldFutures, TBFutures, AbroadFutures, OtherFutures };
+                    GoldFutures, TBFutures, AbroadFutures, OtherFutures,BondYield,BondIndex };
             }
 
             /// <summary>
@@ -458,7 +473,7 @@ namespace YLErp
                     Bonds,
                     TBonds,
                     CreditBonds,
-                    OtherBonds
+                    OtherBonds,
                 };
             }
         }
diff --git a/Framework/YLErp.Core/YLErp.Core.csproj b/Framework/YLErp.Core/YLErp.Core.csproj
index f33b22cb..2677280c 100644
--- a/Framework/YLErp.Core/YLErp.Core.csproj
+++ b/Framework/YLErp.Core/YLErp.Core.csproj
@@ -13,7 +13,7 @@
 		<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
 		<PackageReference Include="NPOI" Version="2.5.6" />
 		<PackageReference Include="RestSharp" Version="108.0.3" />
-		<PackageReference Include="Qdp.Pricing.Base" Version="1.0.1" />
+		<PackageReference Include="Qdp.Pricing.Base" Version="1.1.5-glms" />
 		<PackageReference Include="TinyPinyin.Net" Version="1.0.2" />
 		<PackageReference Include="YieldChain.Core" Version="1.0.3" />
 	</ItemGroup>
diff --git a/YLErpDAL/BLL/Calculation/V2/ValueCalculator.cs b/YLErpDAL/BLL/Calculation/V2/ValueCalculator.cs
index 21aceac3..ec57f41b 100644
--- a/YLErpDAL/BLL/Calculation/V2/ValueCalculator.cs
+++ b/YLErpDAL/BLL/Calculation/V2/ValueCalculator.cs
@@ -1,4 +1,4 @@
-using Qdp.ComputeService.Data.CommonModels.ValuationParams.Equity;
+using Qdp.ComputeService.Data.CommonModels.ValuationParams.Equity;
 using Qdp.ComputeService.Data.CommonModels.ValuationParams.FixedIncome;
 using Qdp.ComputeServiceV2.Data.CommonModels.TradeInfos;
 using Qdp.ComputeServiceV2.Data.CommonModels.TradeInfos.Options;
@@ -59,7 +59,7 @@ namespace YLErp.BLL.Calculation.V2
         {
             underlying = underlying.Clone();
 
-            underlying.UnderlyingInstrumentType = ConsGlobal.InstrumentType.ConvertCalcType(underlying.UnderlyingInstrumentType);
+            underlying.UnderlyingInstrumentType = ConsGlobal.InstrumentType.ConvertCalcType(underlying.UnderlyingInstrumentType,true);
 
             switch (trade.TradeType)
             {
diff --git a/YLErpDAL/Model/EodPositionRisks.cs b/YLErpDAL/Model/EodPositionRisks.cs
index 7f124449..3669e15c 100644
--- a/YLErpDAL/Model/EodPositionRisks.cs
+++ b/YLErpDAL/Model/EodPositionRisks.cs
@@ -1,4 +1,4 @@
-using BaseOUDAL;
+using BaseOUDAL;
 using YLErp.Commons;
 using YLErp.Helpers;
 using YLErp.Modules;
@@ -211,6 +211,27 @@ namespace YLErp.Model
         public double DividendRate { get; set; }
 
 
+
+        /// <summary>
+        /// Delta_R
+        /// </summary>
+        public double? Delta_r { get; set; }
+
+        public double? Delta_r_1bp { get; set; }
+
+
+        public double? Dv01 { get; set; }
+
+        public double? Gamma_r { get; set; }
+
+        public double? Gamma_r_1bp { get; set; }
+
+        public double? Vega_r { get; set; }
+
+        public double? Vega_r_1bp { get; set; }
+
+
+
         /// <summary>
         /// 维持预付金
         /// </summary>
diff --git a/YLErpDAL/Modules/CalculationModule/Models/OptionCalcParam.cs b/YLErpDAL/Modules/CalculationModule/Models/OptionCalcParam.cs
index 93b9fac1..2c4d6c45 100644
--- a/YLErpDAL/Modules/CalculationModule/Models/OptionCalcParam.cs
+++ b/YLErpDAL/Modules/CalculationModule/Models/OptionCalcParam.cs
@@ -1,4 +1,4 @@
-using Qdp.Foundation.Implementations;
+using Qdp.Foundation.Implementations;
 using Qdp.Pricing.Base.Enums;
 using Qdp.Pricing.Base.Implementations;
 using YLErp.Enums;
@@ -105,7 +105,7 @@ namespace YLErp.Modules.CalculationModule
         public string underlyingInstrumentType
         {
             get => _underlyingInstrumentType;
-            set => _underlyingInstrumentType = ConsGlobal.InstrumentType.ConvertCalcType(value);
+            set => _underlyingInstrumentType = ConsGlobal.InstrumentType.ConvertCalcType(value,true);
         }
 
         /// <summary>
diff --git a/YLErpDAL/Modules/CalculationModule/OptionTradeAnalysisService.cs b/YLErpDAL/Modules/CalculationModule/OptionTradeAnalysisService.cs
index 531afaed..add6c39d 100644
--- a/YLErpDAL/Modules/CalculationModule/OptionTradeAnalysisService.cs
+++ b/YLErpDAL/Modules/CalculationModule/OptionTradeAnalysisService.cs
@@ -1,4 +1,4 @@
-using Qdp.Foundation.Implementations;
+using Qdp.Foundation.Implementations;
 using Qdp.Pricing.Base.Implementations;
 using Qdp.Pricing.Base.Interfaces;
 using Qdp.Pricing.Base.Utilities;
@@ -570,7 +570,7 @@ namespace YLErp.Modules.CalculationModule
         {
             underlying = underlying.Clone();
 
-            underlying.UnderlyingInstrumentType = ConsGlobal.InstrumentType.ConvertCalcType(underlying.UnderlyingInstrumentType);
+            underlying.UnderlyingInstrumentType = ConsGlobal.InstrumentType.ConvertCalcType(underlying.UnderlyingInstrumentType,true);
 
             switch (trade.TradeType)
             {
diff --git a/YLErpDAL/Modules/DataProviderModule/EodPriceProvider.cs b/YLErpDAL/Modules/DataProviderModule/EodPriceProvider.cs
index c59eca99..3a5bf504 100644
--- a/YLErpDAL/Modules/DataProviderModule/EodPriceProvider.cs
+++ b/YLErpDAL/Modules/DataProviderModule/EodPriceProvider.cs
@@ -1,4 +1,4 @@
-using YLErp.Abstract.DataProviders;
+using YLErp.Abstract.DataProviders;
 using YLErp.Helpers;
 using YLErp.Models;
 using YLErp.Modules.TradeModule.DealModule;
@@ -118,13 +118,13 @@ namespace YLErp.Modules.DataProviderModule
                                    ValueDate = ValueDate,
                                    UnderlyingId = um.id,
                                    UnderlyingCode = um.UnderlyingCode,
-                                   ClosePrice = 0,
-                                   SettlePrice = 0,
+                                   ClosePrice = (double)(eodprice.net_price ?? 0) / 100,
+                                   SettlePrice = (double)(eodprice.dirty_price_close ?? 0) / 100,
                                    HighPrice = 0,
                                    LowPrice = 0,
                                    UnderlyingStatus = "正常运行",
                                    UnderlyingInstrumentType = "Bonds",
-                                   ReferencePrice = 0,
+                                   ReferencePrice = (double)(eodprice.yield ?? 0),
                                    DeciSettlePrice = eodprice.dirty_price_close,
                                    DeciClosePrice = eodprice.net_price,
                                    DeciReferencePrice = eodprice.yield,
diff --git a/YLErpDAL/Modules/EodModule/EodPositionRisksQueryService.cs b/YLErpDAL/Modules/EodModule/EodPositionRisksQueryService.cs
index 9acddd70..821f5ae2 100644
--- a/YLErpDAL/Modules/EodModule/EodPositionRisksQueryService.cs
+++ b/YLErpDAL/Modules/EodModule/EodPositionRisksQueryService.cs
@@ -1,4 +1,4 @@
-using BaseOUDAL;
+using BaseOUDAL;
 using System;
 using System.Data;
 using System.Diagnostics;
@@ -339,7 +339,9 @@ namespace YLErp.Modules.EodModule
 
             var tcActions = new[] {  ClientCashInCashOut.系统操作_平仓费,
                 ClientCashInCashOut.系统操作_行权费,ClientCashInCashOut.系统操作_票息,ClientCashInCashOut.系统操作_互换,ClientCashInCashOut.人工操作_其他};
-
+            var underlyingCodes = searchResult.rows.Select(O => O.UnderlyingCode).Distinct().ToList();
+            var greeksHandleService = new GLMSGreeksHandleService();
+            greeksHandleService.InitData(req.ValueDate, underlyingCodes);
             foreach (var r in searchResult.rows)
             {
                 var um = DataCacheProvider.GetUnderlyingDataSource().GetData(r.UnderlyingCode);
@@ -470,6 +472,7 @@ namespace YLErp.Modules.EodModule
                     r.DeltaLots = (r.Delta ?? 0) / um.ContractSize;
                 }
                 r.Rho *= 100;
+                greeksHandleService.Handle(r);
                 if (r.trade == null)
                 {
                     r.TradeSinglePrice = r.etcTradePrice / r.TradeAmount;
@@ -1118,6 +1121,9 @@ namespace YLErp.Modules.EodModule
                 .AsEnumerable()
                 .GroupBy(O => O.ParentTradeId)
                 .ToDictionary(K => K.Key, V => V.Select(O => new xodTradeBase() { TradeJson = O.TradeJson }));
+            var underlyingCodes = searchResult.rows.Select(O => O.UnderlyingCode).Distinct().ToList();
+            var greeksHandleService = new GLMSGreeksHandleService();
+            greeksHandleService.InitData(req.ValueDate, underlyingCodes);
 
             foreach (var r in searchResult.rows)
             {
@@ -1200,6 +1206,7 @@ namespace YLErp.Modules.EodModule
                 }
 
                 r.Rho *= 100;
+                greeksHandleService.Handle(r);
                 r.CountRatio = um.CountRatio;
                 r.TradeOriginalAmount = r.OriginalNotional / um.CountRatio;
                 r.etcTradePrice = ConsTrade.TradeTypesForHedge.Contains(r.TradeType)
@@ -1706,10 +1713,10 @@ namespace YLErp.Modules.EodModule
             var results = GetEodPositionRisksDataHandle(req);
             var list2 = results.Select(n => new ExpandoDictionary<string, string>(n)).ToArray();
 
-            var templateFile = OtcAppContext.MapPath("~/App_Docs/导出模板/日终持仓风险.xlsx");
+            var templateFile = OtcAppContext.MapPath("~/App_Docs/导出模板/日终持仓风险_国联.xlsx");
             if (PS.Config.ErpElement.NeedShowSpv)
             {
-                templateFile = OtcAppContext.MapPath("~/App_Docs/导出模板/日终持仓风险-Spv.xlsx");
+                templateFile = OtcAppContext.MapPath("~/App_Docs/导出模板/日终持仓风险-Spv_国联.xlsx");
             }
 
             return ExcelGenerator.UseTemplateGenerator(templateFile).AddVariable(new { list = list2 }).GenerateBytes();
@@ -2016,6 +2023,17 @@ namespace YLErp.Modules.EodModule
                     dic.Add("Spv3", item.PnLDelta.OtcFormat(OtcFormatFlag.greek));
                 }
 
+                if (PS.Config.Company == Configuration.CompanyEnum.国联)
+                {
+                    dic.Add("Delta_r", OtcFormatExtensions.OtcFormat(item.Delta_r, OtcFormatFlag.greek));
+                    dic.Add("Delta_r_1bp", OtcFormatExtensions.OtcFormat(item.Delta_r_1bp, OtcFormatFlag.greek));
+                    dic.Add("Dv01", OtcFormatExtensions.OtcFormat(item.Dv01, OtcFormatFlag.greek));
+                    dic.Add("Gamma_r", OtcFormatExtensions.OtcFormat(item.Gamma_r, OtcFormatFlag.greek));
+                    dic.Add("Gamma_r_1bp", OtcFormatExtensions.OtcFormat(item.Gamma_r_1bp, OtcFormatFlag.greek));
+                    dic.Add("Vega_r", OtcFormatExtensions.OtcFormat(item.Vega_r, OtcFormatFlag.greek));
+                    dic.Add("Vega_r_1bp", OtcFormatExtensions.OtcFormat(item.Vega_r_1bp, OtcFormatFlag.greek));
+                }
+
 
                 dic.Add("备注", item.Comments);
 
@@ -2115,6 +2133,17 @@ namespace YLErp.Modules.EodModule
                     dic.Add("Spv2", "");
                     dic.Add("Spv3", "");
                 }
+
+                if (PS.Config.Company == Configuration.CompanyEnum.国联)
+                {
+                    dic.Add("Delta_r", "");
+                    dic.Add("Delta_r_1bp", "");
+                    dic.Add("Dv01", "");
+                    dic.Add("Gamma_r", "");
+                    dic.Add("Gamma_r_1bp", "");
+                    dic.Add("Vega_r", "");
+                    dic.Add("Vega_r_1bp", "");
+                }
                 results.Add(dic);
             }
             return results;
diff --git a/YLErpDAL/Modules/EodModule/GLMSGreeksHandleService.cs b/YLErpDAL/Modules/EodModule/GLMSGreeksHandleService.cs
new file mode 100644
index 00000000..4385923a
--- /dev/null
+++ b/YLErpDAL/Modules/EodModule/GLMSGreeksHandleService.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using YLErp.Model;
+
+namespace YLErp.Modules.EodModule
+{
+    /// <summary>
+    /// 国联民生 希腊字母计算
+    /// </summary>
+    public class GLMSGreeksHandleService
+    {
+
+        public void InitData(DateTime valueDate,List<string> underlyingCodes)
+        {
+
+        }
+
+
+        public void Handle(EodPositionRisksDTO dto)
+        {
+            //对Delta_r Delta_r_1bp Dv01  Gamma_r  Gamma_r_1bp  Vega_r  Vega_r_1bp
+
+        }
+    }
+}
diff --git a/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSettlePrice.cs b/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSettlePrice.cs
index e071bb88..87af919a 100644
--- a/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSettlePrice.cs
+++ b/YLErpDAL/Modules/EodModule/SettlementModule/EodCheckSettlePrice.cs
@@ -1,4 +1,4 @@
-using System.Linq;
+using System.Linq;
 using System.Linq.Dynamic.Core;
 using YLErp.Modules.DataProviderModule;
 
@@ -48,7 +48,7 @@ namespace YLErp.Modules.EodModule.SettlementModule
             if (request.IsSettleOtcTrades)
             {
                 var tradePredicate = _context.PredicateBuilder.GetOtcTradePredicate()
-                    .And(t => t.TradeType != "自定义交易" && t.TradeType != "收益互换" && t.UnderlyingCode != null);
+                    .And(t => t.TradeType != "自定义交易" && t.UnderlyingCode != null);
 
                 //新增客户筛选 tw
                 if (clienIds != null)
@@ -58,6 +58,11 @@ namespace YLErp.Modules.EodModule.SettlementModule
 
                 allQuery = DbContext.trade.Where(tradePredicate).Select(n => n.UnderlyingCode).Distinct();
 
+                if (PS.Config.ErpElement.ForwardTradePriceModel == Configuration.Enums.ForwardTradePriceModel.STANDARD)
+                {
+                    allQuery = allQuery.Union(DbContext.trade.Where(tradePredicate).Where(x => x.BasisUnderlyingCode != null && x.BasisUnderlyingCode != "").Select(n => n.BasisUnderlyingCode).Distinct());
+                }
+
                 var clientProductPredicate = _context.PredicateBuilder.GetClientProductPredicate();
 
                 //新增客户筛选 tw
@@ -74,26 +79,28 @@ namespace YLErp.Modules.EodModule.SettlementModule
             }
 
             //检查场内标的
-            //if (request.IsSettleExchangeTrades)
-            //{
-            //    var exTradePredicate = _context.PredicateBuilder.GetExchangeTradePredicate();
+            if (request.IsSettleExchangeTrades)
+            {
+                var exTradePredicate = _context.PredicateBuilder.GetExchangeTradePredicate();
 
-            //    var exTradeQuery = DbContext.ExchangeTrade.Where(exTradePredicate).Select(n => n.UnderlyingCode);
+                var exTradeQuery = DbContext.ExchangeTrade.Where(exTradePredicate).Select(n => n.UnderlyingCode);
 
-            //    allQuery = allQuery == null ? exTradeQuery.Distinct() : allQuery.Union(exTradeQuery.Distinct());
+                allQuery = allQuery == null ? exTradeQuery.Distinct() : allQuery.Union(exTradeQuery.Distinct());
 
-            //    var preSettleDate = _context.PreSettleDate;
-            //    //最后一个交易日持仓信息
-            //    var futureTypes = ConsGlobal.InstrumentType.GetFutureTypes();
-            //    var positionQuery = from t in DbContext.eod_trade_position
-            //                        join um in DbContext.underlying_manager on t.UnderlyingCode equals um.UnderlyingCode
-            //                        where t.ValueDate == preSettleDate && t.Amount != 0
-            //                            && ConsTrade.TradeTypesForHedge.Contains(t.TradeType)
-            //                            && (!futureTypes.Contains(um.UnderlyingInstrumentType) || um.MaturityDate >= settleDate)
-            //                        select t.UnderlyingCode;
+                var preSettleDate = _context.PreSettleDate;
+                //最后一个交易日持仓信息
+                var futureTypes = ConsGlobal.InstrumentType.GetFutureTypes();
+                var positionQuery = from t in DbContext.eod_trade_position
+                                    join um in DbContext.underlying_manager on t.UnderlyingCode equals um.UnderlyingCode
+                                    where t.ValueDate == preSettleDate && t.Amount != 0
+                                        && ConsTrade.TradeTypesForHedge.Contains(t.TradeType)
+                                        && (!futureTypes.Contains(um.UnderlyingInstrumentType) || um.MaturityDate >= settleDate)
+                                    select t.UnderlyingCode;
 
-            //    allQuery = allQuery.Union(positionQuery.Distinct());
-            //}
+                allQuery = allQuery.Union(positionQuery.Distinct());
+            }
+
+           
 
             if (allQuery == null)
             {
@@ -103,12 +110,10 @@ namespace YLErp.Modules.EodModule.SettlementModule
             //检查是否所有标的都在结算日有结算价格
 
             var umCodeArr = allQuery.ToArray();
-            var swapUmCodeArr = GetSwapUnderlyingCodes();
-            var codeArr = umCodeArr.Union(swapUmCodeArr);
-            var eodPriceProvider = _context.GetEodPriceProvider().Initialize(codeArr);
-            // var preEodPriceProvidaer = _context.GetPreEodPriceProvider().Initialize(swapUmCodeArr);
-            var umCodes = codeArr.Where(n => !string.IsNullOrEmpty(n) && !eodPriceProvider.HasValue(n)).ToHashSet(StringComparer.OrdinalIgnoreCase);
-            //var swapUmCodes= swapUmCodeArr.Where(n => !string.IsNullOrEmpty(n) && !preEodPriceProvidaer.HasValue(n)).ToHashSet(StringComparer.OrdinalIgnoreCase);
+
+            var eodPriceProvider = _context.GetEodPriceProvider().Initialize(umCodeArr);
+            var umCodes = umCodeArr.Where(n => !string.IsNullOrEmpty(n) && !eodPriceProvider.HasValue(n)).ToHashSet(StringComparer.OrdinalIgnoreCase);
+
             //排除掉节假日不需要结算的交易
             foreach (var t in _context.HolidayTrades)
             {
diff --git a/YLErpDAL/Modules/TradeModule/OrderModule/TradeSavePreHandler.cs b/YLErpDAL/Modules/TradeModule/OrderModule/TradeSavePreHandler.cs
index 4980ca9a..699a1dd4 100644
--- a/YLErpDAL/Modules/TradeModule/OrderModule/TradeSavePreHandler.cs
+++ b/YLErpDAL/Modules/TradeModule/OrderModule/TradeSavePreHandler.cs
@@ -1,4 +1,4 @@
-using BaseOUDAL;
+using BaseOUDAL;
 using YLErp.BLL;
 using YLErp.Configuration;
 using YLErp.Configuration.Enums;
@@ -993,10 +993,10 @@ namespace YLErp.Modules.TradeModule.OrderModule
                 throw new ServiceException($"客户'{client.Name}'为非高风险客户,没有卖出权限");
             }
 
-            if (_underlying != null && _underlying.CalcTypeIsStock() && ((client.TradingInstType & TradingInstTypeEnum.Equity) != TradingInstTypeEnum.Equity))
-            {
-                throw new ServiceException($"客户'{client.Name}'的'交易资产'属性不包括'权益',不能进行权益类的期权交易");
-            }
+            //if (_underlying != null && _underlying.CalcTypeIsStock() && ((client.TradingInstType & TradingInstTypeEnum.Equity) != TradingInstTypeEnum.Equity))
+            //{
+            //    throw new ServiceException($"客户'{client.Name}'的'交易资产'属性不包括'权益',不能进行权益类的期权交易");
+            //}
 
             if (PS.Config.ErpElement.SecuritiesEnvironment)
             {
diff --git a/YLErpDAL/YLErpDAL.csproj b/YLErpDAL/YLErpDAL.csproj
index 8b50f99f..437f62a6 100644
--- a/YLErpDAL/YLErpDAL.csproj
+++ b/YLErpDAL/YLErpDAL.csproj
@@ -41,7 +41,7 @@
 		<PackageReference Include="SocialExplorer.FastDBF" Version="1.0.0" />
 		<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.10.0" />
 		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0" />
-		<PackageReference Include="Qdp.Pricing.Library.Options" Version="1.0.5" />
+		<PackageReference Include="Qdp.Pricing.Library.Options" Version="5.18.4-glms" />
 		<PackageReference Include="System.Text.Encoding.CodePages" Version="7.0.0" />
 		<PackageReference Include="YLErp.Office" Version="1.1.2" />
 	</ItemGroup>
diff --git a/YLErpWeb/App_Docs/导出模板/日终持仓风险-Spv_国联.xlsx b/YLErpWeb/App_Docs/导出模板/日终持仓风险-Spv_国联.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..827586a1200ee4f4cf0b173ee463843a720a089c
GIT binary patch
literal 11411
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
H=ePd@rG1^i

literal 0
HcmV?d00001

diff --git a/YLErpWeb/App_Docs/导出模板/日终持仓风险_国联.xlsx b/YLErpWeb/App_Docs/导出模板/日终持仓风险_国联.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..9b4401374980cf8d61acad4a82377dba3e313e7e
GIT binary patch
literal 11419
zcmeG?WkVcWvV*%5+=B%O?ivVAu;32CU4~!*LIxRvLvVMu1a}|YEx5Y}x9}#r``*1b
zci%7A?GLB>)KpdXbeC7DD8Rwv0}uho004j*P=J2mX$1oSU?2bhcmQNrz1NNouI3J|
zM(UnU=0F2h4|_YRY<O74OaLqt|G&q7@Ea(N9dzhq$CkQ|yTgjE(|EU=UCaa<DjNUt
z?H*G7Re<&l-RP^elLMl{VkQLY@7?mkz|rAuzMTH~<aY=-HSRp5nsAzaUkt7JD&~3*
z^O`LYVw~iOPBJY>U-1$f8HHP<0JL)*z&y5}JK=U1^(tYRDckeXATrF1OArAp3D$11
zn<HbV-aL2s2>E^P?;aQM;o2lj>9c!hGjj0$r5=j}Zl%eevBTm)F>0+Y`&fC4IK@**
zww2Q`jxiXJ4=76`Pksg~dL)Wds3Aqc7fg2FI%b1D-qzn-_^Of<>^bkHNGqrqvf3xV
z3Zw?9e20zV(J*9Yu3oqoZ6EFFJLhb!j6Qz+c8Wt8+sb$9EwUmJF90h!Pt>juDH2NY
zyp9IsRgf6t><rgdgLNyrV?pB69-E0=plm`JUEYK)hfHIAgCe(La!;LqktX7{`=jht
z+CaPlt>Y-f(cEiQ_-P2T0+p?&Cpdu0UlbJ2u+<zEs-P=S{X>H)sF91g9gvOn*ZN<@
z{14W~KmGO67)1p*4(y;4&=d7gi_iiS&4eAB)UKl0BMe8<qcLAnRBq$rwY0cvRxO2B
zYK42cXVRs`w;Ycg><@0Z@lq(DREx<b%}#~K`g$asFD}yIhq9fYXzYp)N-nv=nYOaN
zUy6p5u4f0Z(mnYRy_eDK0f{u|Tk~tjxe)1I$YT}L>Bnu62d$8(40HF4$RY~?;j%?<
zns1wV`4lUx2fZBo^PV$D<x7r4>D)xkN$j8VWNT*S(RNh&4(tUF+|!uCQ84H}X6&BW
zj=y~?O&6F9m$rR-$d6FnoGS&y`?#1S?Y+a^%!yT??ZDQbea-Pz#B@Y!ln-}g`P<#U
zRhb#Ow1su3y4WEC09a5A4?8w@M;F_7j*hm!{8_HXutUl#>{hLPp|QA%07^KwDCgMu
zuQo5rO7j)f``=av)#xC&^&bnm;chJ!>}J(1dsQ%9TF30{vfS_;Q!8R0a-w_R4-fGv
z92lotLZ0EoxDZfVj!Gk%a40jTNba5&q|ZqPsVCC$Z-hziCd;~x`92o&Y^=ZQz72!{
zypd+qC`Nv%0C~~>b#Vj1WR(~gZHkbesQnEao`I82aw}<T-pzO`kyD*IVEqM=w{Skk
z-VcvtynH5Xan4e|);HGF309sD`1NF=q1Gl4VK%@!Nv`5@1r@VR=kFQptf!3rl{*oR
zLkOub`VkoZP5LPMLJC{l1o}U|&cj)i(6r#Snd(JU#er@eFw=uJbwK*623^mXafH8U
zRCc1y7)Lz5<3`HWu%Qds6u}!dat5k4@#GT=l;zs4X5aV$4T{i-iR1SfvqETbZ2bBy
z%^urjf)WWF3%KDb4&ZD3ORwZd;9wA^ezL1cvX{z&xe(s!seCLdl|NJ(5buV_xCrEd
zUY+;_P>~TildVUS8OM>RMN1WuVrChA$I$-*>g^)+1X?pugN-60C7q?EySlRZ!ERAq
z_Ze*`Z9lzk&K}nmGS-54&m5jVfCZgPznF?kFilK9ZfpYFaaf=6t91I^`(6_jJAo=P
z=~Zsc#=rT<HmZqPenn0@*K3<}CLMlk)TvAPwAX;Kuvl?V&UGqyX*g=@<<`~aZ!C!o
zAyd|9WULE{h|+ojABd#;BNdn5bEi(2DQ?UdlI5pUVkoSnVQM?t6~qp0>JrU!Z(GLF
zc@t1iI#U-O*aI~MN3F8os?4+=budp?xd$k{H9ow-cqHfcvmnTNDZLb;iiN3$r59F;
zA-_d{IyEq7oOh^vQM=!6ShmC2Pj#+RL47Az<YarRBLRtxmaIebv(rW^43iI>f3})3
zZ!(Nwo2FE@{EgQTf!waEn?Dq(b4;zFap$(&$j0(E$La|h#Qoiad=iaKIESi1BUB|w
z0LU;<b@-<f`Lj~|uS0=>MtV?h^Phc`zExD{X2)(p`w3=uPjP#OGv~@ibEt8Eh1_5L
zVu7BT%lBf1l&R4`dq#l`&N0aIWVqMung??o4)3yqxiAD5-V4v}L<qrg_<R@+`Q1?&
z1xN+~5BG5YpyUV*GZ~22AR5!hl8(>6eZxpc49>}?k-TV_2;#OGVSmqQ0~{kCP}Er-
ztlspy3s5^O169}6Q6;~y*m`Psy>Nw?0rI3AKPN_!6UOiajPFiSGv9PbT_OKyey~vV
z9I@@lxkKL~D^Z{*<`MA@a-{<I$xwcL5d+-HPHNIPS#y=RA9&HW@PlRW;>2RJzjylI
z2OT?ud0Gfa0Dv1c06+wlg@0L4pq06~E0FCUCyrmHG&NZVI4_GIxKd#A(_j7sriRxp
z!C5|h<M8taPk#yvS`I2zIIUw+@{?#C0xZy#iC#{i-kS2#rBTe8t?V%YtE%XILcB)&
zD7bcCpf+yg%Y$Ib3i{D`RSuz0t;Y1(gJAmhxvP~}e%#}a)swcXlk*=kJaUusF$CMw
zW9d`xzs{a$_0y*HXt1$OG(4E6CREkO*KH}bF%59HI<O`y-j{C#JnEzlA4#Eo*y6R{
z+;EQ11$(*(DePQkM{}k@YQox*&7`Jlc@=7{9S9P{96|}@M459xm)IpwM=Ivj@+e#_
zFAtq_wk8iWQ^ry<%)EXfR{n53?~r__q+G@F;+%<cR>ZoYjR@#|*YvpLn_8;7Kk~7}
zB6fvsvT2BAweiLEXizRlL+`ke;{=NoO)H$ZX`p4{(97!SfaR$rYGt6A{~+PY@o5g}
zem1GJGAT|Ye<O>$sAasb>K^HS7_qT$;(lLlu6Uzl(lwd>JyROvLh<?fYr%4vJy*f%
zOVT0^p)01*kBJH^A$`$G#oM@(a;Z~u292>sA<cIMds+%Qf=3lzKDrJvPE&_JHYOUC
zde4rkDYhmD4;$0bj|`g1g!)fba_5F~<JSUP+PRZA)vU!0%XBPuzbF!l^*M5VpWf1V
zwBj}93aL?#x6F#`d|Q&5PD-Sk;Kkffw(ng_hOE!VJfVMrdOCWsRlC6%_}*y2ZL9Y6
zd!$i!I`@>G%G}E10aClAq?;D2SE!>ygI|jHbRA6%^*-#@;Bf_B8oSq0l+Ln(7$!eB
zRGJ8BzbF+#tD`KdZ%aJFv(-4^Be5#GoSFGK5`V7Oq-Y}GzujdXdbD4sH-<kySCT&O
zb>-Wn+3N8#Y`V40bpYS@W83|=#PIR_Q+=(Y>>FF&?nw)@N6>O+O&30|^i60e;*rCG
z&b`=f((qkqsM~z{o2;W3cE?;=)*6)N+YS)jUAANUVS{t_@(uq-&bGSE=Oc?cq2J-r
zZInsk7BY&$-&~HxYs4Tj7qtjEUERC8R4B%yE@>1h_7s*l@jU|@1lARKOl#bvgyfXd
zd{=KiX6jT7yyXVXVe&q6Yzj$J>}e{0=dN~^&X1VyONHxn`8?XMEF&1+`|%B}@gYaF
zUzJfXe5nXE?&(#mZ2KY?4UGF}6E5Lm3lz5wg`4-f1?||EuFS7#B^ZA3QHgfdL6XX~
zV>#G(7u1FWhl3u09Ky;^hC?J$$xp-YwdySCchSBXOttrE5a-hbT*`A$9#|BQUF0Gu
zYA<UPUJ=WO-p*^6>(iu621=Uf-J8>kam&tvNKw33J{L*Y`#GcVs+2zTVRulJDJV)F
z6onmQ%(BxOAZq*nE>~YspufH-xBk-CA!7-!%|a=FDGj7g4I*;JR(h?E)@dDVE6$JM
z{1Ul<x*TDRySs)eHK?8-U=n*4<V2D^3cc{5PsN1ZW)A?pU<w$^-6zs28Y#wotAWG;
zD&9YRt*uc%E)B04=o+T&6uRJ5-L27iqY+k`zDRhFYh00ShmxxkYhO&b5>c&s1>j?j
zZZ{;yL9v^DP4g-3E=1NihXM!XaB@}>cHsgex}DW$A?~o9-baSEQf37YrT+etZ2MBA
zB<!&-4X)EQSF~SK@2?FtbQ1vmWwP9ia8cwrbe9U<p+Ub8+h^#vkf&We=7Vn9@KB%u
z;kdDW)@Q^GRM=b>_DU*QCZy;5uz4=*0nfFWkWBeu^Ih13pIb2@<?zE6xUh#k_h3SL
zr1xV&!e9tyLLz5~VhW7FdlM(oi&7|`wE?e@H|7jm@^+WML*s>ODxd^kP$^0Sm7HPh
z7n<EKw0hL@qu|UEeb?0X684=4<ko?n#PHJ+ee`+c_8&EL-gQ05kSRSb5XbdQm@y$7
zpESG0N-|E^UY!NJ>CZCajzm9OC}<T5dQlGrVU|Nd0lz?NP>}U65XCQ0@GsCh6jbyJ
z#QF;)`3p4ui|`v16j4gtkp`cL6E=4g3}p{p$lB8!s%f>A(9_{}Y=`(jz|X64PUT`L
zcUPIC-Y?1{g?Nkvc^J}?CzXbE3bvcofa66Chg051Q{D$t-o44HQ$^#-HUuLq5n6;u
z2tAVN+=W$=5o*2A)Iz3)e#et#6W=vG^2hBDX9OTfx0`RTx4yZ5JB}xA!%$$_K7xCo
zNBm$toD6|aZdAi?(9=pSwa*{9Nc*r)y!0Yw_9(?XrNG)pPg_bqcgy-pO)#FTqIqaD
z+J9TlKg(d#+yJ6uuZLIk^kO5d04zoS`u(Pdlr$rr$6HgSC@tkTWDn5X;_uPcKK*FM
zAT$o+CH_@V`-kgvwKBIiXZy$c53hNsqZ~=fgWvZ2j9eO6Am?^opu?kgw5?3oxS+XI
zT_|G-NpjvGj<mC^Ysk6^4hUcjM#JU9L@u0?*B>a*VFb}!GM^qM4SgpC+Yf3o7539@
z+_voOT&I5=9c^&EHI!(1K7?RmJ?f}mcu%1OM-aoke_IF1!D78jk7C5YF@JG<i^lRW
zxNy?uj$+?W#PA*NR^2Wuol+sme%gk{&xDq>620KmVZZ}KEBvF7z{M5a3r}~UaCV^v
zK6>i<ZLHt?!Q=~+%C;7Dq1;TNI0+2+SW2cmk7uMKB&gH`*~$&>0al}6VhJ~4$aU_C
zDlKjE?(O@>Guwp(8><rRY?ts-YQBjKiE?aYOHwZ-3dI4rlwr-P7Pb9Z0F#z;*GQ#^
zUBVqV00E|yyRK(yZvN;PQx{<duq8&`h?Lf0(bY+M$ERhtY+Y0lIGd^e5r`m0a@i3|
zVCe7SJ-GH|M7qs-jfb(fPU|%7ZX|Q=>nRDoTFi*%*rn!&sy2OllqAl^od9>eVO7f<
z6~inl(t*RbYHxIyX18=f$DE?Dez0$8<@Woff(jV@9*&;N)2Dje(}v_FBifsoHIIT}
zzjEeUTu8Rd(SP_ULkuEUwe~r?023-xeqc)%6>NCg-26GpfJKqI`1E4d9OXERn-d}9
z<Mpl4iud~C?ajgtR-5Za;OD2KUgeLETWEaPSE}aYRTUJEKR2N#vHOjCFy;-W3?7~+
zJqp1xkN4q{8A_?55Tuq&`KClJ%v6#E1>fHRyq^{Ja<v8_n{|=3HqAW+F0kHDYuo*$
z9+s(SLN~|xH2+sWq_A-VNE&8+@iwQhaC$-X2NzL3XFeQ3m*FLuqG$7K!f?m5tZ|P-
zdKSx>jB$*eFXGd^dM${AG~L12gB3`$t8XfcE{?Gs32_P(AZG9A-qKae;06zNno|YL
z{}}GDcT7;7Ek?TOlkN<9HD&TZq&66?HKw24o#zsUYa{4Q+5g>qa}9(<@4!eaDcBk7
z*@ca^7Sk|d(jq-p0qaxW<@<{8bNFV=kiOtGjw!uMyTv0BUDBjQ421sbHHSaG)G`LW
z!6}@@3HBwr^Q*mirxp6|sMm9nPH2gf+(q)(mlh-BUz<TmEtG_=A(a-yRBoXacrod6
z%O_SJbcWsdogLC!)XZ8iuPJkPVUi2@*bhUdaW5mXRyeAk+AMe9f4F_{Y{-6Rytm(7
zHoDS3zi}O_;>Adae}d)%OQ_=4iG#jB^XeLGE)?H$TE%~;S0DWR<%To87(J(Gm?~ny
zb&!MbbJfC#fCLU0gB*$(jF+N$de?ySO}{|T**U91OfCkjPi8!Zj&U1f9DQU<$LeY7
zMTXb;(Z?PMh>UYu9G!_nyzeGWBrOGyRc{!cUkr@&gp_xMgvvj1st+>8mjfmT3foco
z{ec>zjy&fM6!Y|w&V}o-d{=|J#jB~dxw8Ual8IHo3gI+x#j@^kWwr?gnh6E-3X=1j
zow9rj$j>oM@z-gDh7Tgo!`|1S7MZ8J^tkY;Tez~ee%5Bj73jg>=1BtOFFTJqI@Yc_
zFu&3n&5*dp6#IhiB2)O~Wj2n!FG9=?>Cg9xbQ=<wQNcj4?L_|^6*Vp}GA4JYWGi9r
zmD(`%d@TeKyHn3rpU`T{o(mJ?fJCfZz#nDtJsih}JO`%zR6vV=#pY}liCK;p>_iD!
z`^uLE^u-eosS(83YL7y$U$@>|Mn_qckC)WkS}E#OA1n8KSqNmLl;I9lRaJe%Il7iC
zsQ|oCYqc`iYX20EcDR#`twf_?{PccWq)DB5lsH#s`c0^Y`n2npy%gpjK^hu3HKhYZ
zdUY7t>y5`T2UMzQ8tY-j_qYfh>}APAoQgWl@?9ZSp{fhjKw)g6bgPOpJ)P&N=^jf1
zSS|%sn$Lo_8s0j>J@y9PV!@>>BK#m~H#km}k6u|`_SYlhzu2nlptH9cKWc;K$bYx}
z_=GbhDsTY6HVU+%@=x0jboI0|2mZ>Hsx=2A7I^WO2>Zma7i}+y`fD)c#K|K404UhT
z`LF7#CFdk>uo=Cm>iSr9%%8c=VePUmAu>)>So>|Vc@=?Q@}-#x%kkoRN~HrS!3iNJ
ze4rfLV%vN(&?6Vtb0(k$dxO%cvQ`pTPa&@)K>)KHUULplYsT_Db@_0_<RC^KB1}Lj
zUNc92a+5=vV<FXLQgLAbTiyhSC~?0=Pb)blyEX;h9d0zG9>o4xD4?Ow5soI<x3(-*
z|8odY?Yq<@gV4a}zMaUKx7Od*S8X=Hv@+ph<1jWCuO@WG)^J#6i#78E;PkcP=mz%+
zjz<=g6n?<rQmtV0N9wcjhqR2lOQISmRwTWoRN8ner<S8{pC@;k%a`l?h}K9?HgI6d
z7Y^)+lSV9tm$P{pgFIj6@w7cHcH(QRWglFgRlfu|ADf?_xMD`|m(<I#l@r>>`Eo6l
z-?rlIalO;KV&wa9aH;4mGsb+-jxCEO=5nuI31ekZ)Mju~aHEaeaZ^6%=v0DECi67M
z`ICXNz^O*AA}cfOyd@sCgpNIzgG}&s&5$wZ?rgdomQHRLD~)3Qy^(gyjM)y-xRw6`
zZvL749_-zC<~zznAvF@9E=gg6#X-0asYVAdFYFUn3IyS~Egec-GMU>295O>es?mJ<
zCD1cqDOT1&ihd}Ereo}}G#N|{KY=CG><|M9sH(wN@7&9ruUt$oBg?NA!d66~2)h-$
z!f}QdPg4p@{sE8W(0NS_dBU=bjFi<lGeAtL#8}rnTka-E9hh+zBjQ|iFHBkOIzglK
zNzkvE2k?YRdeZi{xJDhlLGgXMIs%Isw%1H1P?pt(k<trsXg8d=11!eL;FoLVOe?xH
z?>-QWd5SB1+uF8y;^+XM;ptYE`OROJq<^zD*A0fJghU<*TrgarPeO#t*9iRh=569v
zjo1jpM&b!|R^PPrOreZgZw_VmOnmMHhi-AEcz(J*z1@BLGlaR}5$p%I1wK#i>M6T7
z{;<P_RSO?UpLTDL1Y6hJItu!HP4z>BLFn3>AvLOqD=k$<iQu-w1(%gIn}y_-V(D!E
zN`K|V7q;|#e34yT;LGc>Ak^?O71~5!dSv&)fDbp~3je;yMGtEBxPu1(b_oFh{C}yQ
zm5GbFnVPGMwS(n9G_W+$z>!1-Kj?({QY^DYp3UZgT1o?9lSZRNUc+3&!SSUHFJeDS
ztbt5;wk*UAwi{xMW7iAQYs3*TZ(Qun?_qE|%FcDlCfHQ<y=x@Zpv1|4Q{<$XYiB4a
zt(Ua%+R}ykRAqSgb1Z=-Jp>ZxS3I2e4#i%y^g;0aadw3fW+~X_>#l^nTGzmH4XtCT
z)(4v018KjA>5EESzOakBj!aQPtuLxREODAVB%V<Nv^j{6TwIh>lf*nElN-f0w1l89
z8yoKa{Z<lcu)rdz;mq^pG<Dce-StSROW&vd09=&4&$4~NuB;JfN`d+gSreX&R+19p
z2Lhp44_xocvt7o?sgQ;p&g&;dqa(X&X6sugI3oLeHBW_?k3?HwAwG85I|Z8>tw2>=
z2+wt&G+OYZo_HXQ??<cf<-P{6ZviWj>fUR8?XKx~p^MktN%$96uN!>n%R_#)b*nk7
ztW0@!5Nzpb*3_<y8P&CZs8kvZuAAR|%ZS9m?BN*qV4B^+W1??LoYq1=Dz-+K^<dXD
zuCpL-UUEb+0N(l_sjIbQQF6ZqzZ2-&ar@1jN-=0^=CnZVZb8I|(89h>#d%P^x_K{R
z?U8KGAnqDBbo?hRh6$dvh-&LHrBB2)8^Vr+zh=Fuyy@k$*pCZ?_RA&$K6L07MVfjo
zsg->7n(fogYUmA}6pBY5!0)rhSB|jH$;rcQKcang`8vru1|VlDEvyZw(@jTlJh_hG
z^<rC@n4<0N7Ca&Z#{ldl3W)j)Q&iBe64Plbi40K*US}kX$5hI6Klsg7rImPHvoQBJ
z0N=kdO#PPY^d2iNqC3b?Mp?@b=yHl^Ua{Ha=RTrx8<3h<?=@93`o%-AZ2ZUM=le3c
z45DdZ^-&|`s2ngQoxmjFw({a4XToLYJjk`=%K0(L4v2L<wiVbs_o0c$Mf<`#L3V}9
zj%@XIHp23II<C1wt_f_QkMj(Nd-KR)u9lNLqfMJxXXU{=RMU5p^U4#0U8u5-D9ltJ
zhV@4CW&@rj&frNfRqqX>`h3cQkbHj}IjD%C!&nP)Gu%v(K%f*;BC>G_YrD!2c2+(K
zE<gFGvIYyI(u)TpOb$k@#Op<_#6v=>w2C5mm9_-4tO`NMgg87qDU9@A63T=#$6&X3
zpVN!DGKR#s&H?WLA0cDRfcfTCbf}6$o@pU0TZAb={a1dEPig!ipR^!r=)&Z^Jfbv+
z{FSm)<k|z&SS<TS*I~vFs1_@C6rsSXs7T7D2=Qn*Twd}H8q6=kn%moS+JeYRr_DZ~
z9~CbLyV!;ors8FoDa9b#nSBU)nM%2=+Fs87MxxnstYA|o7z9?hyrD=Kl0!aO8z&f~
z=p#45lqF;93|ZmEo-Bdy{#}A9-RI=`FRvVG#YcNT<504YNQz}Vo(Y`T9iihty3Nx|
zKc(eAp(-uQ^K7-fuN=qF0I|+`>=m5`fkmCXbUh~h{WG29%vexMjy_<_sW63%Ib*ho
z)i`sJ7pydgbuYTopHk%!i$OXEVsY6i^7g>&FW-yh2~dv2uD0_Pi6+lWkHB~744Y+h
z@SFp=iz2#5AU$(KPKFWv$f#TV!%7e76pCJ0y$nG^;eugQ9QXR@dX~Lru7kunX)hfp
zd4;w)K%0r<rwtq#Le+$Ge7R4aPH6_D^SuJ3uW#V@67KpwLM`Fn!<70POzSt$0LBQ~
z5Ws;p1k4;wRa_jMfNZ9YF6RH5`1o%h0Q%~@W5kvH*@=Qq=zk(j2vt{_%fqp#R((-;
z({0tvbHpc|8(5u&{;>st*KFLwZlz8+!`J$o=)k}|y#0V~9wR#Pk5^~9vBk3E3aw|3
z(UvS~AdMOj{(Ivw!KPMukJp}MYjU#~R(hZ_GCAUb6#Szydqzmmi8v=-eUQsq`Am#X
z-4ucY(UUR4YH-xEc;h7F_%(`MK0KVXD3EgBc4i3-6@L&aEu*ayQNT@st+>MZ&L`?5
z9&_s^NXuTXkR_UEklMY~K+*SF`!QBTj2+7Lx}%NrQ}s6W$5Q@G7MxTUjG-C90}rxZ
zl=P#E$&$pcdVISEDC^~eg8US%S2awy4??ch;=Yog(^O3It<nC2^`F!$nJhFoXZ-^V
z&PtlD4Y>i$*X~BCCzlWmPtKc+T_?VuG(&QdUBRq7-CR_p&1`LwSI|KC?;<EN6SG|n
z6+usEw2b{{5j1gf`mY2+Mekonu9~9qBD52wwJs*vS~UVIF+IRhe1i?`N>-z}&nDTi
zG`pE$jXPAd)V>v%L_^B`=_fC8=GcfUmh%NZUZt2~m6yx$VtbfW@9^a|ZxOZRh5;nV
zKbCH_dNe%6{Ls~_`Zk^pCvGtA5|gtwpzmrELdt>J3i3mICxOpuQ7Ty~ohoC{sow+B
z5fRl1Zjg}g3cJr{C&6rPP4s`=8kgThMu5x;_O8;!`xfD>zM&uotRVF{vuiAst;9bm
z9v~@;s*ODf#}vJT{n8bP$m~IhpX&g7M?<7PpnmGhM6av!o#CAhBdPdlFNhy;I+0hC
zUh;(v*>vVOm^NA2Yyne2v=})&HEf!RXe-K$$KGH9QX4|Fxj#F6vT)))D+bTdTvB7w
zRzsOWE?`H>c;mPs^0aldzcAaxmZ7C3W+aw9{=H1TDkGVl$BNpQ5yG@8COo(QVM6|Z
zY)@TD9&k9*SZ8b>#DkN8;<!YQ@)1LX<5)OdQ|)6WHpR$QH6wi<YSd)jtfc{AH-`bs
z_aL)2bqB=T*Q3BpPczFU<(RG|@y4`?`@L!Sj}KfwevKOZUD6j=TN#<4l8y;Aw$K5)
zKN;KiKvzfm{|fv6iaG$08$GJf#g5+#onv|3FESiiX3I4nQM2?)n34Yjn|0%}<XqZ4
z*WjlnVnHwxo0qpYWyZDVNnVMT0KANeU4;gsY_K>L{;Yk)6|u*%y$LMr0m(G4za|YF
zgGmQdTZ<fJI7OgyOXVjS#*|O~zztmLK`aSg-ixn4<O;&=QrU(n_R0?$3b`|KRWMb<
z2!oYptWkO$$!<1ZMjlu6X`WZ5mAMy;A8hXtKH$4fT-qZp7Z;WmBg;fNXrrLeBbad!
zyiPTKgQn{+=XH(=I$L}ro=LK&)%MZr^t;=7dE#AGS>V}jjvnSl=zIDC{_Lozu@!dO
zSUP^GS#~Kx@W=TfR$h1WM^j;XXU<-!nqVDHOVWYFm5Rdk#Ap42G~<rEyLWvLP;>cD
z5rct!3C(l<{S@aPZ}gv6|7NCBMd7au{yJs$X9ii&TmEV0?03T7XKnr<oq|r^{5E;>
zJMmv96aF9t05+f%l>dKD;deg2x2yl)M1cN(5AnC=_3vDMuiXE^MHO1ehd#~kb^PBM
z{9gX~gMlKn831MQM=|Jk(%;k9KS=w?{z>|KGW$D+zXo-G&;tM$)BwQWLcHI}|LTzc
wOzuwmC-Q%}=ijOSYUKV*ZNl&;YSaHSc`6DBQ1SRR(TE1<fLg}x7r%D@0~d(LK>z>%

literal 0
HcmV?d00001

diff --git a/YLErpWeb/Views/trade/EodPositionRisks.cshtml b/YLErpWeb/Views/trade/EodPositionRisks.cshtml
index d6831d6f..89b1e8b8 100644
--- a/YLErpWeb/Views/trade/EodPositionRisks.cshtml
+++ b/YLErpWeb/Views/trade/EodPositionRisks.cshtml
@@ -1,4 +1,4 @@
-@{
+@{
     ViewBag.Title = "日终持仓风险";
     Layout = "~/Views/Shared/_MainLayout.cshtml";
     var settleConfig = PS.Config.GetSettlementConfig();
@@ -19,7 +19,8 @@
         IsUseDisplayNotional = PS.Config.IsUseDisplayNotional,
         showGuohai = PS.Config.Is国海,
         isGuoyuan = PS.Config.Company==CompanyEnum.国元固收,
-        isGuoJun = PS.Config.IsGuoJun
+        isGuoJun = PS.Config.IsGuoJun,
+        isGLMS = PS.Config.Company == CompanyEnum.国联
     };
 }
 <style>
diff --git a/YLErpWeb/YLErpWeb.csproj b/YLErpWeb/YLErpWeb.csproj
index 3a096f2e..d8575731 100644
--- a/YLErpWeb/YLErpWeb.csproj
+++ b/YLErpWeb/YLErpWeb.csproj
@@ -30,7 +30,6 @@
 		<PackageReference Include="RazorEngineCore" Version="2022.8.1" />
 		<PackageReference Include="RazorLight-rpm" Version="3.0.0" />
 		<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.6" />
-		<PackageReference Include="System.Security.Cryptography.Pkcs" Version="6.0.1" />
 		<PackageReference Include="DocumentFormat.OpenXml" Version="2.7.2" />
 		<PackageReference Include="System.IO.Packaging" Version="4.5.0" />
 	</ItemGroup>
@@ -105,6 +104,9 @@
 		<None Update="App_Docs\导出模板\客户盈亏状况模板.xlsx">
 			<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
+		<None Update="App_Docs\导出模板\日终持仓风险_国联.xlsx">
+		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+		</None>
 		<None Update="App_Docs\导出模板\日终持仓风险.xlsx">
 		  <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
 		</None>
@@ -242,10 +244,8 @@
 			<_RebuildScript>$(MSBuildProjectDirectory)\rebuild-bundles.ps1</_RebuildScript>
 			<_RebuildScriptSh>$(MSBuildProjectDirectory)/rebuild-bundles.sh</_RebuildScriptSh>
 		</PropertyGroup>
-		<Exec Condition="'$(OS)' == 'Windows_NT'"
-			  Command="powershell -ExecutionPolicy Bypass -File &quot;$(_RebuildScript)&quot;" />
-		<Exec Condition="'$(OS)' != 'Windows_NT'"
-			  Command="bash &quot;$(_RebuildScriptSh)&quot;" />
+		<Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -ExecutionPolicy Bypass -File &quot;$(_RebuildScript)&quot;" />
+		<Exec Condition="'$(OS)' != 'Windows_NT'" Command="bash &quot;$(_RebuildScriptSh)&quot;" />
 	</Target>
 
 	<!-- 手动校验 target：dotnet build -t:VerifyBundles
@@ -257,10 +257,8 @@
 			<_RebuildScript>$(MSBuildProjectDirectory)\rebuild-bundles.ps1</_RebuildScript>
 			<_RebuildScriptSh>$(MSBuildProjectDirectory)/rebuild-bundles.sh</_RebuildScriptSh>
 		</PropertyGroup>
-		<Exec Condition="'$(OS)' == 'Windows_NT'"
-			  Command="powershell -ExecutionPolicy Bypass -File &quot;$(_RebuildScript)&quot; -Verify" />
-		<Exec Condition="'$(OS)' != 'Windows_NT'"
-			  Command="bash &quot;$(_RebuildScriptSh)&quot; --verify" />
+		<Exec Condition="'$(OS)' == 'Windows_NT'" Command="powershell -ExecutionPolicy Bypass -File &quot;$(_RebuildScript)&quot; -Verify" />
+		<Exec Condition="'$(OS)' != 'Windows_NT'" Command="bash &quot;$(_RebuildScriptSh)&quot; --verify" />
 	</Target>
 
 	<Target Name="CopyFilesAfterPublish" AfterTargets="Publish">
diff --git a/YLErpWeb/wwwroot/Scripts/app/eod/EodPositionRisks.js b/YLErpWeb/wwwroot/Scripts/app/eod/EodPositionRisks.js
index 98671a5a..e0a1695b 100644
--- a/YLErpWeb/wwwroot/Scripts/app/eod/EodPositionRisks.js
+++ b/YLErpWeb/wwwroot/Scripts/app/eod/EodPositionRisks.js
@@ -1,4 +1,4 @@
-function getColModelGrid() {
+function getColModelGrid() {
     var i = 0;
     var colModelGrid = [
         { name: 'id', hidden: true, optionHide: true },
@@ -494,6 +494,75 @@
         colModelGrid = colModelGrid.concat(spvCols);
     }
 
+
+    if (page.isGLMS) {
+        colModelGrid.push({
+            name: 'Delta_r',
+            label: 'Delta_r',
+            index: 'Delta_r',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        }, {
+            name: 'Delta_r_1bp',
+            label: 'Delta_r(1bp)',
+            index: 'Delta_r_1bp',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        }, {
+            name: 'Dv01',
+            label: 'Dv01',
+            index: 'Dv01',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        }, {
+            name: 'Gamma_r',
+            label: 'Gamma_r',
+            index: 'Gamma_r',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        }, {
+            name: 'Gamma_r_1bp',
+            label: 'Gamma_r(1bp)',
+            index: 'Gamma_r_1bp',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        }, {
+            name: 'Vega_r',
+            label: 'Vega_r',
+            index: 'Vega_r',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        }, {
+            name: 'Vega_r_1bp',
+            label: 'Vega_r(1bp)',
+            index: 'Vega_r_1bp',
+            width: 100,
+            align: 'center',
+            sortIndex: i++,
+            formatter: greeksFormat,
+            sortable: false
+        },);
+        
+    }
+
     return tradeHelper.getAmountToNotional(colModelGrid);
 }
 
@@ -594,6 +663,13 @@ function TradeAmountFormat(cellValue, options, rowObject) {
     return otcformat.trading.notional(cellValue);
 }
 
+function greeksFormat(cellValue, options, rowObject) {
+    if (cellValue) {
+        return otcformat.trading.greek(cellValue);
+    }
+    return "";
+}
+
 function SpotPriceFormat(cellValue, options, rowObject) {
     if (rowObject.TradeType !== "场内期权" && rowObject.TradeType !== "商品期货" && rowObject.TradeType !== "股票" && rowObject.TradeType !== "商品现货") {
         return otcformat.trading.umprice(cellValue)