diff --git a/YLErpDAL/Modules/EodModule/EodPriceService.cs b/YLErpDAL/Modules/EodModule/EodPriceService.cs index 07167103..104847dc 100644 --- a/YLErpDAL/Modules/EodModule/EodPriceService.cs +++ b/YLErpDAL/Modules/EodModule/EodPriceService.cs @@ -57,6 +57,10 @@ namespace YLErp.Modules.EodModule IsBond=false, id = source.id, DataSource = source.DataSource, + // EF Core Concat 要求各分支投影成员集合完全一致: + // 债券分支设了 UpdateUser,故期货/股票分支也必须显式设(置 null),否则翻译期抛 + // "The given key 'UpdateUser/DataSource' was not present in the dictionary"。 + UpdateUser = (long?)null, LaunchState = un.LaunchState, MarketName = un.MarketName, UnderlyingId = un.id, @@ -84,6 +88,7 @@ namespace YLErp.Modules.EodModule IsBond = false, id = stockClose.id, DataSource = stockClose.DataSource, + UpdateUser = (long?)null, // 对齐 Concat 投影成员,见 query1 注释 LaunchState = un.LaunchState, MarketName = un.MarketName, UnderlyingId = un.id, @@ -110,7 +115,9 @@ namespace YLErp.Modules.EodModule IsBond = true, id = bondClose.id, UpdateUser = bondClose.update_user, - // 债券 DataSource 在后处理统一置为固定值"中债估值"(见下方 foreach)。 + // 债券 DataSource 在后处理统一置为人名/"中债估值"(见下方 foreach); + // 此处仍须显式设 null 以对齐 Concat 各分支投影成员集合(见 query1 注释)。 + DataSource = null, LaunchState = un.LaunchState, MarketName = un.MarketName, UnderlyingId = un.id, diff --git a/YLErpWeb/Views/EodPrice/eodPriceAdd.cshtml b/YLErpWeb/Views/EodPrice/eodPriceAdd.cshtml index f9bc30d3..bc216e25 100644 --- a/YLErpWeb/Views/EodPrice/eodPriceAdd.cshtml +++ b/YLErpWeb/Views/EodPrice/eodPriceAdd.cshtml @@ -1,48 +1,109 @@ -@{ +@{ ViewBag.Title = "日终价格新增"; Layout = "~/Views/Shared/_InfoLayout.cshtml"; } +@section CSS +{ + +} @section JS { @@ -117,10 +189,11 @@

日终价格新增

-
+
- + +